Commit 06ceddef authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.10-arm64-dt-fixes' of... 

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

arm64: tegra: Device tree fixes for v5.10-rc6

This contains a couple of fixes to device trees. Among other things,
this restores suspend/resume on Jetson TX2 and makes USB OTG work on
Jetson TX1.

* tag 'tegra-for-5.10-arm64-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Fix Tegra234 VDK node names
  arm64: tegra: Wrong AON HSP reg property size
  arm64: tegra: Fix USB_VBUS_EN0 regulator on Jetson TX1
  arm64: tegra: Correct the UART for Jetson Xavier NX
  arm64: tegra: Disable the ACONNECT for Jetson TX2

Link: https://lore.kernel.org/r/20201125170306.1095734-1-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3a18293e d98bccf1

arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts

+0 −12
Original line number Diff line number Diff line
@@ -10,18 +10,6 @@ 
	model = "NVIDIA Jetson TX2 Developer Kit";

	compatible = "nvidia,p2771-0000", "nvidia,tegra186";



	aconnect {

		status = "okay";



		dma-controller@2930000 {

			status = "okay";

		};



		interrupt-controller@2a40000 {

			status = "okay";

		};

	};



	i2c@3160000 {

		power-monitor@42 {

			compatible = "ti,ina3221";

arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
			status = "okay";

		};



		serial@c280000 {

		serial@3100000 {

			status = "okay";

		};

arch/arm64/boot/dts/nvidia/tegra194.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ 


		hsp_aon: hsp@c150000 {

			compatible = "nvidia,tegra194-hsp", "nvidia,tegra186-hsp";

			reg = <0x0c150000 0xa0000>;

			reg = <0x0c150000 0x90000>;

			interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,

			             <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,

			             <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -1663,16 +1663,6 @@ 
		vin-supply = <&vdd_5v0_sys>;

	};



	vdd_usb_vbus_otg: regulator@11 {

		compatible = "regulator-fixed";

		regulator-name = "USB_VBUS_EN0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;

		enable-active-high;

		vin-supply = <&vdd_5v0_sys>;

	};



	vdd_hdmi: regulator@10 {

		compatible = "regulator-fixed";

		regulator-name = "VDD_HDMI_5V0";
@@ -1712,4 +1702,14 @@ 
		enable-active-high;

		vin-supply = <&vdd_3v3_sys>;

	};



	vdd_usb_vbus_otg: regulator@14 {

		compatible = "regulator-fixed";

		regulator-name = "USB_VBUS_EN0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;

		enable-active-high;

		vin-supply = <&vdd_5v0_sys>;

	};

};

arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
	compatible = "nvidia,tegra234-vdk", "nvidia,tegra234";



	aliases {

		sdhci3 = "/cbb@0/sdhci@3460000";

		mmc3 = "/bus@0/mmc@3460000";

		serial0 = &uarta;

	};
@@ -17,12 +17,12 @@ 
		stdout-path = "serial0:115200n8";

	};



	cbb@0 {

	bus@0 {

		serial@3100000 {

			status = "okay";

		};



		sdhci@3460000 {

		mmc@3460000 {

			status = "okay";

			bus-width = <8>;

			non-removable;

CRA Git | Maintained and supported by SUSTech CRA and CCSE