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

[karo-tx-linux.git] / arch / arm64 / boot / dts / qcom / apq8016-sbc.dtsi

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index c27202e296d5962d6f2d6c9a58098de5577bc315..aeed8161fc05a842a9a6430d217fb2f6eff5b040 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -27,6 +27,8 @@
                i2c0    = &blsp_i2c2;
                i2c1    = &blsp_i2c6;
                i2c3    = &blsp_i2c4;
+               spi0    = &blsp_spi5;
+               spi1    = &blsp_spi3;
        };
 
        chosen {
@@ -46,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;
                                        };
@@ -69,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>;
-                                               
+
                                        };
                                };
                        };
@@ -365,7 +367,7 @@
                compatible = "adi,adv7533";
                reg = <0x39>;
                interrupt-parent = <&msmgpio>;
-               //interrupts = <31 2>;
+               interrupts = <31 2>;
                avdd-supply = <&pm8916_l6>;
                v3p3-supply = <&pm8916_l17>;
                adi,dsi-lanes = <4>;
@@ -373,7 +375,7 @@
                pinctrl-names = "default","sleep";
                pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>;
                pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;
-               #sound-dai-cells = <0>;
+               #sound-dai-cells = <1>;
 
                port {
                        adv_in: endpoint {
@@ -402,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
@@ -416,7 +418,6 @@
        External Secondary:
                playback - Quat MI2S
                capture - Quat MI2S
-
        */
 &sound {
        status = "okay";
@@ -424,7 +425,23 @@
        pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;
        pinctrl-names = "default", "sleep";
        qcom,model = "DB410c";
+       qcom,audio-routing =
+               "AMIC1", "MIC BIAS External",
+               "AMIC2", "MIC BIAS Internal2",
+               "AMIC3", "MIC BIAS External",
+               "DMIC1", "MIC BIAS Internal1";
 
+       /* External Primary or External Secondary -ADV7533 HDMI */
+       external-dai-link@0 {
+               link-name = "ADV7533";
+
+               cpu { /* QUAT */
+                       sound-dai = <&lpass MI2S_QUATERNARY>;
+               };
+               codec {
+                       sound-dai = <&adv_bridge 0>;
+               };
+       };
 
        internal-codec-playback-dai-link@0 {            /* I2S - Internal codec */
                link-name = "WCD";
@@ -436,17 +453,16 @@
                };
        };
 
-       /* External Primary or External Secondary -ADV7533 HDMI */
-       external-dai-link@0 {
-               link-name = "ADV7533";
-
-               cpu { /* QUAT */
-                       sound-dai = <&lpass MI2S_QUATERNARY>;
+       internal-codec-capture-dai-link@0 {             /* I2S - Internal codec */
+               link-name = "WCD-Capture";
+               cpu { /* PRIMARY */
+                       sound-dai = <&lpass MI2S_TERTIARY>;
                };
                codec {
-                       sound-dai = <&adv_bridge 0>;
+                       sound-dai = <&wcd_codec 1>;
                };
        };
+
 };
 
 /* default regulators required for mezzanine boards */