Skip to content

Commit 05ff1e3

Browse files
mszyprowarndb
authored andcommitted
ARM: dts: exynos: Fix regulator node aliasing on Midas-based boards
Commit d4ec0cb ("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. Link: https://lore.kernel.org/r/[email protected] Fixes: d4ec0cb ("ARM: dts: exynos: Add support for the touch-sensitive buttons on Midas family") Signed-off-by: Marek Szyprowski <[email protected]> Reviewed-by: Denis 'GNUtoo' Carikli <[email protected]> Signed-off-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent ad5d7a5 commit 05ff1e3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
};
3434
};
3535

36-
lcd_vdd3_reg: voltage-regulator-6 {
36+
lcd_vdd3_reg: voltage-regulator-7 {
3737
compatible = "regulator-fixed";
3838
regulator-name = "LCD_VDD_2.2V";
3939
regulator-min-microvolt = <2200000>;
@@ -42,7 +42,7 @@
4242
enable-active-high;
4343
};
4444

45-
ps_als_reg: voltage-regulator-7 {
45+
ps_als_reg: voltage-regulator-8 {
4646
compatible = "regulator-fixed";
4747
regulator-name = "LED_A_3.0V";
4848
regulator-min-microvolt = <3000000>;

arch/arm/boot/dts/exynos4412-n710x.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/* bootargs are passed in by bootloader */
1515

16-
cam_vdda_reg: voltage-regulator-6 {
16+
cam_vdda_reg: voltage-regulator-7 {
1717
compatible = "regulator-fixed";
1818
regulator-name = "CAM_SENSOR_CORE_1.2V";
1919
regulator-min-microvolt = <1200000>;

0 commit comments

Comments
 (0)