Unverified Commit 60392db6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.17-arm-dt-fixes-2' of...

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

ARM: tegra: Device tree fixes for v5.17

One more patch to fix up eDP panels on Nyan FHD models.

* tag 'tegra-for-5.17-arm-dt-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Move Nyan FHD panels to AUX bus
  ARM: tegra: Move panels to AUX bus

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5125091d 7401b49c
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -5,7 +5,13 @@

/ {
	/* Version of Nyan Big with 1080p panel */
	panel {
	host1x@50000000 {
		dpaux@545c0000 {
			aux-bus {
				panel: panel {
					compatible = "auo,b133htn01";
				};
			};
		};
	};
};
+9 −6
Original line number Diff line number Diff line
@@ -13,12 +13,15 @@
		     "google,nyan-big-rev1", "google,nyan-big-rev0",
		     "google,nyan-big", "google,nyan", "nvidia,tegra124";

	host1x@50000000 {
		dpaux@545c0000 {
			aux-bus {
				panel: panel {
					compatible = "auo,b133xtn01";

		power-supply = <&vdd_3v3_panel>;
					backlight = <&backlight>;
		ddc-i2c-bus = <&dpaux>;
				};
			};
		};
	};

	mmc@700b0400 { /* SD Card on this bus */
+9 −6
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@
		     "google,nyan-blaze-rev0", "google,nyan-blaze",
		     "google,nyan", "nvidia,tegra124";

	host1x@50000000 {
		dpaux@545c0000 {
			aux-bus {
				panel: panel {
					compatible = "samsung,ltn140at29-301";

		power-supply = <&vdd_3v3_panel>;
					backlight = <&backlight>;
		ddc-i2c-bus = <&dpaux>;
				};
			};
		};
	};

	sound {
+7 −7
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@
		dpaux@545c0000 {
			vdd-supply = <&vdd_3v3_panel>;
			status = "okay";

			aux-bus {
				panel: panel {
					compatible = "lg,lp129qe";
					backlight = <&backlight>;
				};
			};
		};
	};

@@ -1080,13 +1087,6 @@
		};
	};

	panel: panel {
		compatible = "lg,lp129qe";
		power-supply = <&vdd_3v3_panel>;
		backlight = <&backlight>;
		ddc-i2c-bus = <&dpaux>;
	};

	vdd_mux: regulator-mux {
		compatible = "regulator-fixed";
		regulator-name = "+VDD_MUX";