arm64: dts: rockchip: adapt regulator nodenames to preferred form

The preferred nodename for fixed-regulators has changed to
pattern: '^regulator(-[0-9]+v[0-9]+|-[0-9a-z-]+)?$'

Fix all Rockchip DT regulator nodenames.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/0ae40493-93e9-40cd-9ca9-990ae064f21a@gmail.com
[adapted rebased on top of a number of other changes and included
 neu6a-wifi + wolfvision-pf5-io-expander overlays]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi b/arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi
index 5b4e223851659f64bf82b1022f984e22e0bccd8e..1edfd643b25ae81ea538a6328fae645b5027ad60 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi
@@ -12,7 +12,7 @@
                mmc2 = &sdio;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";  /* +5V */
                regulator-always-on;
@@ -42,7 +42,7 @@
                states = <3300000 0x0>;
        };
 
-       vcc3v3_rf_aux_mod: vcc3v3-rf-aux-mod {
+       vcc3v3_rf_aux_mod: regulator-vcc3v3-rf-aux-mod {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_rf_aux_mod";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/rockchip/px30-evb.dts b/arch/arm64/boot/dts/rockchip/px30-evb.dts
index c9d7b32da997a667e720ba7c414a0a98bc233628..d93aaac7a42f151590808083e3956a0f64ce7710 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/px30-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb.dts
@@ -89,7 +89,7 @@
                reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */
        };
 
-       vcc5v0_sys: vccsys {
+       vcc5v0_sys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts
index d03e6aef54dc07f1011b6c574f4790829c517aaa..5e3c10d825a04cd94583d27b6a16cc18c360b667 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts
@@ -24,7 +24,7 @@
                stdout-path = "serial2:115200n8";
        };
 
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -85,7 +85,7 @@
                reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */
        };
 
