Unverified Commit f08a71d2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

ARM: tegra: Device tree changes for v5.18-rc1

The changes in this set are cleanups and fixes for 32-bit Tegra device
tree files. With these, some json-schema validation errors are fixed.

* tag 'tegra-for-5.18-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: tamonten: Fix I2C3 pad setting
  ARM: tegra: Fix ethernet node names
  ARM: tegra: paz00: Add MMC aliases
  ARM: tegra: tf700t: Rename DSI node
  ARM: tegra: transformer: Drop reg-shift for Tegra HS UART
  ARM: tegra: asus-tf101: Enable S/PDIF and HDMI audio
  ARM: tegra: Update jedec,lpddr2 revision-id binding

Link: https://lore.kernel.org/r/20220225164741.1064416-3-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cba4cdeb 0092c25b

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

+11 −1
Original line number Diff line number Diff line
@@ -436,17 +436,27 @@ pta { 
		};

	};



	spdif@70002400 {

		status = "okay";



		nvidia,fixed-parent-rate;

	};



	i2s@70002800 {

		status = "okay";



		nvidia,fixed-parent-rate;

	};



	serial@70006040 {

		compatible = "nvidia,tegra20-hsuart";

		/delete-property/ reg-shift;

		/* GPS BCM4751 */

	};



	serial@70006200 {

		compatible = "nvidia,tegra20-hsuart";

		/delete-property/ reg-shift;

		status = "okay";



		/* Azurewave AW-NH615 BCM4329B1 */
@@ -756,7 +766,7 @@ emc-tables@3 { 


			lpddr2 {

				compatible = "elpida,B8132B2PB-6D-F", "jedec,lpddr2-s4";

				revision-id1 = <1>;

				revision-id = <1 0>;

				density = <2048>;

				io-width = <16>;

			};

arch/arm/boot/dts/tegra20-colibri.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ usb@c5004000 { 
		#address-cells = <1>;

		#size-cells = <0>;



		asix@1 {

		ethernet@1 {

			compatible = "usbb95,772b";

			reg = <1>;

			local-mac-address = [00 00 00 00 00 00];

arch/arm/boot/dts/tegra20-paz00.dts

+4 −2
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ / { 
	compatible = "compal,paz00", "nvidia,tegra20";



	aliases {

		mmc0 = &sdmmc4; /* eMMC */

		mmc1 = &sdmmc1; /* MicroSD */

		rtc0 = "/i2c@7000d000/tps6586x@34";

		rtc1 = "/rtc@7000e000";

		serial0 = &uarta;
@@ -558,7 +560,7 @@ usb-phy@c5008000 { 
		status = "okay";

	};



	mmc@c8000000 {

	sdmmc1: mmc@c8000000 {

		status = "okay";

		cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -566,7 +568,7 @@ mmc@c8000000 { 
		bus-width = <4>;

	};



	mmc@c8000600 {

	sdmmc4: mmc@c8000600 {

		status = "okay";

		bus-width = <8>;

		non-removable;

arch/arm/boot/dts/tegra20-tamonten.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -183,8 +183,8 @@ uca { 
			};

			conf_ata {

				nvidia,pins = "ata", "atb", "atc", "atd", "ate",

					"cdev1", "cdev2", "dap1", "dtb", "gma",

					"gmb", "gmc", "gmd", "gme", "gpu7",

					"cdev1", "cdev2", "dap1", "dtb", "dtf",

					"gma", "gmb", "gmc", "gmd", "gme", "gpu7",

					"gpv", "i2cp", "irrx", "irtx", "pta",

					"rm", "slxa", "slxk", "spia", "spib",

					"uac";
@@ -203,7 +203,7 @@ conf_csus { 
			};

			conf_crtp {

				nvidia,pins = "crtp", "dap2", "dap3", "dap4",

					"dtc", "dte", "dtf", "gpu", "sdio1",

					"dtc", "dte", "gpu", "sdio1",

					"slxc", "slxd", "spdi", "spdo", "spig",

					"uda";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

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

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ i2c@1 { 
			#address-cells = <1>;

			#size-cells = <0>;



			dsi-bridge@7 {

			dsi@7 {

				compatible = "toshiba,tc358768";

				reg = <0x7>;