summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaxminath Kasam <lkasam@codeaurora.org>2016-12-22 12:45:30 +0530
committerLaxminath Kasam <lkasam@codeaurora.org>2016-12-26 12:32:07 +0530
commit88abb7ca686923e600c7d278c8ef44b9240e7ad4 (patch)
tree60a8955ce65b799f836f02d70ae53d4baaed2121
parent83134d5df11ca497a061a492fb9b20e24f56acca (diff)
ARM: dts: msm: Enable audio internal codec nodes for msmfalcon
Enable internal codec audio nodes and disable external codec nodes in internal codec platform. CRs-Fixed: 1094763 Change-Id: Ib17d8bbd5894be5fbf3fa0cafdbec958abc42649 Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
-rw-r--r--arch/arm/boot/dts/qcom/msmfalcon-audio.dtsi5
-rw-r--r--arch/arm/boot/dts/qcom/msmfalcon-internal-codec-cdp.dts48
-rw-r--r--arch/arm/boot/dts/qcom/msmfalcon-internal-codec-mtp.dts49
-rw-r--r--arch/arm/boot/dts/qcom/msmfalcon-internal-codec-rcm.dts48
4 files changed, 148 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-audio.dtsi b/arch/arm/boot/dts/qcom/msmfalcon-audio.dtsi
index bf367944f50c..df42ba124641 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-audio.dtsi
+++ b/arch/arm/boot/dts/qcom/msmfalcon-audio.dtsi
@@ -15,12 +15,13 @@
#include "msmfalcon-lpi.dtsi"
&slim_aud {
- msm_dai_slim {
+ status = "okay";
+ dai_slim: msm_dai_slim {
compatible = "qcom,msm-dai-slim";
elemental-addr = [ff ff ff fe 17 02];
};
- tasha_codec {
+ wcd9335: tasha_codec {
compatible = "qcom,tasha-slim-pgd";
elemental-addr = [00 01 a0 01 17 02];
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-cdp.dts b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-cdp.dts
index 108328bd91f0..fd5e298b572b 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-cdp.dts
@@ -21,3 +21,51 @@
compatible = "qcom,msmfalcon-cdp", "qcom,msmfalcon", "qcom,cdp";
qcom,board-id = <1 1>;
};
+
+&slim_aud {
+ status = "disabled";
+};
+
+&dai_slim {
+ status = "disabled";
+};
+
+&wcd9335 {
+ status = "disabled";
+};
+
+&wcd934x_cdc {
+ status = "disabled";
+};
+
+&clock_audio {
+ status = "disabled";
+};
+
+&wcd_rst_gpio {
+ status = "disabled";
+};
+
+&wcd9xxx_intc {
+ status = "disabled";
+};
+
+&tasha_snd {
+ status = "disabled";
+};
+
+&tavil_snd {
+ status = "disabled";
+};
+
+&int_codec {
+ status = "okay";
+};
+
+&pmic_analog_codec {
+ status = "okay";
+};
+
+&msm_sdw_codec {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-mtp.dts b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-mtp.dts
index 3697ee8f97a0..260278724087 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-mtp.dts
+++ b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-mtp.dts
@@ -21,3 +21,52 @@
compatible = "qcom,msmfalcon-mtp", "qcom,msmfalcon", "qcom,mtp";
qcom,board-id = <8 1>;
};
+
+&slim_aud {
+ status = "disabled";
+};
+
+&dai_slim {
+ status = "disabled";
+};
+
+&wcd9335 {
+ status = "disabled";
+};
+
+&wcd934x_cdc {
+ status = "disabled";
+};
+
+&clock_audio {
+ status = "disabled";
+};
+
+&wcd_rst_gpio {
+ status = "disabled";
+};
+
+&wcd9xxx_intc {
+ status = "disabled";
+};
+
+&tasha_snd {
+ status = "disabled";
+};
+
+&tavil_snd {
+ status = "disabled";
+};
+
+&int_codec {
+ qcom,model = "msmfalcon-snd-card-mtp";
+ status = "okay";
+};
+
+&pmic_analog_codec {
+ status = "okay";
+};
+
+&msm_sdw_codec {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-rcm.dts b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-rcm.dts
index bbdc41b97574..3980b977228b 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-rcm.dts
+++ b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-rcm.dts
@@ -21,3 +21,51 @@
compatible = "qcom,msmfalcon-cdp", "qcom,msmfalcon", "qcom,cdp";
qcom,board-id = <21 1>;
};
+
+&slim_aud {
+ status = "disabled";
+};
+
+&dai_slim {
+ status = "disabled";
+};
+
+&wcd9335 {
+ status = "disabled";
+};
+
+&wcd934x_cdc {
+ status = "disabled";
+};
+
+&clock_audio {
+ status = "disabled";
+};
+
+&wcd_rst_gpio {
+ status = "disabled";
+};
+
+&wcd9xxx_intc {
+ status = "disabled";
+};
+
+&tasha_snd {
+ status = "disabled";
+};
+
+&tavil_snd {
+ status = "disabled";
+};
+
+&int_codec {
+ status = "okay";
+};
+
+&pmic_analog_codec {
+ status = "okay";
+};
+
+&msm_sdw_codec {
+ status = "okay";
+};