Unverified Commit 31e985a2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.4-arm-dt' of... 

Merge tag 'tegra-for-6.4-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt

ARM: tegra: Device tree changes for v6.4-rc1

There are several fixes and cleanups here for some of the older Tegra
consumer devices.

* tag 'tegra-for-6.4-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra30: Use cpu* labels
  ARM: tegra30: peripherals: Add 266.5MHz nodes
  ARM: tegra: asus-tf101: Fix accelerometer mount matrix
  ARM: tegra: transformers: Bind RT5631 sound nodes
  ARM: tegra: transformers: Update WM8903 sound nodes

Link: https://lore.kernel.org/r/20230406124804.970394-5-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 065b3ec7 13a53ebc

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

+10 −9
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 */

			>;
@@ -577,9 +577,9 @@ accelerometer@f { 
					vdd-supply = <&vdd_1v8_sys>;

					vddio-supply = <&vdd_1v8_sys>;



					mount-matrix =	 "1",  "0",  "0",

							 "0",  "1",  "0",

							 "0",  "0",  "1";

					mount-matrix =	"-1",  "0",  "0",

							 "0", "-1",  "0",

							 "0",  "0", "-1";

				};

			};

		};
@@ -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-tf201.dts

+17 −0
Original line number Diff line number Diff line
@@ -624,4 +624,21 @@ opp-table-emc { 
		/delete-node/ opp-800000000-1300;

		/delete-node/ opp-900000000-1350;

	};



	sound {

		compatible = "asus,tegra-audio-rt5631-tf201",

			     "nvidia,tegra-audio-rt5631";

		nvidia,model = "Asus Transformer Prime TF201 RT5631";



		nvidia,audio-routing =

			"Headphone Jack", "HPOL",

			"Headphone Jack", "HPOR",

			"Int Spk", "SPOL",

			"Int Spk", "SPOR",

			"MIC1", "MIC Bias1",

			"MIC Bias1", "Mic Jack",

			"DMIC", "Int Mic";



		nvidia,audio-codec = <&rt5631>;

	};

};

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

+17 −0
Original line number Diff line number Diff line
@@ -1084,4 +1084,21 @@ opp-table-actmon { 
		/delete-node/ opp-800000000;

		/delete-node/ opp-900000000;

	};



	sound {

		compatible = "asus,tegra-audio-rt5631-tf300tg",

			     "nvidia,tegra-audio-rt5631";

		nvidia,model = "Asus Transformer Pad TF300TG RT5631";



		nvidia,audio-routing =

			"Headphone Jack", "HPOL",

			"Headphone Jack", "HPOR",

			"Int Spk", "SPOL",

			"Int Spk", "SPOR",

			"MIC1", "MIC Bias1",

			"MIC Bias1", "Mic Jack",

			"DMIC", "Int Mic";



		nvidia,audio-codec = <&rt5631>;

	};

};

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

+17 −0
Original line number Diff line number Diff line
@@ -820,4 +820,21 @@ vdd_1v2_mipi: regulator-mipi { 
		enable-active-high;

		vin-supply = <&vdd_3v3_sys>;

	};



	sound {

		compatible = "asus,tegra-audio-rt5631-tf700t",

			     "nvidia,tegra-audio-rt5631";

		nvidia,model = "Asus Transformer Infinity TF700T RT5631";



		nvidia,audio-routing =

			"Headphone Jack", "HPOL",

			"Headphone Jack", "HPOR",

			"Int Spk", "SPOL",

			"Int Spk", "SPOR",

			"MIC1", "MIC Bias1",

			"MIC Bias1", "Mic Jack",

			"DMIC", "Int Mic";



		nvidia,audio-codec = <&rt5631>;

	};

};