Merge "ARM: dts: msm: enable sensor node on msm8996 and apq8096"

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / arm / boot / dts / qcom / msm8996-agave-adp.dtsi

diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index 9e14211..b1de960 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -13,6 +13,7 @@
 #include "msm8996-pinctrl.dtsi"
 #include "msm8996-camera-sensor-adp.dtsi"
 #include "msm8996-wsa881x.dtsi"
+#include "msm8996-sde.dtsi"
 
 / {
        bluetooth: bt_qca6174 {
@@ -1040,6 +1041,12 @@
                status = "disabled";
        };
 
+       qcom,msm-ssc-sensors {
+               compatible = "qcom,msm-ssc-sensors";
+               qcom,firmware-name = "slpi";
+               status = "ok";
+       };
+
        sound-adp-agave {
                compatible = "qcom,apq8096-asoc-snd-adp-agave";
                qcom,model = "apq8096-adp-agave-snd-card";
@@ -1106,6 +1113,37 @@
                asoc-codec-names = "msm-stub-codec.1";
        };
 
+       qcom,msm-dai-tdm-tert-rx {
+               qcom,msm-cpudai-tdm-group-num-ports = <6>;
+               qcom,msm-cpudai-tdm-group-port-id = <36896 36898 36900
+                       36902 36904 36906>;
+
+               dai_tert_tdm_rx_5: qcom,msm-dai-q6-tdm-tert-rx-5 {
+                       compatible = "qcom,msm-dai-q6-tdm";
+                       qcom,msm-cpudai-tdm-dev-id = <36906>;
+                       qcom,msm-cpudai-tdm-data-align = <0>;
+               };
+       };
+
+       qcom,msm-ext-anc {
+               compatible = "qcom,msm-ext-anc";
+               qcom,refs-port-id = <36906>;
+               qcom,spkr-port-id = <36912>;
+               qcom,mic-port-id = <36913>;
+               qcom,sample-rate = <48000>;
+               qcom,num-channels = <8>;
+               qcom,bit-width = <32>;
+               qcom,num-anc-mic = <4>;
+               qcom,num-add-mic-signal = <0>;
+               qcom,anc-mic-array = <0 1 2 3>;
+               qcom,num-anc-spkr = <4>;
+               qcom,num-add-spkr-signal = <0>;
+               qcom,anc-spkr-array = <0 1 2 3>;
+               qcom,refs-tdm-rx = <&dai_tert_tdm_rx_5>;
+               qcom,spkr-tdm-rx = <&dai_quat_tdm_rx_0>;
+               qcom,mic-tdm-tx = <&dai_quat_tdm_tx_0>;
+       };
+
        usb_detect: usb_detect {
                compatible = "qcom,gpio-usbdetect";
                qcom,vbus-det-gpio = <&pm8994_gpios 17 0>;