[SQUASH] ARM: tegra: transformers: add rt5631 tegra sound nodes

- fix headset detection in common device tree;
- diverge control and detect elements for mic;
- use GPIO mic detection on wm8903 devices;

Signed-off-by: Svyatoslav Ryhel <[email protected]>

Author: clamor-s

arch/arm/boot/dts/tegra20-asus-tf101.dts

@@ -1230,15 +1230,17 @@
 			"Int Spk", "RON",
 			"Int Spk", "LOP",
 			"Int Spk", "LON",
-			"Mic Jack", "MICBIAS",
-			"IN1L", "Mic Jack";
+			"IN1L", "Headset Mic",
+			"IN2L", "Headset Mic",
+			"DMICDAT", "Int Mic";
 
 		nvidia,i2s-controller = <&tegra_i2s1>;
 		nvidia,audio-codec = <&wm8903>;
 
 		nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
 		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
-		nvidia,headset;
+		nvidia,mic-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
+		nvidia,coupled-mic-hp-det;
 
 		clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
 			 <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,

arch/arm/boot/dts/tegra30-asus-tf201.dts

@@ -660,7 +660,7 @@
 			"Int Spk", "SPOL",
 			"Int Spk", "SPOR",
 			"MIC1", "MIC Bias1",
-			"MIC Bias1", "Mic Jack",
+			"MIC Bias1", "Headset Mic",
 			"DMIC", "Int Mic";
 
 		nvidia,audio-codec = <&rt5631>;

arch/arm/boot/dts/tegra30-asus-tf300t.dts

@@ -1054,13 +1054,12 @@
 			"Int Spk", "RON",
 			"Int Spk", "LOP",
 			"Int Spk", "LON",
-			"IN1L", "Mic Jack",
-			"IN2L", "Mic Jack",
+			"IN1L", "Headset Mic",
+			"IN2L", "Headset Mic",
 			"DMICDAT", "Int Mic";
 
 		nvidia,audio-codec = <&wm8903>;
 		nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
-		nvidia,headset;
 	};
 };
 

arch/arm/boot/dts/tegra30-asus-tf300tg.dts

@@ -1117,7 +1117,7 @@
 			"Int Spk", "SPOL",
 			"Int Spk", "SPOR",
 			"MIC1", "MIC Bias1",
-			"MIC Bias1", "Mic Jack",
+			"MIC Bias1", "Headset Mic",
 			"DMIC", "Int Mic";
 
 		nvidia,audio-codec = <&rt5631>;

arch/arm/boot/dts/tegra30-asus-tf700t.dts

@@ -857,7 +857,7 @@
 			"Int Spk", "SPOL",
 			"Int Spk", "SPOR",
 			"MIC1", "MIC Bias1",
-			"MIC Bias1", "Mic Jack",
+			"MIC Bias1", "Headset Mic",
 			"DMIC", "Int Mic";
 
 		nvidia,audio-codec = <&rt5631>;

arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi

@@ -550,18 +550,18 @@
 				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
 			};
 
-			spi2_cs1_n_pw2 {
+			hp_detect {
 				nvidia,pins = "spi2_cs1_n_pw2";
 				nvidia,function = "spi2";
 				nvidia,pull = <TEGRA_PIN_PULL_UP>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
 			};
 
-			spi2_sck_px2 {
+			mic_detect {
 				nvidia,pins = "spi2_sck_px2";
 				nvidia,function = "spi2";
-				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,pull = <TEGRA_PIN_PULL_UP>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
 			};
@@ -1727,7 +1727,8 @@
 		nvidia,i2s-controller = <&tegra_i2s1>;
 
 		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
-		nvidia,hp-mute-gpios = <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_LOW>;
+		nvidia,mic-det-gpios = <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_LOW>;
+		nvidia,coupled-mic-hp-det;
 
 		clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
 			 <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,

arch/arm/boot/dts/tegra30-pegatron-chagall.dts

@@ -2776,7 +2776,7 @@
 			"Int Spk", "RON",
 			"Int Spk", "LOP",
 			"Int Spk", "LON",
-			"IN1R", "Mic Jack",
+			"IN1R", "Headset Mic",
 			"DMICDAT", "Int Mic";
 
 		nvidia,i2s-controller = <&tegra_i2s1>;