Commit 2b481064 authored by Svyatoslav Ryhel's avatar Svyatoslav Ryhel Committed by Thierry Reding
Browse files

ARM: tegra: transformers: Update WM8903 sound nodes 



Fix headset detection and use device GPIO microphone detection on WM8903
Transformers.

Signed-off-by: default avatarSvyatoslav Ryhel <clamor95@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent fe15c26e

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

+7 −6
Original line number Diff line number Diff line
@@ -520,10 +520,10 @@ wm8903: audio-codec@1a { 
			micdet-delay = <100>;



			gpio-cfg = <

				0xffffffff /* don't touch */

				0xffffffff /* don't touch */

				0x00000600 /* DMIC_LR, output */

				0x00000680 /* DMIC_DAT, input */

				0x00000000 /* Speaker-enable GPIO, output, low */

				0x00000400 /* Mic bias current detect */

				0xffffffff /* don't touch */

				0xffffffff /* don't touch */

			>;
@@ -1184,15 +1184,16 @@ sound { 
			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1L", "Mic Jack";

			"IN2L", "Mic Jack",

			"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_LOW>;

		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-tf300t.dts

+2 −4
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ wm8903: audio-codec@1a { 
			micdet-delay = <100>;



			gpio-cfg = <

				0xffffffff /* don't touch */

				0xffffffff /* don't touch */

				0x00000600 /* DMIC_LR, output */

				0x00000680 /* DMIC_DAT, input */

				0x00000000 /* Speaker-enable GPIO, output, low */

				0xffffffff /* don't touch */

				0xffffffff /* don't touch */
@@ -1023,12 +1023,10 @@ sound { 
			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"IN1L", "Mic Jack",

			"IN2L", "Mic Jack",

			"DMICDAT", "Int Mic";



		nvidia,audio-codec = <&wm8903>;

		nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;

		nvidia,headset;

	};

};

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

+5 −4
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ spi1_mosi_px4 { 
				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>;
@@ -566,10 +566,10 @@ spi2_cs1_n_pw2 { 
				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>;

			};
@@ -1674,7 +1674,8 @@ sound { 
		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>,