arm64: dts: sync up with new wcd codec bindings.

This patch sync's up audio dt entries with latest wcd codec bindings.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index ab0df21a877ffa49af48e23ed5090356799fff6b..aeed8161fc05a842a9a6430d217fb2f6eff5b040 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -48,22 +48,22 @@
                                        s1 {
                                                regulator-min-microvolt = <375000>;
                                                regulator-max-microvolt = <1562000>;
-                                               
+
                                        };
                                        s2 {
                                                regulator-min-microvolt = <375000>;
                                                regulator-max-microvolt = <1562000>;
-                                               
+
                                        };
                                        s3 {
                                                regulator-min-microvolt = <375000>;
                                                regulator-max-microvolt = <1562000>;
-                                               
+
                                        };
                                        s4 {
                                                regulator-min-microvolt = <1800000>;
                                                regulator-max-microvolt = <1800000>;
-                                               
+
                                                regulator-always-on;
                                                regulator-boot-on;
                                        };
@@ -71,92 +71,92 @@
                                        l1 {
                                                regulator-min-microvolt = <375000>;
                                                regulator-max-microvolt = <1525000>;
-                                               
+
                                        };
                                        l2 {
                                                regulator-min-microvolt = <375000>;
                                                regulator-max-microvolt = <1525000>;
-                                               
+
                                        };
                                        l3 {
                                                regulator-min-microvolt = <375000>;
                                                regulator-max-microvolt = <1525000>;
-                                               
+
                                        };
                                        l4 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l5 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l6 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l7 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l8 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l9 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l10 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l11 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l12 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l13 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l14 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l15 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l16 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l17 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                        l18 {
                                                regulator-min-microvolt = <1750000>;
                                                regulator-max-microvolt = <3337000>;
-                                               
+
                                        };
                                };
                        };
@@ -404,7 +404,7 @@
        status = "okay";
        clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
        clock-names = "mclk";
-       digital = <&wcd_digital>;
+       qcom,lpass-codec-core = <&lpass_codec_core>;
 };
        /*
        Internal Codec
@@ -426,16 +426,10 @@
        pinctrl-names = "default", "sleep";
        qcom,model = "DB410c";
        qcom,audio-routing =
-               "MIC BIAS External", "Handset Mic",
-               "MIC BIAS Internal2", "Headset Mic",
-               "MIC BIAS External", "Secondary Mic",
                "AMIC1", "MIC BIAS External",
                "AMIC2", "MIC BIAS Internal2",
                "AMIC3", "MIC BIAS External",
-               "DMIC1", "MIC BIAS Internal1",
-               "MIC BIAS Internal1", "Digital Mic1",
-               "DMIC2", "MIC BIAS Internal1",
-               "MIC BIAS Internal1", "Digital Mic2";
+               "DMIC1", "MIC BIAS Internal1";
 
        /* External Primary or External Secondary -ADV7533 HDMI */
        external-dai-link@0 {

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index ab39e3a3272a16919da701caa432bc406cf1aca7..e28c852a61640bb3b0a03a99212b77431ddc48bb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -703,8 +703,8 @@
 
                /* Audio */
 
-               wcd_digital: codec-digital{
-                       compatible = "syscon", "qcom,apq8016-wcd-digital-codec";
+               lpass_codec_core: lpass-codec{
+                       compatible = "syscon", "qcom,msm8916-lpass-codec";
                        reg = <0x0771c000 0x400>;
                };
 

diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index 113ccb3fa8868abe1fd142ec8dadd9c039729e7c..48d206867029efff37e8b7a84873943765108eab 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -219,12 +219,43 @@
                };
 
                wcd_codec: codec@f000 {
-                       compatible = "qcom,apq8016-wcd-codec";
+                       compatible = "qcom,msm8916-wcd-codec";
                        reg = <0xf000 0x200>;
-                       #sound-dai-cells = <1>;
+                       reg-names = "pmic-codec-core";
+                       interrupt-parent = <&spmi_bus>;
+                       interrupts = <0x1 0xf0 0x0 IRQ_TYPE_NONE>,
+                                    <0x1 0xf0 0x1 IRQ_TYPE_NONE>,
+                                    <0x1 0xf0 0x2 IRQ_TYPE_NONE>,
+                                    <0x1 0xf0 0x3 IRQ_TYPE_NONE>,
+                                    <0x1 0xf0 0x4 IRQ_TYPE_NONE>,
+                                    <0x1 0xf0 0x5 IRQ_TYPE_NONE>,
+                                    <0x1 0xf0 0x6 IRQ_TYPE_NONE>,
+                                    <0x1 0xf0 0x7 IRQ_TYPE_NONE>,
+                                    <0x1 0xf1 0x0 IRQ_TYPE_NONE>,
+                                    <0x1 0xf1 0x1 IRQ_TYPE_NONE>,
+                                    <0x1 0xf1 0x2 IRQ_TYPE_NONE>,
+                                    <0x1 0xf1 0x3 IRQ_TYPE_NONE>,
+                                    <0x1 0xf1 0x4 IRQ_TYPE_NONE>,
+                                    <0x1 0xf1 0x5 IRQ_TYPE_NONE>;
+                       interrupt-names = "spk_cnp_int",
+                                         "spk_clip_int",
+                                         "spk_ocp_int",
+                                         "ins_rem_det1",
+                                         "but_rel_det",
+                                         "but_press_det",
+                                         "ins_rem_det",
+                                         "mbhc_int",
+                                         "ear_ocp_int",
+                                         "hphr_ocp_int",
+                                         "hphl_ocp_det",
+                                         "ear_cnp_int",
+                                         "hphr_cnp_int",
+                                         "hphl_cnp_int";
+
                        vddio-supply = <&pm8916_l5>;
-                       vdd-pa-supply = <&pm8916_s4>;
-                       vdd-mic-bias-supply = <&pm8916_l13>;
+                       vdd-tx-rx-supply = <&pm8916_l5>;
+                       vdd-micbias-supply = <&pm8916_l13>;
+                       #sound-dai-cells = <1>;
                };
        };
 };