commit c5fd40c10b85a398f084606ecc11d2c58b420998
author Linux Build Service Account <lnxbuild@localhost> Tue Nov 20 00:56:46 2012 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Nov 20 00:56:45 2012 -0800
tree f22f4ca22731316f2eee1237f884d5e7010bc473
parent 0ec22e08df41d9e277d49211bcbe06c62df73d66
parent b4fea122932983d48c20ce9b88ceed0276dd096e

Merge "arm/dt: 8974: add sound configurations for liquid"

arch/arm/boot/dts/msm8974-liquid.dtsi

diff --git a/arch/arm/boot/dts/msm8974-liquid.dtsi b/arch/arm/boot/dts/msm8974-liquid.dtsi
index 96889aa..1eb2e1e 100644
--- a/arch/arm/boot/dts/msm8974-liquid.dtsi
+++ b/arch/arm/boot/dts/msm8974-liquid.dtsi
@@ -207,6 +207,12 @@
 		startup-delay-us = <12000>;
 		enable-active-high;
 	};
+
+	sound {
+		qcom,model = "msm8974-taiko-liquid-snd-card";
+		qcom,ext-spk-amp-supply = <&ext_5v>;
+		qcom,ext-spk-amp-gpio = <&pm8841_mpps 1 0>;
+	};
 };
 
 &usb3 {
@@ -453,6 +459,12 @@
 &pm8841_mpps {
 
 	mpp@a000 { /* MPP 1 */
+		/* CLASS_D_EN speakers PA */
+		qcom,mode = <1>; /* DIG_OUT */
+		qcom,output-type = <0>;  /* PNP_PIN_OUT_BUF_CMOS */
+		qcom,vin-sel = <2>; /* S3A 1.8v */
+		qcom,src-select = <0>; /* CONSTANT */
+		qcom,master-en = <1>; /* ENABLE MPP */
 	};
 
 	mpp@a100 { /* MPP 2 */