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

Merge tag 'tegra-for-6.7-arm64-dt' of... 

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

arm64: tegra: Device tree changes for v6.7-rc1

This contains some fixes for Tegra234 boards as well as some cleanups
that will help with json-schema validation.

For older devices, there's now support for display on Smaug (a.k.a.
Pixel C) and the IOMMU for host1x is enabled on Tegra132, which should
help with large memory allocations for display and multimedia.

* tag 'tegra-for-6.7-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Use correct interrupts for Tegra234 TKE
  arm64: tegra: Add power-sensors for Tegra234 boards
  arm64: tegra: Mark Tegra234 SPI as compatible with Tegra114
  arm64: tegra: Add dmas and dma-names for Tegra234 UARTE
  arm64: tegra: Use correct format for clocks property
  arm64: tegra: Remove duplicate nodes on Jetson Orin NX
  arm64: tegra: Add missing current-speed for SBSA UART
  arm64: tegra: Add display panel node on Smaug
  arm64: tegra: Add backlight node on Smaug
  arm64: tegra: Add DSI/CSI regulator on Smaug
  arm64: tegra: Enable IOMMU for host1x on Tegra132
  arm64: tegra: Fix P3767 QSPI speed
  arm64: tegra: Fix P3767 card detect polarity

Link: https://lore.kernel.org/r/20231013153723.1729109-6-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents afec904a c0b80988

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

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ host1x@50000000 { 
		resets = <&tegra_car 28>;

		reset-names = "host1x";



		iommus = <&mc TEGRA_SWGROUP_HC>;



		#address-cells = <2>;

		#size-cells = <2>;

arch/arm64/boot/dts/nvidia/tegra210-smaug.dts

+66 −0
Original line number Diff line number Diff line
@@ -31,6 +31,33 @@ memory { 
	};



	host1x@50000000 {

		dsia: dsi@54300000 {

			avdd-dsi-csi-supply = <&vdd_dsi_csi>;

			status = "okay";



			link2: panel@0 {

				compatible = "jdi,lpm102a188a";

				reg = <0>;

			};

		};



		dsib: dsi@54400000 {

			avdd-dsi-csi-supply = <&vdd_dsi_csi>;

			nvidia,ganged-mode = <&dsia>;

			status = "okay";



			link1: panel@0 {

				compatible = "jdi,lpm102a188a";

				reg = <0>;

				power-supply = <&pplcd_vdd>;

				ddi-supply = <&pp1800_lcdio>;

				enable-gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;

				reset-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

				link2 = <&link2>;

				backlight = <&backlight>;

			};

		};



		dpaux: dpaux@545c0000 {

			status = "okay";

		};
@@ -1651,6 +1678,37 @@ nau8825@1a { 
			status = "okay";

		};



		backlight: backlight@2c {

			compatible = "ti,lp8557";

			reg = <0x2c>;

			power-supply = <&pplcd_vdd>;

			enable-supply = <&pp1800_lcdio>;

			bl-name = "lp8557-backlight";

			dev-ctrl = /bits/ 8 <0x01>;

			init-brt = /bits/ 8 <0x80>;



			/* Full scale current, 20mA */

			rom-11h {

				rom-addr = /bits/ 8 <0x11>;

				rom-val = /bits/ 8 <0x05>;

			};

			/* Frequency = 4.9kHz, magic undocumented val */

			rom-12h {

				rom-addr = /bits/ 8 <0x12>;

				rom-val = /bits/ 8 <0x29>;

			};

			/* Boost freq = 1MHz, BComp option = 1 */

			rom-13h {

				rom-addr = /bits/ 8 <0x13>;

				rom-val = /bits/ 8 <0x03>;

			};

			/* 4V OV, 6 output LED string enabled */

			rom-14h {

				rom-addr = /bits/ 8 <0x14>;

				rom-val = /bits/ 8 <0xbf>;

			};

		};



		audio-codec@2d {

			compatible = "realtek,rt5677";

			reg = <0x2d>;
@@ -1932,4 +1990,12 @@ usbc_vbus: regulator-usbc-vbus { 
		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	vdd_dsi_csi: regulator-vdd-dsi-csi {

		compatible = "regulator-fixed";

		regulator-name = "AVDD_DSI_CSI_1V2";

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

		vin-supply = <&pp1200_avdd>;

	};

};

arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -44,6 +44,39 @@ i2c@c240000 { 
			status = "okay";

		};



		i2c@c250000 {

			power-sensor@41 {

				compatible = "ti,ina3221";

				reg = <0x41>;

				#address-cells = <1>;

				#size-cells = <0>;



				input@0 {

					reg = <0x0>;

					label = "CVB_ATX_12V";

					shunt-resistor-micro-ohms = <2000>;

				};



				input@1 {

					reg = <0x1>;

					label = "CVB_ATX_3V3";

					shunt-resistor-micro-ohms = <2000>;

				};



				input@2 {

					reg = <0x2>;

					label = "CVB_ATX_5V";

					shunt-resistor-micro-ohms = <2000>;

				};

			};



			power-sensor@44 {

				compatible = "ti,ina219";

				reg = <0x44>;

				shunt-resistor = <2000>;

			};

		};



		rtc@c2a0000 {

			status = "okay";

		};

arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi

+53 −0
Original line number Diff line number Diff line
@@ -1987,5 +1987,58 @@ interrupt-controller@2a40000 { 
				status = "okay";

			};

		};



		i2c@c240000 {

			status = "okay";



			power-sensor@40 {

				compatible = "ti,ina3221";

				reg = <0x40>;

				#address-cells = <1>;

				#size-cells = <0>;



				input@0 {

					reg = <0x0>;

					label = "VDD_GPU_SOC";

					shunt-resistor-micro-ohms = <2000>;

				};



				input@1 {

					reg = <0x1>;

					label = "VDD_CPU_CV";

					shunt-resistor-micro-ohms = <2000>;

				};



				input@2 {

					reg = <0x2>;

					label = "VIN_SYS_5V0";

					shunt-resistor-micro-ohms = <2000>;

					ti,summation-disable;

				};

			};



			power-sensor@41 {

				compatible = "ti,ina3221";

				reg = <0x41>;

				#address-cells = <1>;

				#size-cells = <0>;



				input@0 {

					reg = <0x0>;

					status = "disabled";

				};



				input@1 {

					reg = <0x1>;

					label = "VDDQ_VDD2_1V8AO";

					shunt-resistor-micro-ohms = <2000>;

				};



				input@2 {

					reg = <0x2>;

					status = "disabled";

				};

			};

		};

	};

};

arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ serial@3100000 { 
		};



		serial@31d0000 {

			current-speed = <115200>;

			status = "okay";

		};