20.12.2021 13:48, Thierry Reding пишет: > From: Thierry Reding <treding@xxxxxxxxxx> > > Move the eDP panel on Venice 2 and Nyan boards into the corresponding > AUX bus device tree node. This allows us to avoid a nasty circular > dependency that would otherwise be created between the DPAUX and panel > nodes via the DDC/I2C phandle. > > Signed-off-by: Thierry Reding <treding@xxxxxxxxxx> > --- > arch/arm/boot/dts/tegra124-nyan-big.dts | 15 +++++++++------ > arch/arm/boot/dts/tegra124-nyan-blaze.dts | 15 +++++++++------ > arch/arm/boot/dts/tegra124-venice2.dts | 14 +++++++------- > 3 files changed, 25 insertions(+), 19 deletions(-) > > diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts > index 1d2aac2cb6d0..fdc1d64dfff9 100644 > --- a/arch/arm/boot/dts/tegra124-nyan-big.dts > +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts > @@ -13,12 +13,15 @@ / { > "google,nyan-big-rev1", "google,nyan-big-rev0", > "google,nyan-big", "google,nyan", "nvidia,tegra124"; > > - panel: panel { > - compatible = "auo,b133xtn01"; > - > - power-supply = <&vdd_3v3_panel>; > - backlight = <&backlight>; > - ddc-i2c-bus = <&dpaux>; > + host1x@50000000 { > + dpaux@545c0000 { > + aux-bus { > + panel: panel { > + compatible = "auo,b133xtn01"; > + backlight = <&backlight>; > + }; > + }; > + }; > }; > > mmc@700b0400 { /* SD Card on this bus */ > diff --git a/arch/arm/boot/dts/tegra124-nyan-blaze.dts b/arch/arm/boot/dts/tegra124-nyan-blaze.dts > index 677babde6460..abdf4456826f 100644 > --- a/arch/arm/boot/dts/tegra124-nyan-blaze.dts > +++ b/arch/arm/boot/dts/tegra124-nyan-blaze.dts > @@ -15,12 +15,15 @@ / { > "google,nyan-blaze-rev0", "google,nyan-blaze", > "google,nyan", "nvidia,tegra124"; > > - panel: panel { > - compatible = "samsung,ltn140at29-301"; > - > - power-supply = <&vdd_3v3_panel>; > - backlight = <&backlight>; > - ddc-i2c-bus = <&dpaux>; > + host1x@50000000 { > + dpaux@545c0000 { > + aux-bus { > + panel: panel { > + compatible = "samsung,ltn140at29-301"; > + backlight = <&backlight>; > + }; > + }; > + }; > }; > > sound { > diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts > index 232c90604df9..6a9592ceb5f2 100644 > --- a/arch/arm/boot/dts/tegra124-venice2.dts > +++ b/arch/arm/boot/dts/tegra124-venice2.dts > @@ -48,6 +48,13 @@ sor@54540000 { > dpaux@545c0000 { > vdd-supply = <&vdd_3v3_panel>; > status = "okay"; > + > + aux-bus { > + panel: panel { > + compatible = "lg,lp129qe"; > + backlight = <&backlight>; > + }; > + }; > }; > }; > > @@ -1080,13 +1087,6 @@ power { > }; > }; > > - 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"; > You should add stable tag for 5.15 and also add separate patch to update the new arch/arm/boot/dts/tegra124-nyan-big-fhd.dts which we have in -next now.