ARM: dts: msm: Add audio fixes for SDM660

Update internal codec settings for RX/TX devices.
Disable lpass notifier in analog codec driver.
Handle 44.1K support in machine driver to
disable MCLK before request for change in
MCLK frequency.

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

9 files changed, 20 insertions, 37 deletions

diff --git a/arch/arm/boot/dts/qcom/msm-audio.dtsi b/arch/arm/boot/dts/qcom/msm-audio.dtsi
index e4903a821bc1..bc960093fcea 100644
--- a/arch/arm/boot/dts/qcom/msm-audio.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-audio.dtsi
@@ -827,6 +827,7 @@
 		qcom,msm-mclk-freq = <9600000>;
 		qcom,msm-mbhc-hphl-swh = <1>;
 		qcom,msm-mbhc-gnd-swh = <1>;
+		qcom,msm-micbias2-ext-cap;
 		qcom,msm-hs-micbias-type = "external";
 		qcom,us-euro-gpios = <&us_euro_gpio>;
 		qcom,cdc-pdm-gpios = <&cdc_pdm_gpios>;
@@ -928,7 +929,6 @@
 	};
 
 	clock_audio: audio_ext_clk {
-		status = "disabled";
 		compatible = "qcom,audio-ref-clk";
 		qcom,audio-ref-clk-gpio = <&pm660_gpios 3 0>;
 		clock-names = "osr_clk";
diff --git a/arch/arm/boot/dts/qcom/sdm660-audio.dtsi b/arch/arm/boot/dts/qcom/sdm660-audio.dtsi
index 766642dced6a..6f9a6f9ee946 100644
--- a/arch/arm/boot/dts/qcom/sdm660-audio.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660-audio.dtsi
@@ -167,8 +167,8 @@
 	cdc_pdm_gpios: cdc_pdm_pinctrl {
 		compatible = "qcom,msm-cdc-pinctrl";
 		pinctrl-names = "aud_active", "aud_sleep";
-		pinctrl-0 = <&cdc_pdm_gpios_active>;
-		pinctrl-1 = <&cdc_pdm_gpios_sleep>;
+		pinctrl-0 = <&cdc_pdm_gpios_active &cdc_pdm_2_gpios_active>;
+		pinctrl-1 = <&cdc_pdm_gpios_sleep &cdc_pdm_2_gpios_sleep>;
 		qcom,lpi-gpios;
 	};
 
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec-cdp.dts b/arch/arm/boot/dts/qcom/sdm660-internal-codec-cdp.dts
index c5d4504fd97e..6755385313b1 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec-cdp.dts
@@ -24,9 +24,3 @@
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
 			<0x0001001b 0x0201011a 0x0 0x0>;
 };
-
-&int_codec {
-	status = "okay";
-	qcom,msm-hs-micbias-type = "internal";
-	qcom,msm-micbias2-ext-cap;
-};
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec-mtp.dts b/arch/arm/boot/dts/qcom/sdm660-internal-codec-mtp.dts
index 9d5453240ef9..39da13e7565b 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec-mtp.dts
@@ -27,5 +27,4 @@
 
 &int_codec {
 	qcom,model = "sdm660-snd-card-mtp";
-	status = "okay";
 };
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-cdp.dts
index 6990c299d4e2..caf8af514237 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-cdp.dts
@@ -24,9 +24,3 @@
 	qcom,board-id = <1 1>;
 	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
-
-&int_codec {
-	status = "okay";
-	qcom,msm-hs-micbias-type = "internal";
-	qcom,msm-micbias2-ext-cap;
-};
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-rcm.dts b/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-rcm.dts
index 03b0e029a569..462362211f5b 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec-pm660a-rcm.dts
@@ -24,9 +24,3 @@
 	qcom,board-id = <21 1>;
 	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
 };
-
-&int_codec {
-	status = "okay";
-	qcom,msm-hs-micbias-type = "internal";
-	qcom,msm-micbias2-ext-cap;
-};
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec-rcm.dts b/arch/arm/boot/dts/qcom/sdm660-internal-codec-rcm.dts
index fc79dc9a36ee..8d95f8c422f9 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec-rcm.dts
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec-rcm.dts
@@ -24,9 +24,3 @@
 	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
 			<0x0001001b 0x0201011a 0x0 0x0>;
 };
-
-&int_codec {
-	status = "okay";
-	qcom,msm-hs-micbias-type = "internal";
-	qcom,msm-micbias2-ext-cap;
-};
diff --git a/arch/arm/boot/dts/qcom/sdm660-internal-codec.dtsi b/arch/arm/boot/dts/qcom/sdm660-internal-codec.dtsi
index 512918966f6d..5f36e76c910d 100644
--- a/arch/arm/boot/dts/qcom/sdm660-internal-codec.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660-internal-codec.dtsi
@@ -70,6 +70,10 @@
 	status = "disabled";
 };
 
+&int_codec {
+	status = "okay";
+};
+
 &pmic_analog_codec {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/qcom/sdm660-lpi.dtsi b/arch/arm/boot/dts/qcom/sdm660-lpi.dtsi
index 195128f3ad43..1fcf0993c4b3 100644
--- a/arch/arm/boot/dts/qcom/sdm660-lpi.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660-lpi.dtsi
@@ -157,51 +157,55 @@
 
 		cdc_dmic12_gpios_active: dmic12_gpios_active {
 			mux {
-				pins = "gpio26", "gpio27";
+				pins = "gpio26", "gpio28";
 				function = "func1";
 			};
 
 			config {
-				pins = "gpio26", "gpio27";
+				pins = "gpio26", "gpio28";
 				drive-strength = <8>;
+				output-high;
 			};
 		};
 
 		cdc_dmic12_gpios_sleep: dmic12_gpios_sleep {
 			mux {
-				pins = "gpio26", "gpio27";
+				pins = "gpio26", "gpio28";
 				function = "func1";
 			};
 
 			config {
-				pins = "gpio26", "gpio27";
+				pins = "gpio26", "gpio28";
 				drive-strength = <2>;
 				bias-disable;
+				output-low;
 			};
 		};
 
 		cdc_dmic34_gpios_active: dmic34_gpios_active {
 			mux {
-				pins = "gpio28", "gpio29";
+				pins = "gpio27", "gpio29";
 				function = "func1";
 			};
 
 			config {
-				pins = "gpio28", "gpio29";
+				pins = "gpio27", "gpio29";
 				drive-strength = <8>;
+				input-enable;
 			};
 		};
 
 		cdc_dmic34_gpios_sleep: dmic34_gpios_sleep {
 			mux {
-				pins = "gpio28", "gpio29";
+				pins = "gpio27", "gpio29";
 				function = "func1";
 			};
 
 			config {
-				pins = "gpio28", "gpio29";
+				pins = "gpio27", "gpio29";
 				drive-strength = <2>;
-				bias-disable;
+				pull-down;
+				input-enable;
 			};
 		};
 	};