summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSudheer Papothi <spapothi@codeaurora.org>2016-04-15 09:06:07 +0530
committerJeevan Shriram <jshriram@codeaurora.org>2016-04-26 14:37:58 -0700
commitf9c1246a81031fd886071139f05da568ed1767d7 (patch)
tree7a992b95eb838eaf39180c7c150e628601c43767 /arch/arm
parent32ae49b5653ed24ba120e40ceaf8ab5bc7042fa8 (diff)
ARM: msm: dts: Use msm codec pinctrl for wsa881x reset gpios
MSM codec pinctrl driver is added to handle wsa881x reset gpios gracefully. wsa881x reset gpios uses msm codec pinctrl device node to set the pin to valid state. Change enables wsa881x reset gpios to use msm codec pinctrl device node. Change-Id: I753a782a1b4587ac77c4dd6afc6b6a3ec07fcd8b Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi38
1 files changed, 22 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi
index 5a4395a3e54d..8f1f699cfc1f 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi
@@ -10,6 +10,24 @@
* GNU General Public License for more details.
*/
+&soc {
+ wsa_spkr_sd1: msm_cdc_pinctrl@65 {
+ compatible = "qcom,msm-cdc-pinctrl";
+ qcom,cdc-rst-n-gpio = <&tlmm 65 0>;
+ pinctrl-names = "aud_active", "aud_sleep";
+ pinctrl-0 = <&spkr_1_sd_n_active>;
+ pinctrl-1 = <&spkr_1_sd_n_sleep>;
+ };
+
+ wsa_spkr_sd2: msm_cdc_pinctrl@66 {
+ compatible = "qcom,msm-cdc-pinctrl";
+ qcom,cdc-rst-n-gpio = <&tlmm 66 0>;
+ pinctrl-names = "aud_active", "aud_sleep";
+ pinctrl-0 = <&spkr_2_sd_n_active>;
+ pinctrl-1 = <&spkr_2_sd_n_sleep>;
+ };
+};
+
&slim_aud {
tasha_codec {
swr_master {
@@ -20,37 +38,25 @@
wsa881x_211: wsa881x@20170211 {
compatible = "qcom,wsa881x";
reg = <0x00 0x20170211>;
- qcom,spkr-sd-n-gpio = <&tlmm 65 0>;
- pinctrl-names = "default", "idle";
- pinctrl-0 = <&spkr_1_sd_n_active>;
- pinctrl-1 = <&spkr_1_sd_n_sleep>;
+ qcom,spkr-sd-n-node = <&wsa_spkr_sd1>;
};
wsa881x_212: wsa881x@20170212 {
compatible = "qcom,wsa881x";
reg = <0x00 0x20170212>;
- qcom,spkr-sd-n-gpio = <&tlmm 66 0>;
- pinctrl-names = "default", "idle";
- pinctrl-0 = <&spkr_2_sd_n_active>;
- pinctrl-1 = <&spkr_2_sd_n_sleep>;
+ qcom,spkr-sd-n-node = <&wsa_spkr_sd2>;
};
wsa881x_213: wsa881x@21170213 {
compatible = "qcom,wsa881x";
reg = <0x00 0x21170213>;
- qcom,spkr-sd-n-gpio = <&tlmm 65 0>;
- pinctrl-names = "default", "idle";
- pinctrl-0 = <&spkr_1_sd_n_active>;
- pinctrl-1 = <&spkr_1_sd_n_sleep>;
+ qcom,spkr-sd-n-node = <&wsa_spkr_sd1>;
};
wsa881x_214: wsa881x@21170214 {
compatible = "qcom,wsa881x";
reg = <0x00 0x21170214>;
- qcom,spkr-sd-n-gpio = <&tlmm 66 0>;
- pinctrl-names = "default", "idle";
- pinctrl-0 = <&spkr_2_sd_n_active>;
- pinctrl-1 = <&spkr_2_sd_n_sleep>;
+ qcom,spkr-sd-n-node = <&wsa_spkr_sd2>;
};
};
};