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

Enable sensor device node to allow Anti-Noise
Cancellation (ANC) algorithm to be running on
sensor subsystem for automotive msm8996 and
apq8096 platforms.

CRs-fixed: 2153236
Change-Id: I213c2eb94f6fe01e7c2ceca2d9033616817db38b
Signed-off-by: Derek Chen <chenche@codeaurora.org>

diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-auto-adp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-auto-adp.dts
index a91ec5e..46894ea 100644 (file)
--- a/arch/arm/boot/dts/qcom/apq8096-v3-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-auto-adp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -36,10 +36,6 @@
 };
 
 &soc {
-       qcom,msm-ssc-sensors {
-               status = "disabled";
-       };
-
        qcom,msm-thermal {
                qcom,hotplug-temp = <115>;
                qcom,hotplug-temp-hysteresis = <25>;

diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
index 6c2413d..e4eca6a 100644 (file)
--- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
@@ -30,10 +30,6 @@
 };
 
 &soc {
-       qcom,msm-ssc-sensors {
-               status = "disabled";
-       };
-
        qcom,msm-thermal {
                qcom,hotplug-temp = <115>;
                qcom,hotplug-temp-hysteresis = <25>;

diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
index fa34676..c8f2e58 100644 (file)
--- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
@@ -37,10 +37,6 @@
 };
 
 &soc {
-       qcom,msm-ssc-sensors {
-               status = "disabled";
-       };
-
        qcom,msm-thermal {
                qcom,hotplug-temp = <115>;
                qcom,hotplug-temp-hysteresis = <25>;

diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index 9e14211..cb3ee32 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -1040,6 +1040,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 +1112,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>;

diff --git a/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts b/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts
index 68956d7..89a585b 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -37,10 +37,6 @@
 };
 
 &soc {
-       qcom,msm-ssc-sensors {
-               status = "disabled";
-       };
-
        qcom,msm-thermal {
                qcom,hotplug-temp = <115>;
                qcom,hotplug-temp-hysteresis = <25>;

diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts
index 9fd2686..02f5dbc 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts
+++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts
@@ -30,10 +30,6 @@
 };
 
 &soc {
-       qcom,msm-ssc-sensors {
-               status = "disabled";
-       };
-
        qcom,msm-thermal {
                qcom,hotplug-temp = <115>;
                qcom,hotplug-temp-hysteresis = <25>;

diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
index d2aa5c8..398aaa6 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
@@ -37,10 +37,6 @@
 };
 
 &soc {
-       qcom,msm-ssc-sensors {
-               status = "disabled";
-       };
-
        qcom,msm-thermal {
                qcom,hotplug-temp = <115>;
                qcom,hotplug-temp-hysteresis = <25>;