ARM: dts: msm: Add audio support for SDM630, SDA630/660

Add audio internal and external codecs support in respective
SDM630, SDA630, SDA660 variants.

Change-Id: I5b5f4abe4455b1251ce368619998fc20685c0dca
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>

diff --git a/arch/arm/boot/dts/qcom/sda630-cdp.dts b/arch/arm/boot/dts/qcom/sda630-cdp.dts
index 8db5a9e..665fa94 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda630-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda630-cdp.dts
@@ -15,6 +15,7 @@
 
 #include "sda630.dtsi"
 #include "sdm630-cdp.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L CDP";
@@ -23,3 +24,13 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda630-mtp.dts b/arch/arm/boot/dts/qcom/sda630-mtp.dts
index 5c43726..08a996d 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda630-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda630-mtp.dts
@@ -15,6 +15,7 @@
 
 #include "sda630.dtsi"
 #include "sdm630-mtp.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L MTP";
@@ -23,3 +24,7 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts
index 9afa16f..6094d22 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts
@@ -16,6 +16,7 @@
 #include "sda630.dtsi"
 #include "sdm630-cdp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A CDP";
@@ -23,3 +24,13 @@
        qcom,board-id = <1 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts
index 8bfd54e..49c1012 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts
@@ -16,6 +16,7 @@
 #include "sda630.dtsi"
 #include "sdm630-mtp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A MTP";
@@ -23,3 +24,7 @@
        qcom,board-id = <8 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts
index 04f2c37..aed97f1 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts
@@ -16,6 +16,7 @@
 #include "sda630.dtsi"
 #include "sdm630-cdp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A RCM";
@@ -23,3 +24,13 @@
        qcom,board-id = <21 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda630-rcm.dts b/arch/arm/boot/dts/qcom/sda630-rcm.dts
index 4a2ed26..5bc031a 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda630-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sda630-rcm.dts
@@ -23,3 +23,13 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda660-cdp.dts b/arch/arm/boot/dts/qcom/sda660-cdp.dts
index 43e43f7..9209772 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda660-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda660-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-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
@@ -15,6 +15,7 @@
 
 #include "sda660.dtsi"
 #include "sdm660-cdp.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660L CDP";
@@ -23,3 +24,13 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda660-mtp.dts b/arch/arm/boot/dts/qcom/sda660-mtp.dts
index 0e14f3d..027137e 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda660-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda660-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-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
@@ -15,6 +15,7 @@
 
 #include "sda660.dtsi"
 #include "sdm660-mtp.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660L MTP";
@@ -23,3 +24,7 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda660-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sda660-pm660a-cdp.dts
index bfccd54..a46083a 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda660-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sda660-pm660a-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-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
@@ -16,6 +16,7 @@
 #include "sda660.dtsi"
 #include "sdm660-cdp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660A CDP";
@@ -23,3 +24,13 @@
        qcom,board-id = <1 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda660-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sda660-pm660a-mtp.dts
index 1b7cfe1..d94cf8e 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda660-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sda660-pm660a-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-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
@@ -16,6 +16,7 @@
 #include "sda660.dtsi"
 #include "sdm660-mtp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660A MTP";
@@ -23,3 +24,7 @@
        qcom,board-id = <8 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda660-pm660a-rcm.dts b/arch/arm/boot/dts/qcom/sda660-pm660a-rcm.dts
index aa7a890..7172d00 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda660-pm660a-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sda660-pm660a-rcm.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-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
@@ -16,6 +16,7 @@
 #include "sda660.dtsi"
 #include "sdm660-cdp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660A RCM";
@@ -23,3 +24,13 @@
        qcom,board-id = <21 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sda660-rcm.dts b/arch/arm/boot/dts/qcom/sda660-rcm.dts
index 73ea188..1a79046 100644 (file)
--- a/arch/arm/boot/dts/qcom/sda660-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sda660-rcm.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-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
@@ -15,6 +15,7 @@
 
 #include "sda660.dtsi"
 #include "sdm660-cdp.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660L RCM";
@@ -23,3 +24,13 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sdm630-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-cdp.dts
index 9ad4322..973df0d 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-cdp.dts
@@ -15,6 +15,7 @@
 
 #include "sdm630.dtsi"
 #include "sdm630-cdp.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L CDP";
@@ -23,3 +24,13 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts
index c15abc5..baa55fa 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts
@@ -15,6 +15,7 @@
 
 #include "sdm630.dtsi"
 #include "sdm630-cdp.dtsi"
+#include "sdm660-internal-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L Int. Audio Codec CDP";

diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-mtp.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-mtp.dts
index 0e18039..b469a59 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-mtp.dts
@@ -15,6 +15,7 @@
 
 #include "sdm630.dtsi"
 #include "sdm630-mtp.dtsi"
+#include "sdm660-internal-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L Int. Audio Codec MTP";
@@ -23,3 +24,7 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&int_codec {
+       qcom,model = "sdm660-snd-card-mtp";
+};

diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-cdp.dts
index fc4c216..c4e7183 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-cdp.dts
@@ -16,6 +16,7 @@
 #include "sdm630.dtsi"
 #include "sdm630-cdp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-internal-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A Int. Audio Codec CDP";

diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-mtp.dts
index aab0eda..e11cdfb 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-mtp.dts
@@ -16,6 +16,7 @@
 #include "sdm630.dtsi"
 #include "sdm630-mtp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-internal-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A Int. Audio Codec MTP";
@@ -23,3 +24,7 @@
        qcom,board-id = <8 1>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&int_codec {
+       qcom,model = "sdm660-snd-card-mtp";
+};

diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-rcm.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-rcm.dts
index f6e2d18..4cb49ce 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-rcm.dts
@@ -16,6 +16,7 @@
 #include "sdm630.dtsi"
 #include "sdm630-cdp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-internal-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A Int. Audio Codec RCM";

diff --git a/arch/arm/boot/dts/qcom/sdm630-internal-codec-rcm.dts b/arch/arm/boot/dts/qcom/sdm630-internal-codec-rcm.dts
index a6d318c..ee03652 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-internal-codec-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-internal-codec-rcm.dts
@@ -15,6 +15,7 @@
 
 #include "sdm630.dtsi"
 #include "sdm630-cdp.dtsi"
+#include "sdm660-internal-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L Int. Audio Codec RCM";

diff --git a/arch/arm/boot/dts/qcom/sdm630-mtp.dts b/arch/arm/boot/dts/qcom/sdm630-mtp.dts
index 4933fcb..b1a9bb8 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-mtp.dts
@@ -15,6 +15,7 @@
 
 #include "sdm630.dtsi"
 #include "sdm630-mtp.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L MTP";
@@ -23,3 +24,7 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
+};

diff --git a/arch/arm/boot/dts/qcom/sdm630-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm630-pm660a-cdp.dts
index 478f3ac..d9b6a8a 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-pm660a-cdp.dts
@@ -16,6 +16,7 @@
 #include "sdm630.dtsi"
 #include "sdm630-cdp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A CDP";
@@ -23,3 +24,13 @@
        qcom,board-id = <1 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sdm630-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm630-pm660a-mtp.dts
index 3da1116..8ebdbc0 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-pm660a-mtp.dts
@@ -16,6 +16,7 @@
 #include "sdm630.dtsi"
 #include "sdm630-mtp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A MTP";
@@ -23,3 +24,7 @@
        qcom,board-id = <8 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
+};

diff --git a/arch/arm/boot/dts/qcom/sdm630-pm660a-rcm.dts b/arch/arm/boot/dts/qcom/sdm630-pm660a-rcm.dts
index 49938fa..4bdbbbe 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-pm660a-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-pm660a-rcm.dts
@@ -16,6 +16,7 @@
 #include "sdm630.dtsi"
 #include "sdm630-cdp.dtsi"
 #include "msm-pm660a.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A RCM";
@@ -23,3 +24,13 @@
        qcom,board-id = <21 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sdm630-rcm.dts b/arch/arm/boot/dts/qcom/sdm630-rcm.dts
index 79b3f8e..1de2a4d 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sdm630-rcm.dts
@@ -15,6 +15,7 @@
 
 #include "sdm630.dtsi"
 #include "sdm630-cdp.dtsi"
+#include "sdm660-external-codec.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L RCM";
@@ -23,3 +24,13 @@
        qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
                        <0x0001001b 0x0201011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sdm630.dtsi b/arch/arm/boot/dts/qcom/sdm630.dtsi
index 7d0854d..ee989de 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm630.dtsi
@@ -15,6 +15,7 @@
 #include <dt-bindings/clock/qcom,gpu-sdm660.h>
 #include <dt-bindings/clock/qcom,mmcc-sdm660.h>
 #include <dt-bindings/clock/qcom,rpmcc.h>
+#include <dt-bindings/clock/audio-ext-clk.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
 #include <dt-bindings/clock/qcom,cpu-osm.h>
@@ -1845,6 +1846,8 @@
 #include "msm-gdsc-660.dtsi"
 #include "sdm660-common.dtsi"
 #include "msm-arm-smmu-630.dtsi"
+#include "msm-audio.dtsi"
+#include "sdm660-audio.dtsi"
 #include "sdm660-camera.dtsi"
 #include "sdm630-pm.dtsi"
 #include "sdm660-vidc.dtsi"

diff --git a/arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts
index 335f454..7ca31fc 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts
@@ -36,3 +36,13 @@
        lab-supply = <&lab_regulator>;
        ibb-supply = <&ibb_regulator>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};

diff --git a/arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts
index a783060..d6e1f6a 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts
@@ -36,3 +36,7 @@
        lab-supply = <&lab_regulator>;
        ibb-supply = <&ibb_regulator>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
+};

diff --git a/arch/arm/boot/dts/qcom/sdm660-pm660a-rcm.dts b/arch/arm/boot/dts/qcom/sdm660-pm660a-rcm.dts
index 6c3afd4..14af76f 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm660-pm660a-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-pm660a-rcm.dts
@@ -24,3 +24,13 @@
        qcom,board-id = <21 0>;
        qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
+
+&tavil_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+       qcom,msm-mbhc-hphl-swh = <0>;
+       qcom,msm-mbhc-gnd-swh = <0>;
+};