diff mbox series

[PATCH-fixes,for,current,cycle] ARM: dts: exynos: Fix regulator node aliasing on Midas-based boards

Message ID 20200316173710.3144-1-krzk@kernel.org (mailing list archive)
State Mainlined
Commit 05ff1e3fb850c667b9b0fd3e44c6f439baa77a64
Headers show
Series [PATCH-fixes,for,current,cycle] ARM: dts: exynos: Fix regulator node aliasing on Midas-based boards | expand

Commit Message

Krzysztof Kozlowski March 16, 2020, 5:37 p.m. UTC 
From: Marek Szyprowski <m.szyprowski@samsung.com>

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>
Reviewed-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---

Arnd, Olof,

Can you apply this directly for current cycle?

Best regards,
Krzysztof


 arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 ++--
 arch/arm/boot/dts/exynos4412-n710x.dts      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

patchwork-bot+linux-soc@kernel.org March 25, 2020, 1:02 p.m. UTC | #1 
Hello:

This patch was applied to soc/soc.git (refs/heads/arm/fixes).

On Mon, 16 Mar 2020 18:37:10 +0100 you wrote:
> From: Marek Szyprowski <m.szyprowski@samsung.com>
> 
> 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.
> 
> [...]


Here is a summary with links:
  - [PATCH-fixes,for,current,cycle] ARM: dts: exynos: Fix regulator node aliasing on Midas-based boards
    https://git.kernel.org/soc/soc/c/f327294c089102fcda0276a935add2efcbc29e72

You are awesome, thank you!
diff mbox series

Patch

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>;