arm64: dts: meson-g12b: Fix the pwm regulator supply properties

[ Upstream commit 62183863f708c2464769e0d477c8ce9f3d326feb ]

After enabling CONFIG_REGULATOR_DEBUG=y we observer below debug logs.
Changes help link VDDCP_A and VDDCPU_B pwm regulator to 12V regulator
supply instead of dummy regulator.

[    4.147196] VDDCPU_A: will resolve supply early: pwm
[    4.147216] pwm-regulator regulator-vddcpu-a: Looking up pwm-supply from device tree
[    4.147227] pwm-regulator regulator-vddcpu-a: Looking up pwm-supply property in node /regulator-vddcpu-a failed
[    4.147258] VDDCPU_A: supplied by regulator-dummy
[    4.147288] regulator-dummy: could not add device link regulator.12: -ENOENT
[    4.147353] VDDCPU_A: 721 <--> 1022 mV at 871 mV, enabled
[    4.152014] VDDCPU_B: will resolve supply early: pwm
[    4.152035] pwm-regulator regulator-vddcpu-b: Looking up pwm-supply from device tree
[    4.152047] pwm-regulator regulator-vddcpu-b: Looking up pwm-supply property in node /regulator-vddcpu-b failed
[    4.152079] VDDCPU_B: supplied by regulator-dummy
[    4.152108] regulator-dummy: could not add device link regulator.13: -ENOENT

Fixes: c6d29c66e582 ("arm64: dts: meson-g12b-khadas-vim3: add initial device-tree")
Fixes: d14734a04a8a ("arm64: dts: meson-g12b-odroid-n2: enable DVFS")
Fixes: 3cb74db9b256 ("arm64: dts: meson: convert ugoos-am6 to common w400 dtsi")
Cc: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://lore.kernel.org/r/20210919202918.3556-3-linux.amoon@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
index f42cf4b8af2d4915a721318f1ae87c762897f6e3..16dd409051b400c91819b71cbd2f66bfd642191d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
@@ -18,7 +18,7 @@
                regulator-min-microvolt = <690000>;
                regulator-max-microvolt = <1050000>;
 
-               vin-supply = <&dc_in>;
+               pwm-supply = <&dc_in>;
 
                pwms = <&pwm_ab 0 1250 0>;
                pwm-dutycycle-range = <100 0>;
@@ -37,7 +37,7 @@
                regulator-min-microvolt = <690000>;
                regulator-max-microvolt = <1050000>;
 
-               vin-supply = <&vsys_3v3>;
+               pwm-supply = <&vsys_3v3>;
 
                pwms = <&pwm_AO_cd 1 1250 0>;
                pwm-dutycycle-range = <100 0>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
index 344573e157a7bf016544ccb94413ef436d563b25..4f33820aba1f1859e20f1a14682fa450eb81621c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -130,7 +130,7 @@
                regulator-min-microvolt = <721000>;
                regulator-max-microvolt = <1022000>;
 
-               vin-supply = <&main_12v>;
+               pwm-supply = <&main_12v>;
 
                pwms = <&pwm_ab 0 1250 0>;
                pwm-dutycycle-range = <100 0>;
@@ -149,7 +149,7 @@
                regulator-min-microvolt = <721000>;
                regulator-max-microvolt = <1022000>;
 
-               vin-supply = <&main_12v>;
+               pwm-supply = <&main_12v>;
 
                pwms = <&pwm_AO_cd 1 1250 0>;
                pwm-dutycycle-range = <100 0>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
index feb088504740002490658a94bdea8744e45091c5..b40d2c1002c921836b640033fe51afed3022f5b0 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
@@ -96,7 +96,7 @@
                regulator-min-microvolt = <721000>;
                regulator-max-microvolt = <1022000>;
 
-               vin-supply = <&main_12v>;
+               pwm-supply = <&main_12v>;
 
                pwms = <&pwm_ab 0 1250 0>;
                pwm-dutycycle-range = <100 0>;
@@ -115,7 +115,7 @@
                regulator-min-microvolt = <721000>;
                regulator-max-microvolt = <1022000>;
 
-               vin-supply = <&main_12v>;
+               pwm-supply = <&main_12v>;
 
                pwms = <&pwm_AO_cd 1 1250 0>;
                pwm-dutycycle-range = <100 0>;