commit a39a46c00a3fdb0f400a63c3e9641a6f03cdce03
author mengw <mwang@codeaurora.org> Tue Sep 03 11:06:46 2013 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 25 19:12:30 2013 -0700
tree 5fc1c01cab16104c6b93319329f6631bec7dbcd8
parent 34b11aca322ca858dfc0aa644cf41d6f505b64fa

ARM: dts: msm: change sound setting for SKUF with WCD9302

- change qcom,model to msm8226-tapan9302-skuf-snd-card to support SKUF
  sound card initialization in HAL with WCD9302

- delete the value of qcom,cdc-vdd-spkr-gpio and qcom,cdc-us-euro-gpios
  which are not used in SKUF with WCD9302. Otherwise these two GPIO
  settings will conflict with other GPIOs which is used in SKUF.

Change-Id: I286b8fd8405fd8d3202640743ce1512521ba3083
Signed-off-by: Meng Wang <mwang@codeaurora.org>

arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts

diff --git a/arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts b/arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts
index cbafe80..d12f8c9 100644
--- a/arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts
+++ b/arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts
@@ -46,6 +46,29 @@
 		qcom,cdc-us-euro-gpios;
 	};
 
+    sound-9302 {
+          qcom,model = "msm8226-tapan9302-skuf-snd-card";
+
+          qcom,audio-routing =
+              "RX_BIAS", "MCLK",
+              "LDO_H", "MCLK",
+              "SPK_OUT", "MCLK",
+              "SPK_OUT", "EXT_VDD_SPKR",
+              "Lineout_1 amp", "LINEOUT1",
+              "Lineout_2 amp", "LINEOUT2",
+              "AMIC1", "MIC BIAS1 External",
+              "MIC BIAS1 External", "Handset Mic",
+              "AMIC2", "MIC BIAS2 External",
+              "MIC BIAS2 External", "Headset Mic",
+              "AMIC3", "MIC BIAS1 External",
+              "MIC BIAS1 External", "Handset Mic";
+
+          qcom,cdc-mclk-gpios = <&pm8226_gpios 1 0>;
+          qcom,cdc-lineout-spkr-gpios = <&pm8226_gpios 2 0>;
+          qcom,cdc-vdd-spkr-gpios;
+          qcom,cdc-us-euro-gpios;
+      };
+
 	tp_power: regulator-tp {
 		compatible = "regulator-fixed";
 		regulator-name = "tp_power";

arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts

diff --git a/arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts b/arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts
index 77037be..9a750ae 100644
--- a/arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts
+++ b/arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts
@@ -46,6 +46,29 @@
 		qcom,cdc-us-euro-gpios;
 	};
 
+    sound-9302 {
+          qcom,model = "msm8226-tapan9302-skuf-snd-card";
+
+          qcom,audio-routing =
+              "RX_BIAS", "MCLK",
+              "LDO_H", "MCLK",
+              "SPK_OUT", "MCLK",
+              "SPK_OUT", "EXT_VDD_SPKR",
+              "Lineout_1 amp", "LINEOUT1",
+              "Lineout_2 amp", "LINEOUT2",
+              "AMIC1", "MIC BIAS1 External",
+              "MIC BIAS1 External", "Handset Mic",
+              "AMIC2", "MIC BIAS2 External",
+              "MIC BIAS2 External", "Headset Mic",
+              "AMIC3", "MIC BIAS1 External",
+              "MIC BIAS1 External", "Handset Mic";
+
+          qcom,cdc-mclk-gpios = <&pm8226_gpios 1 0>;
+          qcom,cdc-lineout-spkr-gpios = <&pm8226_gpios 2 0>;
+          qcom,cdc-vdd-spkr-gpios;
+          qcom,cdc-us-euro-gpios;
+        };
+
 	tp_power: regulator-tp {
 		compatible = "regulator-fixed";
 		regulator-name = "tp_power";