| Message ID | 20200305152108.20688-1-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 05ff1e3fb850c667b9b0fd3e44c6f439baa77a64 |
| Headers | show |
| Series | ARM: dts: exynos: Fix regulator node aliasing on Midas-based boards | expand |
On Thu, 5 Mar 2020 16:21:08 +0100 Marek Szyprowski <m.szyprowski@samsung.com> wrote: > Commit d4ec0cb05064 ("ARM: dts: exynos: Add support for the > touch-sensitive buttons on Midas family") added a new fixed regulator > ("voltage-regulator-6") to base "midas" .dtsi, but it didn't update > the clients of that .dtsi, which define their own fixed regulators > starting from the "voltage-regulator-6". This results in aliasing of > the regulator dt nodes and breaks operation of OLED panel due to lack > of power supply. Fix this by increasing the numbers in the fixed > regulator names for those boards. > > Fixes: d4ec0cb05064 ("ARM: dts: exynos: Add support for the > touch-sensitive buttons on Midas family") Signed-off-by: Marek > Szyprowski <m.szyprowski@samsung.com> --- > arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 ++-- > arch/arm/boot/dts/exynos4412-n710x.dts | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) [...] Reviewed-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> Denis.
On Thu, Mar 05, 2020 at 04:21:08PM +0100, Marek Szyprowski wrote: > Commit d4ec0cb05064 ("ARM: dts: exynos: Add support for the > touch-sensitive buttons on Midas family") added a new fixed regulator > ("voltage-regulator-6") to base "midas" .dtsi, but it didn't update the > clients of that .dtsi, which define their own fixed regulators starting > from the "voltage-regulator-6". This results in aliasing of the regulator > dt nodes and breaks operation of OLED panel due to lack of power supply. > Fix this by increasing the numbers in the fixed regulator names for those > boards. > > Fixes: d4ec0cb05064 ("ARM: dts: exynos: Add support for the touch-sensitive buttons on Midas family") > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 ++-- > arch/arm/boot/dts/exynos4412-n710x.dts | 2 +- Thanks, applied to fixes for current cycle. Best regards, Krzysztof
diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi index 31719c079d67..44f97546dd0a 100644 --- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi +++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi @@ -33,7 +33,7 @@ }; }; - lcd_vdd3_reg: voltage-regulator-6 { + lcd_vdd3_reg: voltage-regulator-7 { compatible = "regulator-fixed"; regulator-name = "LCD_VDD_2.2V"; regulator-min-microvolt = <2200000>; @@ -42,7 +42,7 @@ enable-active-high; }; - ps_als_reg: voltage-regulator-7 { + ps_als_reg: voltage-regulator-8 { compatible = "regulator-fixed"; regulator-name = "LED_A_3.0V"; regulator-min-microvolt = <3000000>; diff --git a/arch/arm/boot/dts/exynos4412-n710x.dts b/arch/arm/boot/dts/exynos4412-n710x.dts index 98cd1284cd90..4189e1fb204c 100644 --- a/arch/arm/boot/dts/exynos4412-n710x.dts +++ b/arch/arm/boot/dts/exynos4412-n710x.dts @@ -13,7 +13,7 @@ /* bootargs are passed in by bootloader */ - cam_vdda_reg: voltage-regulator-6 { + cam_vdda_reg: voltage-regulator-7 { compatible = "regulator-fixed"; regulator-name = "CAM_SENSOR_CORE_1.2V"; regulator-min-microvolt = <1200000>;
Commit d4ec0cb05064 ("ARM: dts: exynos: Add support for the touch-sensitive buttons on Midas family") added a new fixed regulator ("voltage-regulator-6") to base "midas" .dtsi, but it didn't update the clients of that .dtsi, which define their own fixed regulators starting from the "voltage-regulator-6". This results in aliasing of the regulator dt nodes and breaks operation of OLED panel due to lack of power supply. Fix this by increasing the numbers in the fixed regulator names for those boards. Fixes: d4ec0cb05064 ("ARM: dts: exynos: Add support for the touch-sensitive buttons on Midas family") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 ++-- arch/arm/boot/dts/exynos4412-n710x.dts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)