| Message ID | 20190731073744.13963-1-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 45f5d5a9e34d3fe4140a9a3b5f7ebe86c252440a |
| Headers | show |
| Series | arm64: dts: renesas: r8a77995: draak: Fix backlight regulator name | expand |
Hi Simon, On Wed, Jul 31, 2019 at 9:37 AM Geert Uytterhoeven <geert+renesas@glider.be> wrote: > Currently there are two nodes named "regulator1" in the Draak DTS: a > 3.3V regulator for the eMMC and the LVDS decoder, and a 12V regulator > for the backlight. This causes the former to be overwritten by the > latter. > > Fix this by renaming all regulators with numerical suffixes to use named > suffixes, which are less likely to conflict. > > Fixes: 4fbd4158fe8967e9 ("arm64: dts: renesas: r8a77995: draak: Add backlight") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > I guess this is a fix for v5.3? Do you plan to queue this as a fix for v5.3? Thanks! > > This fix takes a slightly different approach than commit > 12105cec654cf906 ("arm64: dts: renesas: r8a77990: ebisu: Fix backlight > regulator numbering"), which just fixed the conflicting numerical > suffix. > --- > arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts > index 0711170b26b1fe1c..3aa2564dfdc25fff 100644 > --- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts > +++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts > @@ -97,7 +97,7 @@ > reg = <0x0 0x48000000 0x0 0x18000000>; > }; > > - reg_1p8v: regulator0 { > + reg_1p8v: regulator-1p8v { > compatible = "regulator-fixed"; > regulator-name = "fixed-1.8V"; > regulator-min-microvolt = <1800000>; > @@ -106,7 +106,7 @@ > regulator-always-on; > }; > > - reg_3p3v: regulator1 { > + reg_3p3v: regulator-3p3v { > compatible = "regulator-fixed"; > regulator-name = "fixed-3.3V"; > regulator-min-microvolt = <3300000>; > @@ -115,7 +115,7 @@ > regulator-always-on; > }; > > - reg_12p0v: regulator1 { > + reg_12p0v: regulator-12p0v { > compatible = "regulator-fixed"; > regulator-name = "D12.0V"; > regulator-min-microvolt = <12000000>; > -- > 2.17.1 Gr{oetje,eeting}s, Geert
On 8 August 2019 02:00:20 GMT-07:00, Geert Uytterhoeven <geert@linux-m68k.org> wrote: >Hi Simon, > >On Wed, Jul 31, 2019 at 9:37 AM Geert Uytterhoeven ><geert+renesas@glider.be> wrote: >> Currently there are two nodes named "regulator1" in the Draak DTS: a >> 3.3V regulator for the eMMC and the LVDS decoder, and a 12V regulator >> for the backlight. This causes the former to be overwritten by the >> latter. >> >> Fix this by renaming all regulators with numerical suffixes to use >named >> suffixes, which are less likely to conflict. >> >> Fixes: 4fbd4158fe8967e9 ("arm64: dts: renesas: r8a77995: draak: Add >backlight") >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> --- >> I guess this is a fix for v5.3? > >Do you plan to queue this as a fix for v5.3? >Thanks! Likewise, thanks. Will do. > >> >> This fix takes a slightly different approach than commit >> 12105cec654cf906 ("arm64: dts: renesas: r8a77990: ebisu: Fix >backlight >> regulator numbering"), which just fixed the conflicting numerical >> suffix. >> --- >> arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts >b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts >> index 0711170b26b1fe1c..3aa2564dfdc25fff 100644 >> --- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts >> +++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts >> @@ -97,7 +97,7 @@ >> reg = <0x0 0x48000000 0x0 0x18000000>; >> }; >> >> - reg_1p8v: regulator0 { >> + reg_1p8v: regulator-1p8v { >> compatible = "regulator-fixed"; >> regulator-name = "fixed-1.8V"; >> regulator-min-microvolt = <1800000>; >> @@ -106,7 +106,7 @@ >> regulator-always-on; >> }; >> >> - reg_3p3v: regulator1 { >> + reg_3p3v: regulator-3p3v { >> compatible = "regulator-fixed"; >> regulator-name = "fixed-3.3V"; >> regulator-min-microvolt = <3300000>; >> @@ -115,7 +115,7 @@ >> regulator-always-on; >> }; >> >> - reg_12p0v: regulator1 { >> + reg_12p0v: regulator-12p0v { >> compatible = "regulator-fixed"; >> regulator-name = "D12.0V"; >> regulator-min-microvolt = <12000000>; >> -- >> 2.17.1 > >Gr{oetje,eeting}s, > > Geert
On Wed, Jul 31, 2019 at 09:37:44AM +0200, Geert Uytterhoeven wrote: > Currently there are two nodes named "regulator1" in the Draak DTS: a > 3.3V regulator for the eMMC and the LVDS decoder, and a 12V regulator > for the backlight. This causes the former to be overwritten by the > latter. > > Fix this by renaming all regulators with numerical suffixes to use named > suffixes, which are less likely to conflict. > > Fixes: 4fbd4158fe8967e9 ("arm64: dts: renesas: r8a77995: draak: Add backlight") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > I guess this is a fix for v5.3? Thanks, applied as a fix for v5.3.
diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts index 0711170b26b1fe1c..3aa2564dfdc25fff 100644 --- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts +++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts @@ -97,7 +97,7 @@ reg = <0x0 0x48000000 0x0 0x18000000>; }; - reg_1p8v: regulator0 { + reg_1p8v: regulator-1p8v { compatible = "regulator-fixed"; regulator-name = "fixed-1.8V"; regulator-min-microvolt = <1800000>; @@ -106,7 +106,7 @@ regulator-always-on; }; - reg_3p3v: regulator1 { + reg_3p3v: regulator-3p3v { compatible = "regulator-fixed"; regulator-name = "fixed-3.3V"; regulator-min-microvolt = <3300000>; @@ -115,7 +115,7 @@ regulator-always-on; }; - reg_12p0v: regulator1 { + reg_12p0v: regulator-12p0v { compatible = "regulator-fixed"; regulator-name = "D12.0V"; regulator-min-microvolt = <12000000>;
Currently there are two nodes named "regulator1" in the Draak DTS: a 3.3V regulator for the eMMC and the LVDS decoder, and a 12V regulator for the backlight. This causes the former to be overwritten by the latter. Fix this by renaming all regulators with numerical suffixes to use named suffixes, which are less likely to conflict. Fixes: 4fbd4158fe8967e9 ("arm64: dts: renesas: r8a77995: draak: Add backlight") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- I guess this is a fix for v5.3? This fix takes a slightly different approach than commit 12105cec654cf906 ("arm64: dts: renesas: r8a77990: ebisu: Fix backlight regulator numbering"), which just fixed the conflicting numerical suffix. --- arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)