-       vcc5v0_baseboard: vcc5v0-baseboard-regulator {
+       vcc5v0_baseboard: regulator-vcc5v0-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_baseboard";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi
index d22ea65b364cce27ebd0662adb96074ea10f3fa7..1ad0e52a64ab70954be1bc15baae442ffa9796e6 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi
@@ -17,7 +17,7 @@
                reset-gpios = <&gpio1 RK_PB3 GPIO_ACTIVE_HIGH>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts
index ae398acdcf45e6239257c8519528ce22035052a4..e4517f47d519cc08ec9ee705a6f51a740687f6df 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts
@@ -90,7 +90,7 @@
                clock-frequency = <24576000>;
        };
 
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -99,7 +99,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_baseboard: vcc3v3-baseboard-regulator {
+       vcc3v3_baseboard: regulator-vcc3v3-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_baseboard";
                regulator-always-on;
@@ -109,7 +109,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_baseboard: vcc5v0-baseboard-regulator {
+       vcc5v0_baseboard: regulator-vcc5v0-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_baseboard";
                regulator-always-on;
@@ -119,7 +119,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vdda_codec: vdda-codec-regulator {
+       vdda_codec: regulator-vdda-codec {
                compatible = "regulator-fixed";
                regulator-name = "vdda_codec";
                regulator-boot-on;
@@ -128,7 +128,7 @@
                vin-supply = <&vcc5v0_baseboard>;
        };
 
-       vddd_codec: vddd-codec-regulator {
+       vddd_codec: regulator-vddd-codec {
                compatible = "regulator-fixed";
                regulator-name = "vddd_codec";
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
index 67b5be0b471f46bf43e17aac350a6084ed41b8ef..8aca1eec9c387ade3854c7a87662acfc831e6c1d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
@@ -43,7 +43,7 @@
                };
        };
 
-       vcc5v0_sys: vccsys-regulator {
+       vcc5v0_sys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb.dts
index 184b84fdde075a751b063e4b7784eea77b7efec0..3f1aafe2dc139a2d4ac0599110e574f23b53cee5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3308-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-evb.dts
@@ -84,7 +84,7 @@
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-min-microvolt = <12000000>;
@@ -93,7 +93,7 @@
                regulator-boot-on;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-min-microvolt = <5000000>;
@@ -103,7 +103,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vccio_sdio: vcc_1v8: vcc-1v8 {
+       vccio_sdio: vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v8";
                regulator-min-microvolt = <1800000>;
@@ -113,7 +113,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_ddr: vcc-ddr {
+       vcc_ddr: regulator-vcc-ddr {
                compatible = "regulator-fixed";
                regulator-name = "vcc_ddr";
                regulator-min-microvolt = <1500000>;
@@ -123,7 +123,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_io: vcc-io {
+       vcc_io: regulator-vcc-io {
                compatible = "regulator-fixed";
                regulator-name = "vcc_io";
                regulator-min-microvolt = <3300000>;
@@ -133,7 +133,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vccio_flash: vccio-flash {
+       vccio_flash: regulator-vccio-flash {
                compatible = "regulator-fixed";
                regulator-name = "vccio_flash";
                regulator-min-microvolt = <3300000>;
@@ -143,7 +143,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc5v0_host: vcc5v0-host {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
                enable-active-high;
@@ -153,7 +153,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vdd_core: vdd-core {
+       vdd_core: regulator-vdd-core {
                compatible = "pwm-regulator";
                pwms = <&pwm0 0 5000 1>;
                regulator-name = "vdd_core";
@@ -165,7 +165,7 @@
                pwm-supply = <&vcc5v0_sys>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-min-microvolt = <1050000>;
@@ -175,7 +175,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vdd_1v0: vdd-1v0 {
+       vdd_1v0: regulator-vdd-1v0 {
                compatible = "regulator-fixed";
                regulator-name = "vdd_1v0";
                regulator-min-microvolt = <1000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
index 9232357f4fec9c77c1ee7b8dca798b3e739f9f71..63f9e59d5b2c0adba6a8763b940fbf91bbbc264d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
@@ -49,7 +49,7 @@
                };
        };
 
-       typec_vcc5v: typec-vcc5v {
+       typec_vcc5v: regulator-typec-vcc5v {
                compatible = "regulator-fixed";
                regulator-name = "typec_vcc5v";
                regulator-min-microvolt = <5000000>;
@@ -58,7 +58,7 @@
                regulator-boot-on;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-min-microvolt = <5000000>;
@@ -68,7 +68,7 @@
                vin-supply = <&typec_vcc5v>;
        };
 
-       vcc_io: vcc-io {
+       vcc_io: regulator-vcc-io {
                compatible = "regulator-fixed";
                regulator-name = "vcc_io";
                regulator-min-microvolt = <3300000>;
@@ -89,7 +89,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_sd: vcc-sd {
+       vcc_sd: regulator-vcc-sd {
                compatible = "regulator-fixed";
                gpio = <&gpio4 RK_PD6 GPIO_ACTIVE_LOW>;
                regulator-name = "vcc_sd";
@@ -100,7 +100,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vdd_core: vdd-core {
+       vdd_core: regulator-vdd-core {
                compatible = "pwm-regulator";
                pwms = <&pwm0 0 5000 1>;
                regulator-name = "vdd_core";
@@ -112,7 +112,7 @@
                pwm-supply = <&vcc5v0_sys>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-min-microvolt = <1050000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
index 62d18ca769a107914273df55cb2fbb9fe13026e7..7a32972bc24965ed1592b32ef84a6f67de5fd8de 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
@@ -55,7 +55,7 @@
                reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
        };
 
-       vcc_1v8: vcc-1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v8";
                regulator-always-on;
@@ -65,7 +65,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_io: vcc-io {
+       vcc_io: regulator-vcc-io {
                compatible = "regulator-fixed";
                regulator-name = "vcc_io";
                regulator-always-on;
@@ -75,7 +75,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_ddr: vcc-ddr {
+       vcc_ddr: regulator-vcc-ddr {
                compatible = "regulator-fixed";
                regulator-name = "vcc_ddr";
                regulator-always-on;
@@ -85,7 +85,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_otg: vcc5v0-otg {
+       vcc5v0_otg: regulator-vcc5v0-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
@@ -96,7 +96,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -105,7 +105,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vdd_core: vdd-core {
+       vdd_core: regulator-vdd-core {
                compatible = "pwm-regulator";
                pwms = <&pwm0 0 5000 1>;
                pwm-supply = <&vcc5v0_sys>;
@@ -117,7 +117,7 @@
                regulator-boot-on;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts b/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
index c7b1862fca6a0f14ab1eef78239f5875a52be164..a94114fb7cc1d1635e1148575e1ebf6801f802ab 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
@@ -78,7 +78,7 @@
        };
 
        /* Power tree */
-       vccio_1v8: vccio-1v8-regulator {
+       vccio_1v8: regulator-vccio-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vccio_1v8";
                regulator-min-microvolt = <1800000>;
@@ -86,7 +86,7 @@
                regulator-always-on;
        };
 
-       vccio_3v3: vccio-3v3-regulator {
+       vccio_3v3: regulator-vccio-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vccio_3v3";
                regulator-min-microvolt = <3300000>;
@@ -94,7 +94,7 @@
                regulator-always-on;
        };
 
-       vcc_otg_vbus: otg-vbus-regulator {
+       vcc_otg_vbus: regulator-otg-vbus {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
                pinctrl-0 = <&otg_vbus_drv>;
@@ -105,7 +105,7 @@
                enable-active-high;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
                pinctrl-0 = <&sdmmc0m1_pin>;
@@ -116,7 +116,7 @@
                vin-supply = <&vccio_3v3>;
        };
 
-       vdd_arm: vdd-arm {
+       vdd_arm: regulator-vdd-arm {
                compatible = "pwm-regulator";
                pwms = <&pwm0 0 5000 1>;
                regulator-name = "vdd_arm";
@@ -127,7 +127,7 @@
                regulator-boot-on;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm1 0 5000 1>;
                regulator-name = "vdd_log";

diff --git a/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dtsi
index 9caf9dc13b230af7dca77b9a7c8ecd90612570bb..150fadcb0b3c395fc1ea33e1696f3c1f60fb8b69 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dtsi
@@ -70,7 +70,7 @@
                };
        };
 
-       vccsys: vccsys {
+       vccsys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v8_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3326-gameforce-chi.dts b/arch/arm64/boot/dts/rockchip/rk3326-gameforce-chi.dts
index 08ed5b95bb6def21d2080a5aac767c746a9f8241..10e6ab724ac4510fea6b2019dc96b3a56b10605e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3326-gameforce-chi.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-gameforce-chi.dts
@@ -292,7 +292,7 @@
                reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
        };
 
-       vccsys: vccsys-regulator {
+       vccsys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v8_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi
index f585b46ceaf31fac1b1ad48aad2d218b95252b7c..446a1a6c12e7eb52d7505cc1db655982769db4f3 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi
@@ -165,7 +165,7 @@
                };
        };
 
-       vccsys: vccsys {
+       vccsys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v8_sys";
                regulator-always-on;
@@ -173,7 +173,7 @@
                regulator-max-microvolt = <3800000>;
        };
 
-       vcc_host: vcc_host {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc_host";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
index 9406a887652dee6092e6aa29f0124c95b4207609..8dfeaf1f8eb0d3196d1e447134fe00d345e6a1e8 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
@@ -36,7 +36,7 @@
                #clock-cells = <0>;
        };
 
-       vcc_host_5v: usb3-current-switch {
+       vcc_host_5v: regulator-usb3-current-switch {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
@@ -46,7 +46,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
index 12a4e421ec95c53071440be8ddae47b6d9419d57..3707df6acf1fcb81d8809606fbcf93bb122796b0 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
@@ -21,7 +21,7 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -44,7 +44,7 @@
                reset-gpios = <&gpio1 18 GPIO_ACTIVE_LOW>;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -55,7 +55,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -65,7 +65,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc_phy: vcc-phy-regulator {
+       vcc_phy: regulator-vcc-phy {
                compatible = "regulator-fixed";
                regulator-name = "vcc_phy";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi
index d6c90649d1fbaef8fe2330c13bb16e5137f7c063..1715d311e1f2d3ba378f9dfb9419c389b679ce09 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi
@@ -62,7 +62,7 @@
                };
        };
 
-       vcc_io_sdio: sdmmcio-regulator {
+       vcc_io_sdio: regulator-sdmmcio {
                compatible = "regulator-gpio";
                enable-active-high;
                gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>;
@@ -80,7 +80,7 @@
                vin-supply = <&vcc_io_33>;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
                pinctrl-0 = <&sdmmc0m1_pin>;
@@ -92,7 +92,7 @@
                vin-supply = <&vcc_io_33>;
        };
 
-       vdd_5v: vdd-5v {
+       vdd_5v: regulator-vdd-5v {
                compatible = "regulator-fixed";
                regulator-name = "vdd_5v";
                regulator-always-on;
@@ -101,7 +101,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vdd_5v_lan: vdd-5v-lan {
+       vdd_5v_lan: regulator-vdd-5v-lan {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi
index 1898ce66a244424d29e2f67996ad3e9a9b207456..82021ffb0a49c21de4c913631c2990eba4915c79 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi
@@ -53,7 +53,7 @@
                };
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
                pinctrl-0 = <&sdmmc0m1_pin>;
@@ -63,7 +63,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -72,7 +72,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vdd_5v_lan: vdd-5v-lan-regulator {
+       vdd_5v_lan: regulator-vdd-5v-lan {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
index 116d2a6c4f7d83f02f78d3b1dc18394b5817d1b1..b5bd5e7d574857b9b660882f1dfc23f7d9446887 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
@@ -25,7 +25,7 @@
                #clock-cells = <0>;
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -34,7 +34,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -46,7 +46,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sdio: sdmmcio-regulator {
+       vcc_sdio: regulator-sdmmcio {
                compatible = "regulator-gpio";
                states = <1800000 0x1>, <3300000 0x0>;
                regulator-name = "vcc_sdio";
@@ -57,7 +57,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
+       vcc_host1_5v: vcc_otg_5v: regulator-vcc-host1-5v {
                compatible = "regulator-fixed";
                enable-active-high;
                pinctrl-names = "default";
@@ -67,7 +67,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -77,7 +77,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc_phy: vcc-phy-regulator {
+       vcc_phy: regulator-vcc-phy {
                compatible = "regulator-fixed";
                regulator-name = "vcc_phy";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
index 905ef4b9409545c32ead3711af5174f37e9b6a2c..425de197ddb8aa1c8c197ab9153c6045e051320e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
@@ -64,7 +64,7 @@
                };
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -74,7 +74,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_host_5v: vcc-host-5v-regulator {
+       vcc_host_5v: regulator-vcc-host-5v {
                compatible = "regulator-fixed";
                gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
@@ -86,7 +86,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -95,7 +95,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc_wifi: vcc-wifi-regulator {
+       vcc_wifi: regulator-vcc-wifi {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index 7d179aae8d24ca81cb474d3a5a8e87da2e417647..745d3e996418504c41bfe6b09a4887543c5aa731 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -27,7 +27,7 @@
                #clock-cells = <0>;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -39,7 +39,7 @@
        };
 
        /* Common enable line for all of the rails mentioned in the labels */
-       vcc_host_5v: vcc_host1_5v: vcc_otg_5v: vcc-host-5v-regulator {
+       vcc_host_5v: vcc_host1_5v: vcc_otg_5v: regulator-vcc-host-5v {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -50,7 +50,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
index e5c0dbf794ae7e112dca6bc8d9cd09baca14d910..8662494a44d5e4b841b56bbfa7843599dd8295f5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
@@ -85,7 +85,7 @@
        };
 
        /* supplies both host and otg */
-       vcc_host: vcc-host-regulator {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
@@ -97,7 +97,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_lan: vcc-lan-regulator {
+       vcc_lan: regulator-vcc-lan {
                compatible = "regulator-fixed";
                regulator-name = "vcc_lan";
                regulator-min-microvolt = <3300000>;
@@ -107,7 +107,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
index 03ebf66e9bfce74ed78e79b1a0337df546c977e5..445ec20d6df8634f95a0fdf3fd86005fea3fb81a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
@@ -68,7 +68,7 @@
                };
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts b/arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts
index c08687df326ddc21804efa3fb9692ed50c68df36..b99bb0a5f9006b288becfd845ecbfefceb5cf854 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts
@@ -64,7 +64,7 @@
                pinctrl-0 = <&hp_det>;
        };
 
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-min-microvolt = <12000000>;
@@ -80,7 +80,7 @@
                #clock-cells = <0>;
        };
 
-       hub_avdd: hub-avdd-regulator {
+       hub_avdd: regulator-hub-avdd {
                compatible = "regulator-fixed";
                regulator-name = "hub_avdd";
                regulator-min-microvolt = <3300000>;
@@ -111,7 +111,7 @@
                pinctrl-0 = <&wifi_reg_on>;
        };
 
-       vcc_host: vcc-host-regulator {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                gpio = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
                regulator-name = "vcc_host";
@@ -124,7 +124,7 @@
                regulator-always-on;
        };
 
-       vcc_lan: vcc-lan-regulator {
+       vcc_lan: regulator-vcc-lan {
                compatible = "regulator-fixed";
                regulator-name = "vcc_lan";
                regulator-min-microvolt = <3300000>;
@@ -133,7 +133,7 @@
                regulator-always-on;
        };
 
-       vcc_otg: vcc-otg-regulator {
+       vcc_otg: regulator-vcc-otg {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
                regulator-name = "vcc_otg";
@@ -146,7 +146,7 @@
                regulator-always-on;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;
@@ -156,7 +156,7 @@
                regulator-boot-on;
        };
 
-       vdd10_usb: vdd10-usb-regulator {
+       vdd10_usb: regulator-vdd10-usb {
                compatible = "regulator-fixed";
                regulator-name = "vdd10_usb";
                regulator-min-microvolt = <1000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
index cae01d35b93d91818ed82818b50151b90d89dd74..ab70ee5f561a2921df38e798f1214f7da0413547 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
@@ -38,7 +38,7 @@
                };
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -47,7 +47,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_baseboard: vcc3v3-baseboard {
+       vcc3v3_baseboard: regulator-vcc3v3-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_baseboard";
                regulator-always-on;
@@ -57,7 +57,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_otg: vcc5v0-otg-regulator {
+       vcc5v0_otg: regulator-vcc5v0-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
index dbf9fef9bc364736c4464f23744b180c3dd2dcb9..f3797b8fd000244c8b534593dbc1094b19633673 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
@@ -97,7 +97,7 @@
                };
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
index 23ae2d9de38226f922694409c66a1a26ec87a234..abef858e7cea5d21dada322f8dffbea5302e9ea2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
@@ -73,7 +73,7 @@
                };
        };
 
-       vcc_18: vcc18-regulator {
+       vcc_18: regulator-vcc18 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_18";
                regulator-min-microvolt = <1800000>;
@@ -84,7 +84,7 @@
        };
 
        /* supplies both host and otg */
-       vcc_host: vcc-host-regulator {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -95,7 +95,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_io: vcc-io-regulator {
+       vcc_io: regulator-vcc-io {
                compatible = "regulator-fixed";
                regulator-name = "vcc_io";
                regulator-min-microvolt = <3300000>;
@@ -105,7 +105,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_lan: vcc-lan-regulator {
+       vcc_lan: regulator-vcc-lan {
                compatible = "regulator-fixed";
                regulator-name = "vcc_lan";
                regulator-min-microvolt = <3300000>;
@@ -115,7 +115,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sd: vcc-sd-regulator {
+       vcc_sd: regulator-vcc-sd {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sd";
                gpio = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>;
@@ -124,7 +124,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;
@@ -133,7 +133,7 @@
                regulator-boot-on;
        };
 
-       vccio_sd: vcc-io-sd-regulator {
+       vccio_sd: regulator-vcc-io-sd {
                compatible = "regulator-fixed";
                regulator-name = "vccio_sd";
                regulator-min-microvolt = <1800000>;
@@ -143,7 +143,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vccio_wl: vccio-wl-regulator {
+       vccio_wl: regulator-vccio-wl {
                compatible = "regulator-fixed";
                regulator-name = "vccio_wl";
                regulator-min-microvolt = <3300000>;
@@ -153,7 +153,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vdd_10: vdd-10-regulator {
+       vdd_10: regulator-vdd-10 {
                compatible = "regulator-fixed";
                regulator-name = "vdd_10";
                regulator-min-microvolt = <1000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
index 26de79388db88282761c6a889758562fbe31c95d..5132ffe014ff5346725ef6668871ba47b9a68321 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
@@ -38,7 +38,7 @@
                };
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 7f14206d53c396b4c90ea3d7bc6d673113c61fb5..b73100c6d1822e61251379eed4bad6a16be2ab62 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@ -79,7 +79,7 @@
                        <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>;
        };
 
-       vcc_18: vcc18-regulator {
+       vcc_18: regulator-vcc18 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_18";
                regulator-min-microvolt = <1800000>;
@@ -90,7 +90,7 @@
        };
 
        /* supplies both host and otg */
-       vcc_host: vcc-host-regulator {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
@@ -102,7 +102,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_io: vcc-io-regulator {
+       vcc_io: regulator-vcc-io {
                compatible = "regulator-fixed";
                regulator-name = "vcc_io";
                regulator-min-microvolt = <3300000>;
@@ -112,7 +112,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_lan: vcc-lan-regulator {
+       vcc_lan: regulator-vcc-lan {
                compatible = "regulator-fixed";
                regulator-name = "vcc_lan";
                regulator-min-microvolt = <3300000>;
@@ -122,7 +122,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;
@@ -131,7 +131,7 @@
                regulator-boot-on;
        };
 
-       vccio_wl: vccio-wl-regulator {
+       vccio_wl: regulator-vccio-wl {
                compatible = "regulator-fixed";
                regulator-name = "vccio_wl";
                regulator-min-microvolt = <3300000>;
@@ -141,7 +141,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vdd_10: vdd-10-regulator {
+       vdd_10: regulator-vdd-10 {
                compatible = "regulator-fixed";
                regulator-name = "vdd_10";
                regulator-min-microvolt = <1000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
index fe069770f34638a13320255036344ab25b156a08..8db0ca5108da02e660c152e6b9f7aba08ffaf7c6 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
@@ -66,7 +66,7 @@
                #clock-cells = <0>;
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -168,7 +168,7 @@
        };
 
        /* switched by pmic_sleep */
-       vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+       vcc1v8_s3: vcca1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_s3";
                regulator-always-on;
@@ -178,7 +178,7 @@
                vin-supply = <&vcc_1v8>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -188,7 +188,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -199,7 +199,7 @@
        };
 
        /* For USB3.0 Port1/2 */
-       vcc5v0_host1: vcc5v0-host1-regulator {
+       vcc5v0_host1: regulator-vcc5v0-host1 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -211,7 +211,7 @@
        };
 
        /* For USB2.0 Port1/2 */
-       vcc5v0_host3: vcc5v0-host3-regulator {
+       vcc5v0_host3: regulator-vcc5v0-host3 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
@@ -222,7 +222,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_typec: vcc5v0-typec-regulator {
+       vcc5v0_typec: regulator-vcc5v0-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>;
@@ -233,7 +233,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
index ef29dc0c3caf0536ffd3f901a47c30d068d47bd3..9ea91f90c67a12eb6a41ec19460fe5cdfb37be4b 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
@@ -75,7 +75,7 @@
                #clock-cells = <0>;
        };
 
-       vdd_center: vdd-center {
+       vdd_center: regulator-vdd-center {
                compatible = "pwm-regulator";
                pwms = <&pwm3 0 25000 0>;
                regulator-name = "vdd_center";
@@ -86,7 +86,7 @@
                status = "okay";
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -95,7 +95,7 @@
                regulator-max-microvolt = <3300000>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -104,7 +104,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
@@ -114,14 +114,14 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_phy: vcc-phy-regulator {
+       vcc_phy: regulator-vcc-phy {
                compatible = "regulator-fixed";
                regulator-name = "vcc_phy";
                regulator-always-on;
                regulator-boot-on;
        };
 
-       vcc_phy: vcc-phy-regulator {
+       vcc_phy: regulator-vcc-phy {
                compatible = "regulator-fixed";
                regulator-name = "vcc_phy";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
index e7d6c8e342107dcd2ae7fc34af87a02b3ef44ca1..0568dfa140b32923e6022160d1a9a86497560302 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -72,7 +72,7 @@
                #clock-cells = <0>;
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -178,7 +178,7 @@
        };
 
        /* switched by pmic_sleep */
-       vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+       vcc1v8_s3: vcca1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_s3";
                regulator-always-on;
@@ -188,7 +188,7 @@
                vin-supply = <&vcc_1v8>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
@@ -200,7 +200,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -211,7 +211,7 @@
        };
 
        /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
@@ -222,7 +222,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc5v0_typec: vcc5v0-typec-regulator {
+       vcc5v0_typec: regulator-vcc5v0-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -233,7 +233,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -243,7 +243,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
index cacbad35cfc854ce6823fe9901165f42cfbd2aef..988e6ca32fac94e8f64af8a58a7dcc4e05d60606 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
@@ -8,7 +8,7 @@
 #include "rk3399-gru.dtsi"
 
 / {
-       pp900_ap: pp900-ap {
+       pp900_ap: regulator-pp900-ap {
                compatible = "regulator-fixed";
                regulator-name = "pp900_ap";
 
@@ -29,7 +29,7 @@
        pp900_pcie: pp900-ap {
        };
 
-       pp3000: pp3000 {
+       pp3000: regulator-pp3000 {
                compatible = "regulator-fixed";
                regulator-name = "pp3000";
                pinctrl-names = "default";
@@ -46,7 +46,7 @@
                vin-supply = <&ppvar_sys>;
        };
 
-       ppvar_centerlogic_pwm: ppvar-centerlogic-pwm {
+       ppvar_centerlogic_pwm: regulator-ppvar-centerlogic-pwm {
                compatible = "pwm-regulator";
                regulator-name = "ppvar_centerlogic_pwm";
 
@@ -78,7 +78,7 @@
        };
 
        /* Schematics call this PPVAR even though it's fixed */
-       ppvar_logic: ppvar-logic {
+       ppvar_logic: regulator-ppvar-logic {
                compatible = "regulator-fixed";
                regulator-name = "ppvar_logic";
 
@@ -91,7 +91,7 @@
                vin-supply = <&ppvar_sys>;
        };
 
-       pp1800_audio: pp1800-audio {
+       pp1800_audio: regulator-pp1800-audio {
                compatible = "regulator-fixed";
                regulator-name = "pp1800_audio";
                pinctrl-names = "default";
@@ -107,7 +107,7 @@
        };
 
        /* gpio is shared with pp3300_wifi_bt */
-       pp1800_pcie: pp1800-pcie {
+       pp1800_pcie: regulator-pp1800-pcie {
                compatible = "regulator-fixed";
                regulator-name = "pp1800_pcie";
                pinctrl-names = "default";
@@ -129,7 +129,7 @@
        pp3000_ap: pp3000_emmc: pp3000 {
        };
 
-       pp1500_ap_io: pp1500-ap-io {
+       pp1500_ap_io: regulator-pp1500-ap-io {
                compatible = "regulator-fixed";
                regulator-name = "pp1500_ap_io";
                pinctrl-names = "default";
@@ -146,7 +146,7 @@
                vin-supply = <&pp1800>;
        };
 
-       pp3300_disp: pp3300-disp {
+       pp3300_disp: regulator-pp3300-disp {
                compatible = "regulator-fixed";
                regulator-name = "pp3300_disp";
                pinctrl-names = "default";
@@ -164,7 +164,7 @@
        };
 
        /* gpio is shared with pp1800_pcie and pinctrl is set there */
-       pp3300_wifi_bt: pp3300-wifi-bt {
+       pp3300_wifi_bt: regulator-pp3300-wifi-bt {
                compatible = "regulator-fixed";
                regulator-name = "pp3300_wifi_bt";
 
@@ -180,7 +180,7 @@
         * With some stretching of the imagination, we can call the 1.8V
         * regulator a supply.
         */
-       wlan_pd_n: wlan-pd-n {
+       wlan_pd_n: regulator-wlan-pd-n {
                compatible = "regulator-fixed";
                regulator-name = "wlan_pd_n";
                pinctrl-names = "default";
@@ -550,7 +550,7 @@ ap_i2c_tp: &i2c5 {
 };
 
 &pinctrl {
-       discrete-regulators {
+       discretes {
                pp1500_en: pp1500-en {
                        rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO
                                         &pcfg_pull_none>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
index 2cc9b3386c16ff613a5343c8817a612ccbe14c92..7b907c80dd32b24386e13e191171618297922afa 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
@@ -28,7 +28,7 @@
 
        /* Power tree */
 
-       p3_3v_dig: p3-3v-dig {
+       p3_3v_dig: regulator-p3-3v-dig {
                compatible = "regulator-fixed";
                regulator-name = "p3.3v_dig";
                pinctrl-names = "default";
@@ -314,7 +314,7 @@ ap_i2c_dig: &i2c2 {
                };
        };
 
-       discrete-regulators {
+       discretes {
                cpu3_pen_pwr_en: cpu3-pen-pwr-en {
                        rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
                };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
index d5e035823eb5e430c896c3a20a4347ccd919cc50..19b23b438965835a503ea1f175cc4f48b94c7a83 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
@@ -13,7 +13,7 @@
        /* Power tree */
 
        /* ppvar_sys children, sorted by name */
-       pp1250_s3: pp1250-s3 {
+       pp1250_s3: regulator-pp1250-s3 {
                compatible = "regulator-fixed";
                regulator-name = "pp1250_s3";
 
@@ -26,7 +26,7 @@
                vin-supply = <&ppvar_sys>;
        };
 
-       pp1250_cam: pp1250-dvdd {
+       pp1250_cam: regulator-pp1250-dvdd {
                compatible = "regulator-fixed";
                regulator-name = "pp1250_dvdd";
                pinctrl-names = "default";
@@ -42,7 +42,7 @@
                vin-supply = <&pp1250_s3>;
        };
 
-       pp900_s0: pp900-s0 {
+       pp900_s0: regulator-pp900-s0 {
                compatible = "regulator-fixed";
                regulator-name = "pp900_s0";
 
@@ -55,7 +55,7 @@
                vin-supply = <&ppvar_sys>;
        };
 
-       ppvarn_lcd: ppvarn-lcd {
+       ppvarn_lcd: regulator-ppvarn-lcd {
                compatible = "regulator-fixed";
                regulator-name = "ppvarn_lcd";
                pinctrl-names = "default";
@@ -66,7 +66,7 @@
                vin-supply = <&ppvar_sys>;
        };
 
-       ppvarp_lcd: ppvarp-lcd {
+       ppvarp_lcd: regulator-ppvarp-lcd {
                compatible = "regulator-fixed";
                regulator-name = "ppvarp_lcd";
                pinctrl-names = "default";
@@ -78,7 +78,7 @@
        };
 
        /* pp1800 children, sorted by name */
-       pp900_s3: pp900-s3 {
+       pp900_s3: regulator-pp900-s3 {
                compatible = "regulator-fixed";
                regulator-name = "pp900_s3";
 
@@ -96,7 +96,7 @@
        };
 
        /* pp3300 children, sorted by name */
-       pp2800_cam: pp2800-avdd {
+       pp2800_cam: regulator-pp2800-avdd {
                compatible = "regulator-fixed";
                regulator-name = "pp2800_avdd";
                pinctrl-names = "default";
@@ -127,7 +127,7 @@
         * the boot process it also enables its supply regulator bt_3v3,
         * which changes BT_EN to high.
         */
-       bt_3v3: bt-3v3 {
+       bt_3v3: regulator-bt-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "bt_3v3";
                pinctrl-names = "default";
@@ -138,7 +138,7 @@
                vin-supply = <&pp3300_s3>;
        };
 
-       wlan_3v3: wlan-3v3 {
+       wlan_3v3: regulator-wlan-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "wlan_3v3";
                pinctrl-names = "default";
@@ -833,7 +833,7 @@ camera: &i2c7 {
                };
        };
 
-       discrete-regulators {
+       discretes {
                display_rst_l: display-rst-l {
                        rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_down>;
                };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 776c0eec04d7f5409c327227702a18241387eee1..6d9e60b01225e5673e0066eac5d7fa101d506099 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -42,14 +42,14 @@
         *   schematic.
         */
 
-       ppvar_sys: ppvar-sys {
+       ppvar_sys: regulator-ppvar-sys {
                compatible = "regulator-fixed";
                regulator-name = "ppvar_sys";
                regulator-always-on;
                regulator-boot-on;
        };
 
-       pp1200_lpddr: pp1200-lpddr {
+       pp1200_lpddr: regulator-pp1200-lpddr {
                compatible = "regulator-fixed";
                regulator-name = "pp1200_lpddr";
 
@@ -62,7 +62,7 @@
                vin-supply = <&ppvar_sys>;
        };
 
-       pp1800: pp1800 {
+       pp1800: regulator-pp1800 {
                compatible = "regulator-fixed";
                regulator-name = "pp1800";
 
@@ -75,7 +75,7 @@
                vin-supply = <&ppvar_sys>;
        };
 
-       pp3300: pp3300 {
+       pp3300: regulator-pp3300 {
                compatible = "regulator-fixed";
                regulator-name = "pp3300";
 
@@ -88,7 +88,7 @@
                vin-supply = <&ppvar_sys>;
        };
 
-       pp5000: pp5000 {
+       pp5000: regulator-pp5000 {
                compatible = "regulator-fixed";
                regulator-name = "pp5000";
 
@@ -101,7 +101,7 @@
                vin-supply = <&ppvar_sys>;
        };
 
-       ppvar_bigcpu_pwm: ppvar-bigcpu-pwm {
+       ppvar_bigcpu_pwm: regulator-ppvar-bigcpu-pwm {
                compatible = "pwm-regulator";
                regulator-name = "ppvar_bigcpu_pwm";
 
@@ -130,7 +130,7 @@
                regulator-settling-time-up-us = <322>;
        };
 
-       ppvar_litcpu_pwm: ppvar-litcpu-pwm {
+       ppvar_litcpu_pwm: regulator-ppvar-litcpu-pwm {
                compatible = "pwm-regulator";
                regulator-name = "ppvar_litcpu_pwm";
 
@@ -159,7 +159,7 @@
                regulator-settling-time-up-us = <384>;
        };
 
-       ppvar_gpu_pwm: ppvar-gpu-pwm {
+       ppvar_gpu_pwm: regulator-ppvar-gpu-pwm {
                compatible = "pwm-regulator";
                regulator-name = "ppvar_gpu_pwm";
 
@@ -224,7 +224,7 @@
        pp1800_usb: pp1800 {
        };
 
-       pp3000_sd_slot: pp3000-sd-slot {
+       pp3000_sd_slot: regulator-pp3000-sd-slot {
                compatible = "regulator-fixed";
                regulator-name = "pp3000_sd_slot";
                pinctrl-names = "default";
@@ -724,7 +724,7 @@ ap_i2c_audio: &i2c8 {
                };
        };
 
-       discrete-regulators {
+       discretes {
                sd_io_pwr_en: sd-io-pwr-en {
                        rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO
                                         &pcfg_pull_none>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
index ed0301ff642c762569df43160f37087443174b51..81c4fcb30f39c92a6acb8d3246238a8f19c76410 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
@@ -27,7 +27,7 @@
                #clock-cells = <0>;
        };
 
-       dc_5v: dc-5v {
+       dc_5v: regulator-dc-5v {
                compatible = "regulator-fixed";
                regulator-name = "dc_5v";
                regulator-always-on;
@@ -56,7 +56,7 @@
                };
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;
@@ -65,14 +65,14 @@
                vin-supply = <&dc_5v>;
        };
 
-       vcc_phy: vcc-phy-regulator {
+       vcc_phy: regulator-vcc-phy {
                compatible = "regulator-fixed";
                regulator-name = "vcc_phy";
                regulator-always-on;
                regulator-boot-on;
        };
 
-       vcc1v8_s0: vcc1v8-s0 {
+       vcc1v8_s0: regulator-vcc1v8-s0 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_s0";
                regulator-min-microvolt = <1800000>;
@@ -80,7 +80,7 @@
                regulator-always-on;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-min-microvolt = <3300000>;
@@ -89,7 +89,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
@@ -99,7 +99,7 @@
                regulator-always-on;
        };
 
-       vcc5v0_typec: vcc5v0-typec-regulator {
+       vcc5v0_typec: regulator-vcc5v0-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -110,7 +110,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb: vcc5v0-usb {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -120,7 +120,7 @@
                vin-supply = <&dc_5v>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
index 00e399d6dabd34cfb58f958d68167491e21dccb0..880c2408495273bf5f1cc9e715947a47164d1f28 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
@@ -45,7 +45,7 @@
        };
 
        /* switched by pmic_sleep */
-       vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+       vcc1v8_s3: vcca1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_s3";
                regulator-always-on;
@@ -55,7 +55,7 @@
                vin-supply = <&vcc_1v8>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                regulator-always-on;
@@ -66,7 +66,7 @@
        };
 
        /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
@@ -77,7 +77,7 @@
                vin-supply = <&vsys_5v0>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vsys_3v3>;
@@ -88,14 +88,14 @@
                regulator-max-microvolt = <1400000>;
        };
 
-       vsys: vsys {
+       vsys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vsys";
                regulator-always-on;
                regulator-boot-on;
        };
 
-       vsys_3v3: vsys-3v3 {
+       vsys_3v3: regulator-vsys-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vsys_3v3";
                regulator-always-on;
@@ -105,7 +105,7 @@
                vin-supply = <&vsys>;
        };
 
-       vsys_5v0: vsys-5v0 {
+       vsys_5v0: regulator-vsys-5v0 {
                compatible = "regulator-fixed";
                regulator-name = "vsys_5v0";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
index 6086b9782f29756a087e8976e1ec43f6199f223d..e7d4a2f9a95eaa9b7687dff87570c7e27404d292 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -23,7 +23,7 @@
                mmc1 = &sdhci;
        };
 
-       avdd_0v9_s0: avdd-0v9-s0 {
+       avdd_0v9_s0: regulator-avdd-0v9-s0 {
                compatible = "regulator-fixed";
                regulator-name = "avdd_0v9_s0";
                regulator-always-on;
@@ -33,7 +33,7 @@
                vin-supply = <&vcc1v8_sys_s3>;
        };
 
-       avdd_1v8_s0: avdd-1v8-s0 {
+       avdd_1v8_s0: regulator-avdd-1v8-s0 {
                compatible = "regulator-fixed";
                regulator-name = "avdd_1v8_s0";
                regulator-always-on;
@@ -86,7 +86,7 @@
                };
        };
 
-       hdd_a_power: hdd-a-power {
+       hdd_a_power: regulator-hdd-a-power {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
@@ -98,7 +98,7 @@
                startup-delay-us = <2000000>;
        };
 
-       hdd_b_power: hdd-b-power {
+       hdd_b_power: regulator-hdd-b-power {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
@@ -110,7 +110,7 @@
                startup-delay-us = <2000000>;
        };
 
-       pcie_power: pcie-power {
+       pcie_power: regulator-pcie-power {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
@@ -122,7 +122,7 @@
                vin-supply = <&vcc5v0_perdev>;
        };
 
-       usblan_power: usblan-power {
+       usblan_power: regulator-usblan-power {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>;
@@ -134,7 +134,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc1v8_sys_s0: vcc1v8-sys-s0 {
+       vcc1v8_sys_s0: regulator-vcc1v8-sys-s0 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_sys_s0";
                regulator-always-on;
@@ -144,7 +144,7 @@
                vin-supply = <&vcc1v8_sys_s3>;
        };
 
-       vcc3v0_sd: vcc3v0-sd {
+       vcc3v0_sd: regulator-vcc3v0-sd {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
@@ -157,7 +157,7 @@
                vin-supply = <&vcc3v3_sys_s3>;
        };
 
-       vcc3v3_sys_s3: vcc_lan: vcc3v3-sys-s3 {
+       vcc3v3_sys_s3: vcc_lan: regulator-vcc3v3-sys-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys_s3";
                regulator-always-on;
@@ -171,7 +171,7 @@
                };
        };
 
-       vcc5v0_perdev: vcc5v0-perdev {
+       vcc5v0_perdev: regulator-vcc5v0-perdev {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_perdev";
                regulator-always-on;
@@ -181,7 +181,7 @@
                vin-supply = <&vcc12v_dcin_bkup>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -195,7 +195,7 @@
                };
        };
 
-       vcc5v0_usb: vcc5v0-usb {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
@@ -209,7 +209,7 @@
                vin-supply = <&vcc5v0_perdev>;
        };
 
-       vcc12v_dcin: vcc12v-dcin {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -218,7 +218,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc12v_dcin_bkup: vcc12v-dcin-bkup {
+       vcc12v_dcin_bkup: regulator-vcc12v-dcin-bkup {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin_bkup";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
index d2ffa5fdbff7e7b30b716af7d8a74c0d5b1c8e9e..2cdc2013c32006bb6ba31a68c4598ee1b9b3cf64 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
@@ -40,7 +40,7 @@
                reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
        };
 
-       dc5v_adp: dc5v-adp {
+       dc5v_adp: regulator-dc5v-adp {
                compatible = "regulator-fixed";
                regulator-name = "dc5v_adapter";
                regulator-always-on;
@@ -49,7 +49,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc3v3_lan: vcc3v3-lan {
+       vcc3v3_lan: regulator-vcc3v3-lan {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_lan";
                regulator-always-on;
@@ -59,7 +59,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -69,7 +69,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host0: vcc5v0_host1: vcc5v0-host {
+       vcc5v0_host0: vcc5v0_host1: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;
@@ -79,7 +79,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host3: vcc5v0-host3 {
+       vcc5v0_host3: regulator-vcc5v0-host3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host3";
                enable-active-high;
@@ -90,7 +90,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -100,7 +100,7 @@
                vin-supply = <&dc5v_adp>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc5v0_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
index 3bf8f959e42c4484532faf6e1613fed334309410..e5fc05cc64bd97b085744fef3755cb1f01615885 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
@@ -15,7 +15,7 @@
        model = "FriendlyElec NanoPC-T4";
        compatible = "friendlyarm,nanopc-t4", "rockchip,rk3399";
 
-       vcc12v0_sys: vcc12v0-sys {
+       vcc12v0_sys: regulator-vcc12v0-sys {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -24,7 +24,7 @@
                regulator-name = "vcc12v0_sys";
        };
 
-       vcc5v0_host0: vcc5v0-host0 {
+       vcc5v0_host0: regulator-vcc5v0-host0 {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dtsi
index 5cd69ddf989179e7a7aeb5c8cc0dd827030e1b32..1ac6bc1408236596b6ab7ee3041eba6022290140 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dtsi
@@ -14,14 +14,14 @@
 #include "rk3399-nanopi4.dtsi"
 
 / {
-       vdd_5v: vdd-5v {
+       vdd_5v: regulator-vdd-5v {
                compatible = "regulator-fixed";
                regulator-name = "vdd_5v";
                regulator-always-on;
                regulator-boot-on;
        };
 
-       vcc5v0_core: vcc5v0-core {
+       vcc5v0_core: regulator-vcc5v0-core {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_core";
                regulator-always-on;
@@ -29,7 +29,7 @@
                vin-supply = <&vdd_5v>;
        };
 
-       vcc5v0_usb1: vcc5v0-usb1 {
+       vcc5v0_usb1: regulator-vcc5v0-usb1 {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb1";
                regulator-always-on;
@@ -37,7 +37,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb2: vcc5v0-usb2 {
+       vcc5v0_usb2: regulator-vcc5v0-usb2 {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb2";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts
index 195410b089b94a9f74a8d209a88474c654efeb06..3ae645edeb62e21cffcf625ac0fbc7a988c905d2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts
@@ -12,14 +12,14 @@
        model = "FriendlyARM NanoPi NEO4";
        compatible = "friendlyarm,nanopi-neo4", "rockchip,rk3399";
 
-       vdd_5v: vdd-5v {
+       vdd_5v: regulator-vdd-5v {
                compatible = "regulator-fixed";
                regulator-name = "vdd_5v";
                regulator-always-on;
                regulator-boot-on;
        };
 
-       vcc5v0_core: vcc5v0-core {
+       vcc5v0_core: regulator-vcc5v0-core {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_core";
                regulator-always-on;
@@ -27,7 +27,7 @@
                vin-supply = <&vdd_5v>;
        };
 
-       vcc5v0_usb1: vcc5v0-usb1 {
+       vcc5v0_usb1: regulator-vcc5v0-usb1 {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb1";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
index f5f8b9c7c1662ae8ad907d90c64225fe5c9dc596..b1c9bd0e63ef34537949ed709536be89d2a81539 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
@@ -54,7 +54,7 @@
                };
        };
 
-       vdd_5v: vdd-5v {
+       vdd_5v: regulator-vdd-5v {
                compatible = "regulator-fixed";
                regulator-name = "vdd_5v";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index 65ea8dff0476eb5498019f1f157d92814377c7e1..b169be06d4d1f79fbdef9e550acac8d829aede39 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -34,7 +34,7 @@
                #clock-cells = <0>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -43,7 +43,7 @@
                regulator-name = "vcc3v3_sys";
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -54,7 +54,7 @@
        };
 
        /* switched by pmic_sleep */
-       vcc1v8_s3: vcc1v8-s3 {
+       vcc1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -64,7 +64,7 @@
                vin-supply = <&vcc_1v8>;
        };
 
-       vcc3v0_sd: vcc3v0-sd {
+       vcc3v0_sd: regulator-vcc3v0-sd {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
@@ -81,7 +81,7 @@
         * Really, this is supplied by vcc_1v8, and vcc1v8_s3 only
         * drives the enable pin, but we can't quite model that.
         */
-       vcca0v9_s3: vcca0v9-s3 {
+       vcca0v9_s3: regulator-vcca0v9-s3 {
                compatible = "regulator-fixed";
                regulator-min-microvolt = <900000>;
                regulator-max-microvolt = <900000>;
@@ -90,7 +90,7 @@
        };
 
        /* As above, actually supplied by vcc3v3_sys */
-       vcca1v8_s3: vcca1v8-s3 {
+       vcca1v8_s3: regulator-vcca1v8-s3 {
                compatible = "regulator-fixed";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
@@ -98,7 +98,7 @@
                vin-supply = <&vcc1v8_s3>;
        };
 
-       vbus_typec: vbus-typec {
+       vbus_typec: regulator-vbus-typec {
                compatible = "regulator-fixed";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
index 2a354a3a281b06c68082c54b395e7cfa804759b7..2ddd4da155976a3f52e0b9829b4a901054b776f2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
@@ -65,7 +65,7 @@
                };
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -100,7 +100,7 @@
        };
 
        /* switched by pmic_sleep */
-       vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+       vcc1v8_s3: vcca1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_s3";
                regulator-always-on;
@@ -110,7 +110,7 @@
                vin-supply = <&vcc_1v8>;
        };
 
-       vcc3v0_sd: vcc3v0-sd {
+       vcc3v0_sd: regulator-vcc3v0-sd {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
@@ -123,7 +123,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -133,7 +133,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
@@ -144,7 +144,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vbus_typec: vbus-typec-regulator {
+       vbus_typec: regulator-vbus-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -154,7 +154,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -164,7 +164,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
index 3adf19eb9ff9f9f3716a1adaba6f06fc4575a176..5473070823cb121c786b9fd47b6d89b0ed5dbb9d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
@@ -172,7 +172,7 @@
 
        /* Power tree */
        /* Root power source */
-       vcc_sysin: vcc-sysin {
+       vcc_sysin: regulator-vcc-sysin {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sysin";
                regulator-always-on;
@@ -181,7 +181,7 @@
 
        /* Regulators supplied by vcc_sysin */
        /* LCD backlight supply */
-       vcc_12v: vcc-12v {
+       vcc_12v: regulator-vcc-12v {
                compatible = "regulator-fixed";
                regulator-name = "vcc_12v";
                regulator-always-on;
@@ -196,7 +196,7 @@
        };
 
        /* Main 3.3 V supply */
-       vcc3v3_sys: wifi_bat: vcc3v3-sys {
+       vcc3v3_sys: wifi_bat: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -211,7 +211,7 @@
        };
 
        /* 5 V USB power supply */
-       vcc5v0_usb: pa_5v: vcc5v0-usb-regulator {
+       vcc5v0_usb: pa_5v: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
@@ -229,7 +229,7 @@
        };
 
        /* RK3399 logic supply */
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc_sysin>;
@@ -246,7 +246,7 @@
 
        /* Regulators supplied by vcc3v3_sys */
        /* 0.9 V supply, always on */
-       vcc_0v9: vcc-0v9 {
+       vcc_0v9: regulator-vcc-0v9 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_0v9";
                regulator-always-on;
@@ -257,7 +257,7 @@
        };
 
        /* S3 1.8 V supply, switched by vcc1v8_s3 */
-       vcca1v8_s3: vcc1v8-s3 {
+       vcca1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcca1v8_s3";
                regulator-always-on;
@@ -268,7 +268,7 @@
        };
 
        /* micro SD card power */
-       vcc3v0_sd: vcc3v0-sd {
+       vcc3v0_sd: regulator-vcc3v0-sd {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
@@ -286,7 +286,7 @@
        };
 
        /* LCD panel power, called VCC3V3_S0 in schematic */
-       vcc3v3_panel: vcc3v3-panel {
+       vcc3v3_panel: regulator-vcc3v3-panel {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
@@ -305,7 +305,7 @@
        };
 
        /* M.2 adapter power, switched by vcc1v8_s3 */
-       vcc3v3_ssd: vcc3v3-ssd {
+       vcc3v3_ssd: regulator-vcc3v3-ssd {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_ssd";
                regulator-min-microvolt = <3300000>;
@@ -315,7 +315,7 @@
 
        /* Regulators supplied by vcc5v0_usb */
        /* USB 3 port power supply regulator  */
-       vcc5v0_otg: vcc5v0-otg {
+       vcc5v0_otg: regulator-vcc5v0-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
@@ -334,7 +334,7 @@
 
        /* Regulators supplied by vcc5v0_usb */
        /* Type C port power supply regulator */
-       vbus_5vout: vbus_typec: vbus-5vout {
+       vbus_5vout: vbus_typec: regulator-vbus-5vout {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -352,7 +352,7 @@
 
        /* Regulators supplied by vcc_1v8 */
        /* Primary 0.9 V LDO */
-       vcca0v9_s3: vcca0v9-s3 {
+       vcca0v9_s3: regulator-vcca0v9-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc0v9_s3";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
index e3c5cfde3a59b505ab0e6c217ce0751bbc19db4b..d9df84405aeaaa60fb1987c660c30b0648078086 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
@@ -97,14 +97,14 @@
                leds = <&led_red>, <&led_green>, <&led_blue>;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
                regulator-boot-on;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -114,7 +114,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcca1v8_s3: vcc1v8-s3-regulator {
+       vcca1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcca1v8_s3";
                regulator-min-microvolt = <1800000>;
@@ -124,7 +124,7 @@
                regulator-boot-on;
        };
 
-       vcc1v8_codec: vcc1v8-codec-regulator {
+       vcc1v8_codec: regulator-vcc1v8-codec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
@@ -158,7 +158,7 @@
        };
 
        /* MIPI DSI panel 1.8v supply */
-       vcc1v8_lcd: vcc1v8-lcd {
+       vcc1v8_lcd: regulator-vcc1v8-lcd {
                compatible = "regulator-fixed";
                enable-active-high;
                regulator-name = "vcc1v8_lcd";
@@ -170,7 +170,7 @@
        };
 
        /* MIPI DSI panel 2.8v supply */
-       vcc2v8_lcd: vcc2v8-lcd {
+       vcc2v8_lcd: regulator-vcc2v8-lcd {
                compatible = "regulator-fixed";
                enable-active-high;
                regulator-name = "vcc2v8_lcd";

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
index c04bb98a45e5a08ad724ecc3d04759acc45a09f6..947bbd62a6b09ce55320d0889ee8cf50ca59dfd4 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
@@ -91,7 +91,7 @@
                        clock-frequency = <24576000>;
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -100,7 +100,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_baseboard: vcc3v3-baseboard {
+       vcc3v3_baseboard: regulator-vcc3v3-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_baseboard";
                regulator-always-on;
@@ -110,7 +110,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_baseboard: vcc5v0-baseboard {
+       vcc5v0_baseboard: regulator-vcc5v0-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_baseboard";
                regulator-always-on;
@@ -120,7 +120,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_otg: vcc5v0-otg-regulator {
+       vcc5v0_otg: regulator-vcc5v0-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
@@ -130,7 +130,7 @@
                regulator-always-on;
        };
 
-       vdda_codec: vdda-codec {
+       vdda_codec: regulator-vdda-codec {
                compatible = "regulator-fixed";
                regulator-name = "vdda_codec";
                regulator-boot-on;
@@ -139,7 +139,7 @@
                vin-supply = <&vcc5v0_baseboard>;
        };
 
-       vddd_codec: vddd-codec {
+       vddd_codec: regulator-vddd-codec {
                compatible = "regulator-fixed";
                regulator-name = "vddd_codec";
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 5b577312bf3b572107d1e88b016c9ecc2e22496d..d12e661dfd9917f820284477a215389c16205f46 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -40,7 +40,7 @@
                #clock-cells = <0>;
        };
 
-       vcc1v2_phy: vcc1v2-phy {
+       vcc1v2_phy: regulator-vcc1v2-phy {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v2_phy";
                regulator-always-on;
@@ -50,7 +50,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -60,7 +60,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -70,7 +70,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -79,7 +79,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcca_0v9: vcca-0v9-regulator {
+       vcca_0v9: regulator-vcca-0v9 {
                compatible = "regulator-fixed";
                regulator-name = "vcca_0v9";
                regulator-always-on;
@@ -89,7 +89,7 @@
                vin-supply = <&vcc_1v8>;
        };
 
-       vcca_1v8: vcca-1v8-regulator {
+       vcca_1v8: regulator-vcca-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vcca_1v8";
                regulator-always-on;
@@ -99,7 +99,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc5v0_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
index 9447c8724b65a98bafe9ea319814dbb7c077991c..ce057e2db242a63b80be28e37c831fa234980ccb 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
@@ -16,7 +16,7 @@
        };
 
        /* MP8009 PoE PD */
-       poe_12v: poe-12v {
+       poe_12v: regulator-poe-12v {
                compatible = "regulator-fixed";
                regulator-name = "poe_12v";
                regulator-always-on;
@@ -25,7 +25,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_ngff: vcc3v3-ngff {
+       vcc3v3_ngff: regulator-vcc3v3-ngff {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_ngff";
                enable-active-high;
@@ -39,7 +39,7 @@
                vin-supply = <&sys_12v>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                enable-active-high;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
index 2c41e017f4f402e9c7eea80955219ee23f2f582d..0ebbfdcfef7122ac3d4144b53a813e66afbe7739 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
@@ -26,7 +26,7 @@
        model = "Firefly ROC-RK3399-PC-PLUS Board";
        compatible = "firefly,roc-rk3399-pc-plus", "rockchip,rk3399";
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
index 9b0b3e5ccbe68847b6361e9a91d2711e3aced4e2..0393da25cdfb11b18f83c1fe144e294856b8e748 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
@@ -113,7 +113,7 @@
                reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
        };
 
-       vcc_vbus_typec0: vcc-vbus-typec0 {
+       vcc_vbus_typec0: regulator-vcc-vbus-typec0 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_vbus_typec0";
                regulator-always-on;
@@ -122,7 +122,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       sys_12v: sys-12v {
+       sys_12v: regulator-sys-12v {
                compatible = "regulator-fixed";
                regulator-name = "sys_12v";
                regulator-always-on;
@@ -131,7 +131,7 @@
        };
 
        /* switched by pmic_sleep */
-       vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+       vcc1v8_s3: vcca1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_s3";
                regulator-always-on;
@@ -141,7 +141,7 @@
                vin-supply = <&vcc_1v8>;
        };
 
-       vcc3v0_sd: vcc3v0-sd {
+       vcc3v0_sd: regulator-vcc3v0-sd {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD6 GPIO_ACTIVE_HIGH>;
@@ -154,7 +154,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -164,7 +164,7 @@
                vin-supply = <&sys_12v>;
        };
 
-       vcca_0v9: vcca-0v9 {
+       vcca_0v9: regulator-vcca-0v9 {
                compatible = "regulator-fixed";
                regulator-name = "vcca_0v9";
                regulator-always-on;
@@ -175,7 +175,7 @@
        };
 
        /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
@@ -185,7 +185,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_vbus_typec1: vcc-vbus-typec1 {
+       vcc_vbus_typec1: regulator-vcc-vbus-typec1 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
@@ -196,7 +196,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -209,7 +209,7 @@
                vin-supply = <&sys_12v>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                regulator-name = "vdd_log";

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
index f8c3454435abd1c9a4e2d941fb8eb3535bc0a958..15da5c80d25decdfbe3d69ad34f431fb96658b9a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
@@ -76,7 +76,7 @@
                reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
        };
 
-       vcc_3v3: vcc-3v3-regulator {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_3v3";
                regulator-always-on;
@@ -86,7 +86,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_phy1: vcc3v3-phy1-regulator {
+       vcc3v3_phy1: regulator-vcc3v3-phy1 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_phy1";
                regulator-always-on;
@@ -96,7 +96,7 @@
                vin-supply = <&vcc_3v3>;
        };
 
-       vcc5v0_host1: vcc5v0-host-regulator {
+       vcc5v0_host1: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>;
@@ -108,7 +108,7 @@
                vin-supply = <&vcc5v0_host0_s0>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -117,7 +117,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc5v0_typec: vcc5v0-typec-regulator {
+       vcc5v0_typec: regulator-vcc5v0-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -129,7 +129,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vdd_log: vdd-log-regulator {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index 9814f577200220ea99ff359845a346366f3e6e15..541dca12bf1a1f48253b24ddbc0dc876ee2b248f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -72,7 +72,7 @@
                };
        };
 
-       vbus_typec: vbus-typec-regulator {
+       vbus_typec: regulator-vbus-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -83,7 +83,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc12v_dcin: dc-12v {
+       vcc12v_dcin: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -92,7 +92,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_lan: vcc3v3-lan-regulator {
+       vcc3v3_lan: regulator-vcc3v3-lan {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_lan";
                regulator-always-on;
@@ -102,7 +102,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
@@ -114,7 +114,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -124,7 +124,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
@@ -135,7 +135,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc-sys {
+       vcc5v0_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -145,7 +145,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc_0v9: vcc-0v9 {
+       vcc_0v9: regulator-vcc-0v9 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_0v9";
                regulator-always-on;
@@ -155,7 +155,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc5v0_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 335aa3cc1e881838d4fe90ef7da3f28e9f922566..813b47d2d57b2343749cb65860d0cc872aefe003 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -24,7 +24,7 @@
                reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
        };
 
-       vcc12v_dcin: vcc12v-dcin {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-min-microvolt = <12000000>;
@@ -33,7 +33,7 @@
                regulator-boot-on;
        };
 
-       vcc1v8_s0: vcc1v8-s0 {
+       vcc1v8_s0: regulator-vcc1v8-s0 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_s0";
                regulator-min-microvolt = <1800000>;
@@ -41,7 +41,7 @@
                regulator-always-on;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-min-microvolt = <5000000>;
@@ -50,7 +50,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-min-microvolt = <3300000>;
@@ -59,7 +59,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                enable-active-high;
                pinctrl-names = "default";
@@ -71,7 +71,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                pinctrl-names = "default";
@@ -83,7 +83,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_0v9: vcc-0v9 {
+       vcc_0v9: regulator-vcc-0v9 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_0v9";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
index ddba1841e18748832ace3d1fbca384742ea12459..69a9d6170649591cbc7cb355c73fa45dc601bcfe 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
@@ -116,7 +116,7 @@
                };
        };
 
-       avdd: avdd-regulator {
+       avdd: regulator-avdd {
                compatible = "regulator-fixed";
                regulator-name = "avdd";
                regulator-min-microvolt = <11000000>;
@@ -124,7 +124,7 @@
                vin-supply = <&vcc3v3_s0>;
        };
 
-       vcc12v_dcin: vcc12v-dcin {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -134,7 +134,7 @@
        };
 
        /* switched by pmic_sleep */
-       vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+       vcc1v8_s3: vcca1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_s3";
                regulator-always-on;
@@ -145,7 +145,7 @@
        };
 
        /* micro SD card power */
-       vcc3v0_sd: vcc3v0-sd {
+       vcc3v0_sd: regulator-vcc3v0-sd {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
@@ -162,7 +162,7 @@
                };
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
@@ -174,7 +174,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -185,7 +185,7 @@
        };
 
        /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
@@ -196,7 +196,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_typec: vcc5v0-typec-regulator {
+       vcc5v0_typec: regulator-vcc5v0-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -207,7 +207,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -217,7 +217,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -227,7 +227,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc5v0_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index cd891bc199d9c32171ecdb1a986a7c52c6bf1e3f..e5c4addb48378205320c4be23a5f4c5ab8c290b4 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -27,7 +27,7 @@
                #clock-cells = <0>;
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -66,7 +66,7 @@
        };
 
        /* switched by pmic_sleep */
-       vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+       vcc1v8_s3: vcca1v8_s3: regulator-vcc1v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_s3";
                regulator-always-on;
@@ -76,7 +76,7 @@
                vin-supply = <&vcc_1v8>;
        };
 
-       vcc3v0_sd: vcc3v0-sd {
+       vcc3v0_sd: regulator-vcc3v0-sd {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
@@ -89,7 +89,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -99,7 +99,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
@@ -110,7 +110,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc5v0_typec0: vcc5v0-typec0-regulator {
+       vcc5v0_typec0: regulator-vcc5v0-typec0 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PA0 GPIO_ACTIVE_HIGH>;
@@ -120,7 +120,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -130,7 +130,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index 86cf2f27ac13799ed87387f7f59990bb8824e01e..64e6ba3457397ac5d67d30994d9b023a3cdbf554 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -18,7 +18,7 @@
                mmc1 = &sdmmc;
        };
 
-       vcc3v3_pcie: vcc-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc-pcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
index 55da1dbdd1397a543f5668166f46df1922a1fe97..3c32eaa93c0732d4640e8f6dae26fb3e769dd90e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
@@ -52,7 +52,7 @@
                };
        };
 
-       usb_5v: usb-5v-regulator {
+       usb_5v: regulator-usb-5v {
                compatible = "regulator-fixed";
                regulator-name = "usb_5v";
                regulator-always-on;
@@ -61,7 +61,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -71,7 +71,7 @@
                vin-supply = <&usb_5v>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -81,7 +81,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                regulator-min-microvolt = <3300000>;
@@ -92,7 +92,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb20_host: vcc5v0-usb20-host-regulator {
+       vcc5v0_usb20_host: regulator-vcc5v0-usb20-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>;
@@ -102,7 +102,7 @@
                regulator-always-on;
        };
 
-       vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
+       vcc5v0_usb30_host: regulator-vcc5v0-usb30-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
index de4c082dce07ddfb631e71f6537eef7cabc6f995..938f847a0b538ce63721c700b11eae1f872a586c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
@@ -129,7 +129,7 @@
                };
        };
 
-       vbat_4g: vbat-4g {
+       vbat_4g: regulator-vbat-4g {
                compatible = "regulator-fixed";
                regulator-name = "vbat_4g";
                regulator-min-microvolt = <3800000>;
@@ -138,7 +138,7 @@
                vin-supply = <&vbat_4g_en>;
        };
 
-       vcc_1v8: vcc-1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v8";
                regulator-always-on;
@@ -148,7 +148,7 @@
                vin-supply = <&vcc_1v8_en>;
        };
 
-       vcc_bat: vcc-bat {
+       vcc_bat: regulator-vcc-bat {
                compatible = "regulator-fixed";
                regulator-name = "vcc_bat";
                regulator-always-on;
@@ -156,7 +156,7 @@
                regulator-max-microvolt = <3800000>;
        };
 
-       vcc_hall_3v3: vcc-hall-3v3 {
+       vcc_hall_3v3: regulator-vcc-hall-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_hall_3v3";
                regulator-always-on;
@@ -165,7 +165,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -174,7 +174,7 @@
                vin-supply = <&vcc_bat>;
        };
 
-       vcc_wl: vcc-wl {
+       vcc_wl: regulator-vcc-wl {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
@@ -186,7 +186,7 @@
                vin-supply = <&vcc_bat>;
        };
 
-       vdda_0v9: vdda-0v9 {
+       vdda_0v9: regulator-vdda-0v9 {
                compatible = "regulator-fixed";
                regulator-name = "vdda_0v9";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
index 5ac3d44dba6adec1022da45eba7efce3728d1a8b..26cf765a72973a5f14e3d4deba1457997aadab83 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
@@ -143,7 +143,7 @@
                VCC-supply = <&vcc_bat>;
        };
 
-       vcc_3v3: vcc-3v3-regulator {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_3v3";
                regulator-always-on;
@@ -153,7 +153,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_minipcie: vcc3v3-minipcie-regulator {
+       vcc3v3_minipcie: regulator-vcc3v3-minipcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PC3 GPIO_ACTIVE_HIGH>;
@@ -165,7 +165,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc3v3_sd: vcc3v3-sd-regulator {
+       vcc3v3_sd: regulator-vcc3v3-sd {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
@@ -176,7 +176,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc5v0_flashled: vcc5v0-flashled-regulator {
+       vcc5v0_flashled: regulator-vcc5v0-flashled {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
@@ -188,7 +188,7 @@
                vin-supply = <&vcc5v_midu>;
        };
 
-       vcc5v0_usb_host0: vcc5v0-usb-host0-regulator {
+       vcc5v0_usb_host0: regulator-vcc5v0-usb-host0 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
@@ -200,7 +200,7 @@
                vin-supply = <&vcc5v_midu>;
        };
 
-       vcc5v0_usb_host2: vcc5v0-usb-host2-regulator {
+       vcc5v0_usb_host2: regulator-vcc5v0-usb-host2 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>;
@@ -212,14 +212,14 @@
                vin-supply = <&vcc5v_midu>;
        };
 
-       vcc_bat: vcc-bat-regulator {
+       vcc_bat: regulator-vcc-bat {
                compatible = "regulator-fixed";
                regulator-name = "vcc_bat";
                regulator-always-on;
                regulator-boot-on;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -227,7 +227,7 @@
                vin-supply = <&vcc_bat>;
        };
 
-       vdd1v2_dvp: vdd1v2-dvp-regulator {
+       vdd1v2_dvp: regulator-vdd1v2-dvp {
                compatible = "regulator-fixed";
                regulator-name = "vdd1v2_dvp";
                regulator-min-microvolt = <1200000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
index 1ba20aab279692b3009f324f14abff21158a4a7d..98e75df8b15823c5fdf594be771e81a1962ea305 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
@@ -117,7 +117,7 @@
                };
        };
 
-       vcc12v_dcin: vcc12v_dcin {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -130,7 +130,7 @@
         * With no battery attached, also feeds vcc_bat+
         * via ON/OFF_BAT jumper
         */
-       vbus: vbus {
+       vbus: regulator-vbus {
                compatible = "regulator-fixed";
                regulator-name = "vbus";
                regulator-always-on;
@@ -140,7 +140,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc3v3_pcie_p: vcc3v3-pcie-p-regulator {
+       vcc3v3_pcie_p: regulator-vcc3v3-pcie-p {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
@@ -152,7 +152,7 @@
                vin-supply = <&vcc_3v3>;
        };
 
-       vcc5v0_usb: vcc5v0_usb {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -166,7 +166,7 @@
         * the host ports are sourced from vcc5v0_usb
         * the otg port is sourced from vcc5v0_midu
         */
-       vcc5v0_usb20_host: vcc5v0_usb20_host {
+       vcc5v0_usb20_host: regulator-vcc5v0-usb20-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
@@ -178,7 +178,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb20_otg: vcc5v0_usb20_otg {
+       vcc5v0_usb20_otg: regulator-vcc5v0-usb20-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
@@ -188,7 +188,7 @@
                vin-supply = <&dcdc_boost>;
        };
 
-       vcc3v3_sd: vcc3v3_sd {
+       vcc3v3_sd: regulator-vcc3v3-sd {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -201,7 +201,7 @@
        };
 
        /* sourced from vbus and vcc_bat+ via rk817 sw5 */
-       vcc_sys: vcc_sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -212,7 +212,7 @@
        };
 
        /* sourced from vcc_sys, sdio module operates internally at 3.3v */
-       vcc_wl: vcc_wl {
+       vcc_wl: regulator-vcc-wl {
                compatible = "regulator-fixed";
                regulator-name = "vcc_wl";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
index a80042b585426fc5961d3f58477635904b0d42dc..24928a129446e23c8fe8207c0ed8f0b366c09a1c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
@@ -81,7 +81,7 @@
                power-off-delay-us = <5000000>;
        };
 
-       vcc3v3_pcie_p: vcc3v3-pcie-p-regulator {
+       vcc3v3_pcie_p: regulator-vcc3v3-pcie-p {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -93,7 +93,7 @@
                vin-supply = <&vcc_3v3>;
        };
 
-       vcc5v0_in: vcc5v0-in-regulator {
+       vcc5v0_in: regulator-vcc5v0-in {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_in";
                regulator-always-on;
@@ -102,7 +102,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -112,7 +112,7 @@
                vin-supply = <&vcc5v0_in>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-min-microvolt = <3300000>;
@@ -121,7 +121,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
+       vcc5v0_usb30_host: regulator-vcc5v0-usb30-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb30_host";
                enable-active-high;
@@ -134,7 +134,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
+       vcc5v0_usb_otg: regulator-vcc5v0-usb-otg {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb_otg";
                enable-active-high;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts
index 3ae24e39450a2d30e4101ae0fe44bd97395781ec..b5b253f04cdf52b823f1f428ce1acfbe2b25415f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts
@@ -53,7 +53,7 @@
                };
        };
 
-       vcc5v0_usb30: vcc5v0-usb30-regulator {
+       vcc5v0_usb30: regulator-vcc5v0-usb30 {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb30";
                enable-active-high;
@@ -66,7 +66,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcca1v8_image: vcca1v8-image-regulator {
+       vcca1v8_image: regulator-vcca1v8-image {
                compatible = "regulator-fixed";
                regulator-name = "vcca1v8_image";
                regulator-always-on;
@@ -76,7 +76,7 @@
                vin-supply = <&vcc_1v8_p>;
        };
 
-       vdda0v9_image: vdda0v9-image-regulator {
+       vdda0v9_image: regulator-vdda0v9-image {
                compatible = "regulator-fixed";
                regulator-name = "vcca0v9_image";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
index d09e6542e236b9f6d4614ecf3bdd14304dade1df..2a9fb6f4f33ff5b2f19be2f15b5fe7ed5f7f4590 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
@@ -28,7 +28,7 @@
                };
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -37,7 +37,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc_1v8: vcc-1v8-regulator {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v8";
                regulator-always-on;
@@ -47,7 +47,7 @@
                vin-supply = <&vcc_1v8_p>;
        };
 
-       vcc_3v3: vcc-3v3-regulator {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_3v3";
                regulator-always-on;
@@ -57,7 +57,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcca_1v8: vcca-1v8-regulator {
+       vcca_1v8: regulator-vcca-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vcca_1v8";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
index 8bd1f60d2de6e02711d7c192d3cb784431a45337..7e499064e0357994ca106e7e60443ab2f6439616 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
@@ -80,7 +80,7 @@
                reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
        };
 
-       usb_5v: usb-5v-regulator {
+       usb_5v: regulator-usb-5v {
                compatible = "regulator-fixed";
                regulator-name = "usb_5v";
                regulator-always-on;
@@ -89,7 +89,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -99,7 +99,7 @@
                vin-supply = <&usb_5v>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
@@ -111,7 +111,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-min-microvolt = <3300000>;
@@ -120,7 +120,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
+       vcc5v0_usb30_host: regulator-vcc5v0-usb30-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb30_host";
                enable-active-high;
@@ -133,7 +133,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
+       vcc5v0_usb_otg: regulator-vcc5v0-usb-otg {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb_otg";
                enable-active-high;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts b/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts
index 9a8f4f774dbc6a1e77728d319fe8c8f445fc57ae..53e71528e4c4c7bf37e6a2adf6019a1f8f43aab5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts
@@ -64,7 +64,7 @@
                reset-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW>;
        };
 
-       vcc5v_dcin: vcc5v-dcin-regulator {
+       vcc5v_dcin: regulator-vcc5v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v_dcin";
                regulator-always-on;
@@ -73,7 +73,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -85,7 +85,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -95,7 +95,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -105,7 +105,7 @@
                vin-supply = <&vcc5v_dcin>;
        };
 
-       vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
+       vcc5v0_usb30_host: regulator-vcc5v0-usb30-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
@@ -117,7 +117,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
+       vcc5v0_usb_otg: regulator-vcc5v0-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
@@ -129,7 +129,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_cam: vcc-cam-regulator {
+       vcc_cam: regulator-vcc-cam {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
@@ -145,7 +145,7 @@
                };
        };
 
-       vcc_mipi: vcc-mipi-regulator {
+       vcc_mipi: regulator-vcc-mipi {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-soquartz-blade.dts b/arch/arm64/boot/dts/rockchip/rk3566-soquartz-blade.dts
index fdbb4a6a19d85bcf13c4330648638180514970e9..b64d0c957ef63f4b7d2d2e1b24ce21a05966d59b 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-soquartz-blade.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-soquartz-blade.dts
@@ -18,7 +18,7 @@
        };
 
        /* labeled VCC3V0_SD in schematic to not conflict with PMIC regulator */
-       vcc3v0_sd: vcc3v0-sd-regulator {
+       vcc3v0_sd: regulator-vcc3v0-sd {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v0_sd";
                regulator-always-on;
@@ -29,7 +29,7 @@
        };
 
        /* labeled VCC_SSD in schematic */
-       vcc3v3_pcie_p: vcc3v3-pcie-regulator {
+       vcc3v3_pcie_p: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie_p";
                regulator-always-on;
@@ -39,7 +39,7 @@
                vin-supply = <&vbus>;
        };
 
-       vcc5v_dcin: vcc5v-dcin-regulator {
+       vcc5v_dcin: regulator-vcc5v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v_dcin";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts b/arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts
index 2b6f0df477b67fe3b67718e4963b77dc4aee4432..38155316846dfe203d8ce2dada27014a267ce587 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts
@@ -13,7 +13,7 @@
        };
 
        /* labeled +12v in schematic */
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -23,7 +23,7 @@
        };
 
        /* labeled +5v in schematic */
-       vcc_5v: vcc-5v-regulator {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "vcc_5v";
                regulator-always-on;
@@ -33,7 +33,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc_sd_pwr: vcc-sd-pwr-regulator {
+       vcc_sd_pwr: regulator-vcc-sd-pwr {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sd_pwr";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-soquartz-model-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-soquartz-model-a.dts
index 9a6a63277c3dca7f95fd951a666b3bf3d9a7528e..2e130eef54df9e3a50e5231a4a486af3345859ef 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-soquartz-model-a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-soquartz-model-a.dts
@@ -13,7 +13,7 @@
        };
 
        /* labeled DCIN_12V in schematic */
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -22,7 +22,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -36,7 +36,7 @@
         * Labelled VCC3V0_SD in schematic to not conflict with PMIC
         * regulator, it's 3.3v in actuality
         */
-       vcc3v0_sd: vcc3v0-sd-regulator {
+       vcc3v0_sd: regulator-vcc3v0-sd {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v0_sd";
                regulator-always-on;
@@ -46,7 +46,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                regulator-always-on;
@@ -56,7 +56,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc12v_pcie: vcc12v-pcie-regulator {
+       vcc12v_pcie: regulator-vcc12v-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_pcie";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
index 4f4af040f7e89148384d01587561a9ac5d1410ea..6b9aa0e1ad21029d9458e1c4e8a8375ff2963c12 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
@@ -74,7 +74,7 @@
                reset-gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_LOW>;
        };
 
-       vbus: vbus-regulator {
+       vbus: regulator-vbus {
                compatible = "regulator-fixed";
                regulator-name = "vbus";
                regulator-always-on;
@@ -84,7 +84,7 @@
        };
 
        /* sourced from vbus, vbus is provided by the carrier board */
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -94,7 +94,7 @@
                vin-supply = <&vbus>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
index 5dd93a08489a94663f15d2d0a98fd8616fda1f25..4d3ebe50b90ba3baad6e9e34ccce33a375b16fd2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -46,7 +46,7 @@
                };
        };
 
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -73,7 +73,7 @@
                pinctrl-0 = <&ir_receiver_pin>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -83,7 +83,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -93,7 +93,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       pcie30_avdd0v9: pcie30-avdd0v9-regulator {
+       pcie30_avdd0v9: regulator-pcie30-avdd0v9 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd0v9";
                regulator-always-on;
@@ -103,7 +103,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;
@@ -114,7 +114,7 @@
        };
 
        /* pi6c pcie clock generator feeds both ports */
-       vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulator {
+       vcc3v3_pi6c_05: regulator-vcc3v3-pi6c-05 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                regulator-min-microvolt = <3300000>;
@@ -126,7 +126,7 @@
        };
 
        /* actually fed by vcc3v3_sys, dependent on pi6c clock generator */
-       vcc3v3_minipcie: vcc3v3-minipcie-regulator {
+       vcc3v3_minipcie: regulator-vcc3v3-minipcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_minipcie";
                regulator-min-microvolt = <3300000>;
@@ -140,7 +140,7 @@
        };
 
        /* actually fed by vcc3v3_sys, dependent on pi6c clock generator */
-       vcc3v3_ngff: vcc3v3-ngff-regulator {
+       vcc3v3_ngff: regulator-vcc3v3-ngff {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_ngff";
                regulator-min-microvolt = <3300000>;
@@ -153,7 +153,7 @@
                vin-supply = <&vcc3v3_pi6c_05>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -163,7 +163,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_usb_host: vcc5v0-usb-host-regulator {
+       vcc5v0_usb_host: regulator-vcc5v0-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -175,7 +175,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
+       vcc5v0_usb_otg: regulator-vcc5v0-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
index 6e6d3c4a4f37e38ae79bd56ccec86698c33f2e90..b073a4d03e4fbc27e9c59d779c4c5f35ee2dd182 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
@@ -26,7 +26,7 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -73,7 +73,7 @@
                };
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -83,7 +83,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -93,7 +93,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_usb: vcc5v0-usb {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -103,7 +103,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_usb_host: vcc5v0-usb-host {
+       vcc5v0_usb_host: regulator-vcc5v0-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -115,7 +115,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb_otg: vcc5v0-usb-otg {
+       vcc5v0_usb_otg: regulator-vcc5v0-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
@@ -127,7 +127,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc3v3_lcd0_n: vcc3v3-lcd0-n {
+       vcc3v3_lcd0_n: regulator-vcc3v3-lcd0-n {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_lcd0_n";
                regulator-min-microvolt = <3300000>;
@@ -143,7 +143,7 @@
                };
        };
 
-       vcc3v3_lcd1_n: vcc3v3-lcd1-n {
+       vcc3v3_lcd1_n: regulator-vcc3v3-lcd1-n {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_lcd1_n";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
index 4976e64ed262ab6977a52a88f42b49d32309d949..b0ac1e58a352c4e9326d9b69f6da863b447e2559 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
@@ -39,7 +39,7 @@
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -48,7 +48,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                regulator-always-on;
@@ -58,7 +58,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -68,7 +68,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -78,7 +78,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
+       vcc5v0_usb_otg: regulator-vcc5v0-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
index ce6d5dccb0edaaf337caf578a6f103ba48d2c26f..0cfbd9dc3f3150d3195696289d65fbe03a2bb04e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
@@ -51,7 +51,7 @@
                };
        };
 
-       dc_5v: dc-5v-regulator {
+       dc_5v: regulator-dc-5v {
                compatible = "regulator-fixed";
                regulator-name = "dc_5v";
                regulator-always-on;
@@ -60,7 +60,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -70,7 +70,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -80,7 +80,7 @@
                vin-supply = <&dc_5v>;
        };
 
-       vcc3v3_m2_pcie: vcc3v3-m2-pcie-regulator {
+       vcc3v3_m2_pcie: regulator-vcc3v3-m2-pcie {
                compatible = "regulator-fixed";
                regulator-name = "m2_pcie_3v3";
                enable-active-high;
@@ -93,7 +93,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_mini_pcie: vcc3v3-mini-pcie-regulator {
+       vcc3v3_mini_pcie: regulator-vcc3v3-mini-pcie {
                compatible = "regulator-fixed";
                regulator-name = "minipcie_3v3";
                enable-active-high;
@@ -106,7 +106,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb20_host: vcc5v0-usb20-host-regulator {
+       vcc5v0_usb20_host: regulator-vcc5v0-usb20-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb20_host";
                enable-active-high;
@@ -115,7 +115,7 @@
                pinctrl-names = "default";
        };
 
-       vcc5v0_usb30_host: vcc5v0-usb30-host-regulator {
+       vcc5v0_usb30_host: regulator-vcc5v0-usb30-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb30_host";
                enable-active-high;
@@ -124,7 +124,7 @@
                pinctrl-names = "default";
        };
 
-       vcc5v0_otg_vbus: vcc5v0-otg-vbus-regulator {
+       vcc5v0_otg_vbus: regulator-vcc5v0-otg-vbus {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_otg_vbus";
                enable-active-high;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
index cee052f6500470572d07aac18c4bc48a0085aaf5..00c479aa18711a8382f1f707c3b6e9d91bdacd37 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
@@ -35,7 +35,7 @@
                };
        };
 
-       vdd_usbc: vdd-usbc-regulator {
+       vdd_usbc: regulator-vdd-usbc {
                compatible = "regulator-fixed";
                regulator-name = "vdd_usbc";
                regulator-always-on;
@@ -44,7 +44,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -54,7 +54,7 @@
                vin-supply = <&vdd_usbc>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -64,7 +64,7 @@
                vin-supply = <&vdd_usbc>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                regulator-min-microvolt = <3300000>;
@@ -75,7 +75,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -85,7 +85,7 @@
                vin-supply = <&vdd_usbc>;
        };
 
-       vcc5v0_usb_host: vcc5v0-usb-host-regulator {
+       vcc5v0_usb_host: regulator-vcc5v0-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -99,7 +99,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
+       vcc5v0_usb_otg: regulator-vcc5v0-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
@@ -111,7 +111,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       pcie30_avdd0v9: pcie30-avdd0v9-regulator {
+       pcie30_avdd0v9: regulator-pcie30-avdd0v9 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd0v9";
                regulator-always-on;
@@ -121,7 +121,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
index 913d565708934228284dbd6fbd67f48fc6b63771..0f844806ec542e814f55fa5812af549185ed9402 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
@@ -29,7 +29,7 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -103,7 +103,7 @@
                };
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                enable-active-high;
@@ -116,7 +116,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -126,7 +126,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -136,7 +136,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_usb_host: vcc5v0-usb-host-regulator {
+       vcc5v0_usb_host: regulator-vcc5v0-usb-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb_host";
                enable-active-high;
@@ -148,7 +148,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
+       vcc5v0_usb_otg: regulator-vcc5v0-usb-otg {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb_otg";
                enable-active-high;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
index 0e447ffea73b15ca130016e22034a5039186e08c..729e38b9f620eb1e49b74c7e558685f427c4ccff 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
@@ -29,7 +29,7 @@
                };
        };
 
-       pcie30_avdd0v9: pcie30-avdd0v9-regulator {
+       pcie30_avdd0v9: regulator-pcie30-avdd0v9 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd0v9";
                regulator-always-on;
@@ -39,7 +39,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;
@@ -49,7 +49,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -59,7 +59,7 @@
                vin-supply = <&vcc5v_input>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -70,7 +70,7 @@
        };
 
        /* labeled +5v_input in schematic */
-       vcc5v_input: vcc5v-input-regulator {
+       vcc5v_input: regulator-vcc5v-input {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v_input";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index 01aec2643cc9572b723e61ea5598f0463bd888eb..1aa3b97e4fd591d4bab3230fce663e930dac1213 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -36,7 +36,7 @@
                };
        };
 
-       vbus_typec: vbus-typec-regulator {
+       vbus_typec: regulator-vbus-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
@@ -51,7 +51,7 @@
        /* actually fed by vcc5v0_sys, dependent
         * on pi6c clock generator
         */
-       vcc3v3_minipcie: vcc3v3-minipcie-regulator {
+       vcc3v3_minipcie: regulator-vcc3v3-minipcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
@@ -63,7 +63,7 @@
                vin-supply = <&vcc3v3_pi6c_05>;
        };
 
-       vcc3v3_ngff: vcc3v3-ngff-regulator {
+       vcc3v3_ngff: regulator-vcc3v3-ngff {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>;
@@ -75,7 +75,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie30x1: vcc3v3-pcie30x1-regulator {
+       vcc3v3_pcie30x1: regulator-vcc3v3-pcie30x1 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
@@ -87,7 +87,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulator {
+       vcc3v3_pi6c_05: regulator-vcc3v3-pi6c-05 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
index ce14ff8c59450a3b77dc24573856a2990276ccb7..5e0dbf183ab8fbdb721fa08de270a0cc78c5819d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
@@ -25,7 +25,7 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -73,7 +73,7 @@
                };
        };
 
-       pcie30_avdd0v9: pcie30-avdd0v9-regulator {
+       pcie30_avdd0v9: regulator-pcie30-avdd0v9 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd0v9";
                regulator-always-on;
@@ -83,7 +83,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;
@@ -93,7 +93,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -103,7 +103,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                enable-active-high;
@@ -116,7 +116,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -126,7 +126,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -136,7 +136,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                enable-active-high;
@@ -147,7 +147,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_otg: vcc5v0-otg-regulator {
+       vcc5v0_otg: regulator-vcc5v0-otg {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_otg";
                enable-active-high;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
index 4fa6eff3b46937ba0d108ee42096f911ea7dc6ba..ac79140a9ecd63e6ea752667e341a05bf6726471 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -79,14 +79,14 @@
                reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>;
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
                regulator-boot-on;
        };
 
-       pcie30_avdd0v9: pcie30-avdd0v9-regulator {
+       pcie30_avdd0v9: regulator-pcie30-avdd0v9 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd0v9";
                regulator-always-on;
@@ -96,7 +96,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;
@@ -107,7 +107,7 @@
        };
 
        /* pi6c pcie clock generator */
-       vcc3v3_pi6c_03: vcc3v3-pi6c-03-regulator {
+       vcc3v3_pi6c_03: regulator-vcc3v3-pi6c-03 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pi6c_03";
                regulator-always-on;
@@ -117,7 +117,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
@@ -129,7 +129,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -139,7 +139,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -149,7 +149,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -159,7 +159,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb_host: vcc5v0-usb-host-regulator {
+       vcc5v0_usb_host: regulator-vcc5v0-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -171,7 +171,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb_hub: vcc5v0-usb-hub-regulator {
+       vcc5v0_usb_hub: regulator-vcc5v0-usb-hub {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
@@ -182,7 +182,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
+       vcc5v0_usb_otg: regulator-vcc5v0-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
@@ -194,7 +194,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc_cam: vcc-cam-regulator {
+       vcc_cam: regulator-vcc-cam {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>;
@@ -210,7 +210,7 @@
                };
        };
 
-       vcc_mipi: vcc-mipi-regulator {
+       vcc_mipi: regulator-vcc-mipi {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
index fa61633aea15266dd1dee39e9034980845e5743c..048933de2943e4b6e7c69515332a005d549a905f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
+++ b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
@@ -21,7 +21,7 @@
                #clock-cells = <0>;
        };
 
-       usb_host_vbus: usb-host-vbus-regulator {
+       usb_host_vbus: regulator-usb-host-vbus {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -33,7 +33,7 @@
                vin-supply = <&vcc5v_in>;
        };
 
-       vcc1v8_eth: vcc1v8-eth-regulator {
+       vcc1v8_eth: regulator-vcc1v8-eth {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
@@ -47,7 +47,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_eth: vcc3v3-eth-regulator {
+       vcc3v3_eth: regulator-vcc3v3-eth {
                compatible = "regulator-fixed";
                gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts
index 048cc4eebd404ec01ed0fafc0d781c5605108dd7..e8243c90854277e82efb57c6fa2c349f1b51ebde 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts
@@ -39,7 +39,7 @@
                };
        };
 
-       hdmi_tx_5v: hdmi-tx-5v-regulator {
+       hdmi_tx_5v: regulator-hdmi-tx-5v {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>;
@@ -70,7 +70,7 @@
                };
        };
 
-       vcc12v_cam: vcc12v-cam-regulator {
+       vcc12v_cam: regulator-vcc12v-cam {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PD1 GPIO_ACTIVE_HIGH>;
@@ -82,7 +82,7 @@
                vin-supply = <&vcc12v_in>;
        };
 
-       vcc12v_in: vcc12v-in-regulator {
+       vcc12v_in: regulator-vcc12v-in {
                compatible = "regulator-fixed";
                regulator-name = "12v_in";
                regulator-always-on;
@@ -91,7 +91,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v8_cam: vcc3v8-cam-regulator {
+       vcc3v8_cam: regulator-vcc3v8-cam {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
@@ -103,7 +103,7 @@
                vin-supply = <&vcc5v_in>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "3v3_sys";
                regulator-always-on;
@@ -113,7 +113,7 @@
                vin-supply = <&vcc5v_in>;
        };
 
-       vcc5v_in: vcc5v-in-regulator {
+       vcc5v_in: regulator-vcc5v-in {
                compatible = "regulator-fixed";
                regulator-name = "5v_in";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-lm7.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-armsom-lm7.dtsi
index d221efd6115e40b8bbf27be7e03d034d658ce2da..a3138d2d384c628ae2b518441145d12e73d19ee1 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-lm7.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-lm7.dtsi
@@ -17,7 +17,7 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -26,7 +26,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
index aefa0d376dd8af20f09a25237f044b9addc7cc0a..08f09053a06646fe5bddf02ec4fd5894ddb8f535 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
@@ -61,7 +61,7 @@
                #cooling-cells = <2>;
        };
 
-       vcc3v3_pcie2x1l2: vcc3v3-pcie2x1l2-regulator {
+       vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie2x1l2";
                regulator-min-microvolt = <3300000>;
@@ -70,7 +70,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
@@ -81,7 +81,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;
@@ -95,7 +95,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -104,7 +104,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts
index 12abbab9eea4cc901b4dbc8f14a31dccbbc22491..779cd1b1798ce07489eeb72daaf7592c8c0386fc 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts
@@ -74,7 +74,7 @@
                shutdown-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
        };
 
-       vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
+       vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
@@ -89,7 +89,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie2x1l2: vcc3v3-pcie2x1l2-regulator {
+       vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie2x1l2";
                regulator-min-microvolt = <3300000>;
@@ -98,7 +98,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
@@ -111,7 +111,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
index 610a610e56eecab80aec3084a5a215ce30b83b94..9d525c8ff725b91fd13c120bf1e698951c9194e2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
@@ -45,7 +45,7 @@
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -54,7 +54,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -64,7 +64,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -74,7 +74,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc3v3_lcd: vcc3v3-lcd-regulator {
+       vcc3v3_lcd: regulator-vcc3v3-lcd {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_lcd";
                enable-active-high;
@@ -84,7 +84,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc5v0_usb_host1: vcc5v0_usb_host2: vcc5v0-usb-host-regulator {
+       vcc5v0_usb_host1: vcc5v0_usb_host2: regulator-vcc5v0-usb-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;
@@ -98,7 +98,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb30_otg: vcc5v0-usb30-otg-regulator {
+       vcc5v0_usb30_otg: regulator-vcc5v0-usb30-otg {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_otg";
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
index 9ec2374c6cdfa41fba993b8b937055597b5ff6e6..92f0ed83c990228e91997eaaf0d354b493fc51df 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
@@ -70,7 +70,7 @@
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -79,7 +79,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -89,7 +89,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -99,7 +99,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -109,7 +109,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_lcd: vcc3v3-lcd-regulator {
+       vcc3v3_lcd: regulator-vcc3v3-lcd {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_lcd";
                enable-active-high;
@@ -119,7 +119,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-boot-on;
@@ -133,7 +133,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc5v0_usb_host0: vcc5v0_usb30_host: vcc5v0-usb-host-regulator {
+       vcc5v0_usb_host0: vcc5v0_usb30_host: regulator-vcc5v0-usb-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
index fde8b228f2c7c92096ceab84125fa1d3b1d205fd..71ed680621b880dd2a001d5fa4f46d389f7ac5cd 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
@@ -36,7 +36,7 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       avdd0v85_pcie20: avdd0v85-pcie20-regulator {
+       avdd0v85_pcie20: regulator-avdd0v85-pcie20 {
                compatible = "regulator-fixed";
                regulator-name = "avdd0v85_pcie20";
                regulator-boot-on;
@@ -46,7 +46,7 @@
                vin-supply = <&vdd_0v85_s0>;
        };
 
-       avdd1v8_pcie20: avdd1v8-pcie20-regulator {
+       avdd1v8_pcie20: regulator-avdd1v8-pcie20 {
                compatible = "regulator-fixed";
                regulator-name = "avdd1v8_pcie20";
                regulator-boot-on;
@@ -56,7 +56,7 @@
                vin-supply = <&avcc_1v8_s0>;
        };
 
-       avdd0v75_pcie30: avdd0v75-pcie30-regulator {
+       avdd0v75_pcie30: regulator-avdd0v75-pcie30 {
                compatible = "regulator-fixed";
                regulator-name = "avdd0v75_pcie30";
                regulator-boot-on;
@@ -66,7 +66,7 @@
                vin-supply = <&avdd_0v75_s0>;
        };
 
-       pcie30_avdd1v8: avdd1v8-pcie30-regulator {
+       pcie30_avdd1v8: regulator-avdd1v8-pcie30 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-common.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-common.dtsi
index 03fd193be253daeda37fd8fd9d938d057b89d954..5e72d0eff0e0f0a2bba718bc67dc2dc8f9ac183f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-common.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-common.dtsi
@@ -24,7 +24,7 @@
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -33,7 +33,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -43,7 +43,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
index 7b131789835812cc1f54a79fbca6218c63ca184a..05ae9bdcfbbdebf360169cd8997e34a401fcbd88 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
@@ -10,7 +10,7 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
+       vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie2x1l0";
                regulator-min-microvolt = <3300000>;
@@ -19,7 +19,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc3v3_pcie3x2: vcc3v3-pcie3x2-regulator {
+       vcc3v3_pcie3x2: regulator-vcc3v3-pcie3x2 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio2 RK_PC4 GPIO_ACTIVE_HIGH>; /* PCIE_4G_PWEN */
@@ -32,7 +32,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie3x4: vcc3v3-pcie3x4-regulator {
+       vcc3v3_pcie3x4: regulator-vcc3v3-pcie3x4 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; /* PCIE30x4_PWREN_H */
@@ -45,7 +45,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso
index e9a3855e8752979baa74fac67e82bf081920b06d..2128ffcc3616a6f99ba60f7957f3ebd4c0166d2a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso
+++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso
@@ -14,7 +14,7 @@
 #include <dt-bindings/pinctrl/rockchip.h>
 
 &{/} {
-       vcc3v3_pcie2x1l1: vcc3v3-pcie2x1l1-regulator {
+       vcc3v3_pcie2x1l1: regulator-vcc3v3-pcie2x1l1 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; /* WIFI_3V3_EN */

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
index 863a73b0e3da73150d2874abc5762ab0c4c0ce63..d6e464cdc53612dec2a38b43cf5dab047a6901df 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
@@ -132,7 +132,7 @@
                };
        };
 
-       pcie20_avdd0v85: pcie20-avdd0v85-regulator {
+       pcie20_avdd0v85: regulator-pcie20-avdd0v85 {
                compatible = "regulator-fixed";
                regulator-name = "pcie20_avdd0v85";
                regulator-always-on;
@@ -142,7 +142,7 @@
                vin-supply = <&avdd_0v85_s0>;
        };
 
-       pcie20_avdd1v8: pcie20-avdd1v8-regulator {
+       pcie20_avdd1v8: regulator-pcie20-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie20_avdd1v8";
                regulator-always-on;
@@ -152,7 +152,7 @@
                vin-supply = <&avcc_1v8_s0>;
        };
 
-       pcie30_avdd0v75: pcie30-avdd0v75-regulator {
+       pcie30_avdd0v75: regulator-pcie30-avdd0v75 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd0v75";
                regulator-always-on;
@@ -162,7 +162,7 @@
                vin-supply = <&avdd_0v75_s0>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;
@@ -172,7 +172,7 @@
                vin-supply = <&avcc_1v8_s0>;
        };
 
-       vbus5v0_typec: vbus5v0-typec-regulator {
+       vbus5v0_typec: regulator-vbus5v0-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PD0 GPIO_ACTIVE_HIGH>;
@@ -184,7 +184,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -193,7 +193,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie30";
                regulator-min-microvolt = <3300000>;
@@ -206,7 +206,7 @@
                pinctrl-0 = <&vcc3v3_pcie30_en>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;
@@ -220,7 +220,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -230,7 +230,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usbdcin: vcc5v0-usbdcin-regulator {
+       vcc5v0_usbdcin: regulator-vcc5v0-usbdcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usbdcin";
                regulator-always-on;
@@ -240,7 +240,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi
index 47e64d547ea9c774d6c30289d7189e52b8812b7a..3900513173892330d5bedf23dd20165f88ae6fcb 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi
@@ -29,7 +29,7 @@
                };
        };
 
-       pcie20_avdd0v85: pcie20-avdd0v85-regulator {
+       pcie20_avdd0v85: regulator-pcie20-avdd0v85 {
                compatible = "regulator-fixed";
                regulator-name = "pcie20_avdd0v85";
                regulator-always-on;
@@ -39,7 +39,7 @@
                vin-supply = <&vdd_0v85_s0>;
        };
 
-       pcie20_avdd1v8: pcie20-avdd1v8-regulator {
+       pcie20_avdd1v8: regulator-pcie20-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie20_avdd1v8";
                regulator-always-on;
@@ -49,7 +49,7 @@
                vin-supply = <&avcc_1v8_s0>;
        };
 
-       pcie30_avdd0v75: pcie30-avdd0v75-regulator {
+       pcie30_avdd0v75: regulator-pcie30-avdd0v75 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd0v75";
                regulator-always-on;
@@ -59,7 +59,7 @@
                vin-supply = <&avdd_0v75_s0>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;
@@ -69,7 +69,7 @@
                vin-supply = <&avcc_1v8_s0>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;
@@ -79,7 +79,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc4v0_sys: vcc4v0-sys-regulator {
+       vcc4v0_sys: regulator-vcc4v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc4v0_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
index 024b6013443dfad8362b6dbbd3d1882c1f269ca3..90f823b2c2191dac008d93c51b0680a6aeb31d72 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
@@ -44,7 +44,7 @@
        };
 
        /* DCIN is 12-24V but standard is 12V */
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -111,7 +111,7 @@
                gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;
@@ -121,7 +121,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_1v2_s3: vcc-1v2-s3-regulator {
+       vcc_1v2_s3: regulator-vcc-1v2-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v2_s3";
                regulator-always-on;
@@ -132,7 +132,7 @@
        };
 
        /* Exposed on P14 and P15 */
-       vcc_2v8_s3: vcc-2v8-s3-regulator {
+       vcc_2v8_s3: regulator-vcc-2v8-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_2v8_s3";
                regulator-always-on;
@@ -142,7 +142,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc_5v0_usb_a: vcc-5v0-usb-a-regulator {
+       vcc_5v0_usb_a: regulator-vcc-5v0-usb-a {
                compatible = "regulator-fixed";
                regulator-name = "usb_a_vcc";
                regulator-min-microvolt = <5000000>;
@@ -152,7 +152,7 @@
                enable-active-high;
        };
 
-       vcc_5v0_usb_c1: vcc-5v0-usb-c1-regulator {
+       vcc_5v0_usb_c1: regulator-vcc-5v0-usb-c1 {
                compatible = "regulator-fixed";
                regulator-name = "5v_usbc1";
                regulator-min-microvolt = <5000000>;
@@ -162,7 +162,7 @@
                enable-active-high;
        };
 
-       vcc_5v0_usb_c2: vcc-5v0-usb-c2-regulator {
+       vcc_5v0_usb_c2: regulator-vcc-5v0-usb-c2 {
                compatible = "regulator-fixed";
                regulator-name = "5v_usbc2";
                regulator-min-microvolt = <5000000>;
@@ -172,7 +172,7 @@
                enable-active-high;
        };
 
-       vcc3v3_mdot2: vcc3v3-mdot2-regulator {
+       vcc3v3_mdot2: regulator-vcc3v3-mdot2 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_mdot2";
                regulator-always-on;
@@ -182,7 +182,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -192,7 +192,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
index 2d92bbb4027d3a447df30e1c5759af2ed4073d34..ff855064be08181a2b5d43e92626bc8fe56623ca 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
@@ -15,7 +15,7 @@
        compatible = "friendlyarm,nanopc-t6-lts", "rockchip,rk3588";
 
        /* provide power for on-board USB 2.0 hub */
-       vcc5v0_usb20_host: vcc5v0-usb20-host-regulator {
+       vcc5v0_usb20_host: regulator-vcc5v0-usb20-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
index 92321c1d3ff10eeafa2281a958b622d8cfea805a..40290a81bb9d6c3eaeb2a2bca59bbabee6e383ac 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -14,7 +14,7 @@
        model = "FriendlyElec NanoPC-T6";
        compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
 
-       vdd_4g_3v3: vdd-4g-3v3-regulator {
+       vdd_4g_3v3: regulator-vdd-4g-3v3 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index bf8e1f1116d147808f3a6e999332e50ece802cd0..9ba94fa77391d68113724c0336134dd274b4825d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -106,7 +106,7 @@
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -116,7 +116,7 @@
        };
 
        /* vcc5v0_sys powers peripherals */
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -127,7 +127,7 @@
        };
 
        /* vcc4v0_sys powers the RK806, RK860's */
-       vcc4v0_sys: vcc4v0-sys-regulator {
+       vcc4v0_sys: regulator-vcc4v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc4v0_sys";
                regulator-always-on;
@@ -137,7 +137,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc-1v1-nldo-s3";
                regulator-always-on;
@@ -147,7 +147,7 @@
                vin-supply = <&vcc4v0_sys>;
        };
 
-       vcc_3v3_pcie20: vcc3v3-pcie20-regulator {
+       vcc_3v3_pcie20: regulator-vcc3v3-pcie20 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_3v3_pcie20";
                regulator-always-on;
@@ -157,7 +157,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vbus5v0_typec: vbus5v0-typec-regulator {
+       vbus5v0_typec: regulator-vbus5v0-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
@@ -171,7 +171,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
+       vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
@@ -183,7 +183,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
@@ -195,7 +195,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sd_s0: vcc3v3-sd-s0-regulator {
+       vcc3v3_sd_s0: regulator-vcc3v3-sd-s0 {
                compatible = "regulator-fixed";
                gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts b/arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts
index b8c33052cd00fcd031ed44d90192ee7c33f00ee0..1c0851b45eb8eef5e2626dfde8e6c145392754a9 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts
@@ -100,7 +100,7 @@
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -109,7 +109,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc1v8_sys: vcc1v8-sys-regulator {
+       vcc1v8_sys: regulator-vcc1v8-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_sys";
                regulator-always-on;
@@ -119,7 +119,7 @@
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
+       vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie2x1l0";
                regulator-min-microvolt = <3300000>;
@@ -128,7 +128,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie2x1l2: vcc3v3-pcie2x1l2-regulator {
+       vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie2x1l2";
                regulator-min-microvolt = <3300000>;
@@ -137,7 +137,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie30: vcc3v3_pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3_pcie30 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie30";
                regulator-always-on;
@@ -147,7 +147,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
@@ -157,7 +157,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
index 9b1f985a32ebe73478d4318d5246aada78c08ffa..92de273b0956fe0798f558841922fab34a6cad46 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
@@ -177,7 +177,7 @@
                };
        };
 
-       vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>;
@@ -188,7 +188,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie_eth: vcc3v3-pcie-eth-regulator {
+       vcc3v3_pcie_eth: regulator-vcc3v3-pcie-eth {
                compatible = "regulator-fixed";
                gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>;
                regulator-name = "vcc3v3_pcie_eth";
@@ -198,7 +198,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_wf: vcc3v3-wf-regulator {
+       vcc3v3_wf: regulator-vcc3v3-wf {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
@@ -209,7 +209,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -218,7 +218,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc5v0_usb20: vcc5v0-usb20-regulator {
+       vcc5v0_usb20: regulator-vcc5v0-usb20 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
index 50c7a5e9af1904b87925bc526752a87deb3460a6..11d7594c15c7300cc6514d95890fbf856ce09426 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
@@ -149,7 +149,7 @@
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -158,7 +158,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_bt: vcc3v3-bt-regulator {
+       vcc3v3_bt: regulator-vcc3v3-bt {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -169,7 +169,7 @@
                vin-supply = <&vcc_3v3_s0>;
        };
 
-       vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
@@ -180,7 +180,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc3v3_wf: vcc3v3-wf-regulator {
+       vcc3v3_wf: regulator-vcc3v3-wf {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>;
@@ -191,7 +191,7 @@
                vin-supply = <&vcc_3v3_s0>;
        };
 
-       vcc4v0_sys: vcc4v0-sys-regulator {
+       vcc4v0_sys: regulator-vcc4v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc4v0_sys";
                regulator-always-on;
@@ -201,7 +201,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
@@ -215,7 +215,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index ca9a0253801aebf3ac3f0a7918692a25016d9cd4..dd0f9706d1389969b3ed0ccdbc8ac95beb66d5aa 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -84,7 +84,7 @@
                shutdown-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
        };
 
-       vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
+       vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
@@ -99,7 +99,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie2x1l2: vcc3v3-pcie2x1l2-regulator {
+       vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie2x1l2";
                regulator-min-microvolt = <3300000>;
@@ -108,7 +108,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
@@ -121,7 +121,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;
@@ -135,7 +135,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -144,7 +144,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
index 270d59a560374a7da6b12b00e413e0e00d117d12..3187b4918a300dae49fe05d760fb7e1fd55f14d5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
@@ -21,7 +21,7 @@
                stdout-path = "serial2:115200n8";
        };
 
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -96,7 +96,7 @@
                clock-frequency = <24576000>;
        };
 
-       vcc3v3_baseboard: vcc3v3-baseboard-regulator {
+       vcc3v3_baseboard: regulator-vcc3v3-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_baseboard";
                regulator-always-on;
@@ -106,7 +106,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc3v3_low_noise: vcc3v3-low-noise-regulator {
+       vcc3v3_low_noise: regulator-vcc3v3-low-noise {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_low_noise";
                regulator-boot-on;
@@ -115,7 +115,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_baseboard: vcc5v0-baseboard-regulator {
+       vcc5v0_baseboard: regulator-vcc5v0-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_baseboard";
                regulator-always-on;
@@ -125,7 +125,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_otg: vcc5v0-otg-regulator {
+       vcc5v0_otg: regulator-vcc5v0-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
@@ -135,7 +135,7 @@
                regulator-always-on;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -145,7 +145,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vddd_audio_1v6: vddd-audio-1v6-regulator {
+       vddd_audio_1v6: regulator-vddd-audio-1v6 {
                compatible = "regulator-fixed";
                regulator-name = "vddd_audio_1v6";
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
index 54a20fbf50a8188d6ee6030d9be8adb24056aed4..81a6a05ce13b68a93e381f7051c1f861c1f11a25 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
@@ -65,7 +65,7 @@
                enable-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; /* PCIE30X4_CLKREQN_M1_L */
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;
@@ -75,7 +75,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_1v2_s3: vcc-1v2-s3-regulator {
+       vcc_1v2_s3: regulator-vcc-1v2-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v2_s3";
                regulator-always-on;
@@ -85,7 +85,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
index d0021524e7f958016b322182ed5b9d139d95f8fa..9a31eaee016d0a61d5cc6cb7aa8cf7bab66b8d7b 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
@@ -61,7 +61,7 @@
                pwms = <&pwm2 0 25000 0>;
        };
 
-       pcie20_avdd0v85: pcie20-avdd0v85-regulator {
+       pcie20_avdd0v85: regulator-pcie20-avdd0v85 {
                compatible = "regulator-fixed";
                regulator-name = "pcie20_avdd0v85";
                regulator-always-on;
@@ -71,7 +71,7 @@
                vin-supply = <&vdd_0v85_s0>;
        };
 
-       pcie20_avdd1v8: pcie20-avdd1v8-regulator {
+       pcie20_avdd1v8: regulator-pcie20-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie20_avdd1v8";
                regulator-always-on;
@@ -81,7 +81,7 @@
                vin-supply = <&avcc_1v8_s0>;
        };
 
-       pcie30_avdd0v75: pcie30-avdd0v75-regulator {
+       pcie30_avdd0v75: regulator-pcie30-avdd0v75 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd0v75";
                regulator-always-on;
@@ -91,7 +91,7 @@
                vin-supply = <&avdd_0v75_s0>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;
@@ -101,7 +101,7 @@
                vin-supply = <&avcc_1v8_s0>;
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -110,7 +110,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
@@ -124,7 +124,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -134,7 +134,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usbdcin: vcc5v0-usbdcin-regulator {
+       vcc5v0_usbdcin: regulator-vcc5v0-usbdcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usbdcin";
                regulator-always-on;
@@ -144,7 +144,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -154,7 +154,7 @@
                vin-supply = <&vcc5v0_usbdcin>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
index 7fc7fb72e03649c3994f9f9e4c0be3219d4d4612..63ba503f99da5a1558e67c29596c77599a355203 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
@@ -33,7 +33,7 @@
                #cooling-cells = <2>;
        };
 
-       vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie30";
                regulator-min-microvolt = <3300000>;
@@ -45,7 +45,7 @@
                startup-delay-us = <5000>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -54,7 +54,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
index 4a63dabfee7f9f1962eccb821a518b22d5133fb7..9c394f733bbfbba5a547bebcdcaa4f0794539647 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
@@ -87,7 +87,7 @@
                reset-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_LOW>;
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -96,7 +96,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -106,7 +106,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usbdcin: vcc5v0-usbdcin-regulator {
+       vcc5v0_usbdcin: regulator-vcc5v0-usbdcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usbdcin";
                regulator-always-on;
@@ -116,7 +116,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -126,7 +126,7 @@
                vin-supply = <&vcc5v0_usbdcin>;
        };
 
-       avdd0v85_pcie20: avdd0v85-pcie20-regulator {
+       avdd0v85_pcie20: regulator-avdd0v85-pcie20 {
                compatible = "regulator-fixed";
                regulator-name = "avdd0v85_pcie20";
                regulator-boot-on;
@@ -136,7 +136,7 @@
                vin-supply = <&vdd_0v85_s0>;
        };
 
-       avdd1v8_pcie20: avdd1v8-pcie20-regulator {
+       avdd1v8_pcie20: regulator-avdd1v8-pcie20 {
                compatible = "regulator-fixed";
                regulator-name = "avdd1v8_pcie20";
                regulator-boot-on;
@@ -146,7 +146,7 @@
                vin-supply = <&avcc_1v8_s0>;
        };
 
-       vcc3v3_mipi: vcc3v3-mipi-regulator {
+       vcc3v3_mipi: regulator-vcc3v3-mipi {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>;
@@ -156,7 +156,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
@@ -170,7 +170,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_otg: vcc5v0-otg-regulator {
+       vcc5v0_otg: regulator-vcc5v0-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
@@ -184,7 +184,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts b/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
index cd9ad440f7298b3757140f6800ccec925125b9ba..812bba0aef1a8b48488339162f232bde30077592 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
@@ -346,7 +346,7 @@
                VCC-supply = <&vcc5v0_spk>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -356,7 +356,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_lcd0_n: vcc3v3-lcd0-n-regulator {
+       vcc3v3_lcd0_n: regulator-vcc3v3-lcd0-n {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
@@ -371,7 +371,7 @@
                };
        };
 
-       vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
+       vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
@@ -383,7 +383,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc5v0_spk: vcc5v0-spk-regulator {
+       vcc5v0_spk: regulator-vcc5v0-spk {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
@@ -398,7 +398,7 @@
                };
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index 3a41b9c0001048b4018cb56e74e30bda4ccaf679..5e6a5df7389dc4f06f23d3d5a9ef14bdab1bdec9 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -83,7 +83,7 @@
                dais = <&i2s0_8ch_p0>;
        };
 
-       vbus5v0_typec: vbus5v0-typec-regulator {
+       vbus5v0_typec: regulator-vbus5v0-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
@@ -95,7 +95,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -106,7 +106,7 @@
        };
 
        /* Regulator is enabled whenever vcc_1v8_s0 is above 1.6v */
-       vcc_3v3_s0: vcc-3v3-s0-regulator {
+       vcc_3v3_s0: regulator-vcc-3v3-s0 {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -120,7 +120,7 @@
                };
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -129,7 +129,7 @@
                regulator-name = "vcc5v0_sys";
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -139,7 +139,7 @@
                vin-supply = <&vcc5v0_usbdcin>;
        };
 
-       vcc5v0_usbdcin: vcc5v0-usbdcin-regulator {
+       vcc5v0_usbdcin: regulator-vcc5v0-usbdcin {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
index b80a552dad883cde09b1af01640f4bcb566cfb3d..ac48e7fd3923f4222929afb03b608a647d2c2ed8 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -76,7 +76,7 @@
                };
        };
 
-       vcc3v3_pcie_wl: vcc3v3-pcie-wl-regulator {
+       vcc3v3_pcie_wl: regulator-vcc3v3-pcie-wl {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
@@ -89,7 +89,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;
@@ -103,7 +103,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -112,7 +112,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;
@@ -122,7 +122,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vdd_3v3_sd: vdd-3v3-sd-regulator {
+       vdd_3v3_sd: regulator-vdd-3v3-sd {
                compatible = "regulator-fixed";
                regulator-name = "vdd_3v3_sd";
                gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
index 2e22a49000e5437d53e4c7cd4517ae5577a28bc2..76a6e8e517e94830db7923188fcddeb75e7fb099 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
@@ -89,7 +89,7 @@
                };
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -98,7 +98,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;
@@ -108,7 +108,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_3v3_s0: vcc-3v3-s0-regulator {
+       vcc_3v3_s0: regulator-vcc-3v3-s0 {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
@@ -118,7 +118,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
+       vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
@@ -131,7 +131,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc_3v3_pcie20: vcc3v3-pcie20-regulator {
+       vcc_3v3_pcie20: regulator-vcc3v3-pcie20 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_3v3_pcie20";
                regulator-always-on;
@@ -141,7 +141,7 @@
                vin-supply = <&vcc_3v3_s3>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
@@ -151,7 +151,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_usb_otg0: vcc5v0-usb-otg0-regulator {
+       vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
@@ -163,7 +163,7 @@
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_host_20: vcc5v0-host-20-regulator {
+       vcc5v0_host_20: regulator-vcc5v0-host-20 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
index 9c0d1348281bac24d2b47459eeb36c5c7078ff73..ad6d04793b0ac7c2f4a49dea47ee3d58be220e91 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
@@ -8,7 +8,7 @@
        model = "Xunlong Orange Pi 5";
        compatible = "xunlong,orangepi-5", "rockchip,rk3588s";
 
-       vcc3v3_pcie20: vcc3v3-pcie20-regulator {
+       vcc3v3_pcie20: regulator-vcc3v3-pcie20 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
index 0573b8f2d31825078d341a2ebcafc5d3d4937325..d86aeacca238d917782c30e618d9db5e327b970c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
@@ -90,7 +90,7 @@
                };
        };
 
-       vbus_typec: vbus-typec-regulator {
+       vbus_typec: regulator-vbus-typec {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
@@ -102,7 +102,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -111,7 +111,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
+       vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 {
                compatible = "regulator-fixed";
                gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>;
                regulator-name = "vcc_3v3_sd_s0";

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index 3ca23555d90c5fedd95d4e8681c073b6523f5bf8..70a43432bdc57df21dadf22e2936aa92a0d33d1a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -68,7 +68,7 @@
                #cooling-cells = <2>;
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -77,7 +77,7 @@
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_wf: vcc3v3-wf-regulator {
+       vcc3v3_wf: regulator-vcc3v3-wf {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_wf";
                regulator-min-microvolt = <3300000>;
@@ -89,7 +89,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;
@@ -103,7 +103,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
@@ -113,7 +113,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc_5v0: vcc-5v0-regulator {
+       vcc_5v0: regulator-vcc-5v0 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_5v0";
                regulator-min-microvolt = <5000000>;
@@ -127,7 +127,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
+       vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v1_nldo_s3";
                regulator-always-on;