arm64: dts: rockchip: adapt regulator nodenames to preferred form
authorJohan Jonker <jbx6244@gmail.com>
Sat, 5 Oct 2024 20:40:12 +0000 (22:40 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Mon, 11 Nov 2024 15:31:34 +0000 (16:31 +0100)
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>
114 files changed:
arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi
arch/arm64/boot/dts/rockchip/px30-evb.dts
arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts
arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi
arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts
arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
arch/arm64/boot/dts/rockchip/rk3308-evb.dts
arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dtsi
arch/arm64/boot/dts/rockchip/rk3326-gameforce-chi.dts
arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi
arch/arm64/boot/dts/rockchip/rk3328-a1.dts
arch/arm64/boot/dts/rockchip/rk3328-evb.dts
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi
arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi
arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts
arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
arch/arm64/boot/dts/rockchip/rk3368-r88.dts
arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
arch/arm64/boot/dts/rockchip/rk3399-evb.dts
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dtsi
arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts
arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts
arch/arm64/boot/dts/rockchip/rk3566-soquartz-blade.dts
arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts
arch/arm64/boot/dts/rockchip/rk3566-soquartz-model-a.dts
arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts
arch/arm64/boot/dts/rockchip/rk3588-armsom-lm7.dtsi
arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts
arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-common.dtsi
arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso
arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi
arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts

index 5b4e223..1edfd64 100644 (file)
@@ -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>;
index c9d7b32..d93aaac 100644 (file)
@@ -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;
index d03e6ae..5e3c10d 100644 (file)
@@ -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;
index d22ea65..1ad0e52 100644 (file)
@@ -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;
index ae398ac..e4517f4 100644 (file)
@@ -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;
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_baseboard: vcc5v0-baseboard-regulator {
+       vcc5v0_baseboard: regulator-vcc5v0-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_baseboard";
                regulator-always-on;
                vin-supply = <&dc_12v>;
        };
 
-       vdda_codec: vdda-codec-regulator {
+       vdda_codec: regulator-vdda-codec {
                compatible = "regulator-fixed";
                regulator-name = "vdda_codec";
                regulator-boot-on;
                vin-supply = <&vcc5v0_baseboard>;
        };
 
-       vddd_codec: vddd-codec-regulator {
+       vddd_codec: regulator-vddd-codec {
                compatible = "regulator-fixed";
                regulator-name = "vddd_codec";
                regulator-boot-on;
index 67b5be0..8aca1ee 100644 (file)
@@ -43,7 +43,7 @@
                };
        };
 
-       vcc5v0_sys: vccsys-regulator {
+       vcc5v0_sys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
index 184b84f..3f1aafe 100644 (file)
@@ -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>;
                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>;
                vin-supply = <&vcc_io>;
        };
 
-       vcc_ddr: vcc-ddr {
+       vcc_ddr: regulator-vcc-ddr {
                compatible = "regulator-fixed";
                regulator-name = "vcc_ddr";
                regulator-min-microvolt = <1500000>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc_io: vcc-io {
+       vcc_io: regulator-vcc-io {
                compatible = "regulator-fixed";
                regulator-name = "vcc_io";
                regulator-min-microvolt = <3300000>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vccio_flash: vccio-flash {
+       vccio_flash: regulator-vccio-flash {
                compatible = "regulator-fixed";
                regulator-name = "vccio_flash";
                regulator-min-microvolt = <3300000>;
                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;
                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";
                pwm-supply = <&vcc5v0_sys>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-min-microvolt = <1050000>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vdd_1v0: vdd-1v0 {
+       vdd_1v0: regulator-vdd-1v0 {
                compatible = "regulator-fixed";
                regulator-name = "vdd_1v0";
                regulator-min-microvolt = <1000000>;
index 9232357..63f9e59 100644 (file)
@@ -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";
                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";
                pwm-supply = <&vcc5v0_sys>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-min-microvolt = <1050000>;
index 62d18ca..7a32972 100644 (file)
@@ -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;
                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>;
                regulator-boot-on;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-always-on;
index c7b1862..a94114f 100644 (file)
@@ -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>;
                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>;
                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";
                regulator-boot-on;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm1 0 5000 1>;
                regulator-name = "vdd_log";
index 9caf9dc..150fadc 100644 (file)
@@ -70,7 +70,7 @@
                };
        };
 
-       vccsys: vccsys {
+       vccsys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v8_sys";
                regulator-always-on;
index 08ed5b9..10e6ab7 100644 (file)
                reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
        };
 
-       vccsys: vccsys-regulator {
+       vccsys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v8_sys";
                regulator-always-on;
index f585b46..446a1a6 100644 (file)
                };
        };
 
-       vccsys: vccsys {
+       vccsys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v8_sys";
                regulator-always-on;
                regulator-max-microvolt = <3800000>;
        };
 
-       vcc_host: vcc_host {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc_host";
                regulator-min-microvolt = <5000000>;
index 9406a88..8dfeaf1 100644 (file)
@@ -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>;
index 12a4e42..3707df6 100644 (file)
@@ -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;
index d6c9064..1715d31 100644 (file)
@@ -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;
                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>;
index 1898ce6..82021ff 100644 (file)
@@ -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>;
index 116d2a6..b5bd5e7 100644 (file)
@@ -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;
index 905ef4b..425de19 100644 (file)
@@ -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";
index 7d179aa..745d3e9 100644 (file)
@@ -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;
index e5c0dbf..8662494 100644 (file)
@@ -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>;
                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>;
index 03ebf66..445ec20 100644 (file)
@@ -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>;
index c08687d..b99bb0a 100644 (file)
@@ -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>;
                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";
                regulator-always-on;
        };
 
-       vcc_lan: vcc-lan-regulator {
+       vcc_lan: regulator-vcc-lan {
                compatible = "regulator-fixed";
                regulator-name = "vcc_lan";
                regulator-min-microvolt = <3300000>;
                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";
                regulator-always-on;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;
                regulator-boot-on;
        };
 
-       vdd10_usb: vdd10-usb-regulator {
+       vdd10_usb: regulator-vdd10-usb {
                compatible = "regulator-fixed";
                regulator-name = "vdd10_usb";
                regulator-min-microvolt = <1000000>;
index cae01d3..ab70ee5 100644 (file)
@@ -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>;
index dbf9fef..f3797b8 100644 (file)
@@ -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>;
index 23ae2d9..abef858 100644 (file)
@@ -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>;
                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>;
                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>;
                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>;
                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>;
                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>;
                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>;
index 26de793..5132ffe 100644 (file)
@@ -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>;
index 7f14206..b73100c 100644 (file)
@@ -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>;
                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>;
                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>;
                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>;
                regulator-boot-on;
        };
 
-       vccio_wl: vccio-wl-regulator {
+       vccio_wl: regulator-vccio-wl {
                compatible = "regulator-fixed";
                regulator-name = "vccio_wl";
                regulator-min-microvolt = <3300000>;
                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>;
index fe06977..8db0ca5 100644 (file)
@@ -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;
        };
 
        /* 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;
                vin-supply = <&vcc_1v8>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
        };
 
        /* 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>;
        };
 
        /* 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>;
                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>;
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-always-on;
index ef29dc0..9ea91f9 100644 (file)
@@ -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;
                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>;
                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;
index e7d6c8e..0568dfa 100644 (file)
@@ -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;
        };
 
        /* 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;
                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>;
                vin-supply = <&dc_12v>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
        };
 
        /* 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>;
                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>;
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
                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>;
index cacbad3..988e6ca 100644 (file)
@@ -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";
        };
 
        /* 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";
        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";
                vin-supply = <&pp1800>;
        };
 
-       pp3300_disp: pp3300-disp {
+       pp3300_disp: regulator-pp3300-disp {
                compatible = "regulator-fixed";
                regulator-name = "pp3300_disp";
                pinctrl-names = "default";
        };
 
        /* 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";
 
         * 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>;
index 2cc9b33..7b907c8 100644 (file)
@@ -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>;
                };
index d5e0358..19b23b4 100644 (file)
@@ -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";
         * 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";
                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>;
                };
index 776c0ee..6d9e60b 100644 (file)
         *   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";
 
                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";
 
                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";
 
                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";
 
        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>;
index ed0301f..81c4fcb 100644 (file)
@@ -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>;
                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>;
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb: vcc5v0-usb {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
                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>;
index 00e399d..880c240 100644 (file)
@@ -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>;
                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;
                vin-supply = <&vsys>;
        };
 
-       vsys_5v0: vsys-5v0 {
+       vsys_5v0: regulator-vsys-5v0 {
                compatible = "regulator-fixed";
                regulator-name = "vsys_5v0";
                regulator-always-on;
index 6086b97..e7d4a2f 100644 (file)
@@ -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>;
                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>;
                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>;
                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;
                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>;
                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;
                };
        };
 
-       vcc5v0_perdev: vcc5v0-perdev {
+       vcc5v0_perdev: regulator-vcc5v0-perdev {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_perdev";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin_bkup>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                };
        };
 
-       vcc5v0_usb: vcc5v0-usb {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
                vin-supply = <&vcc5v0_perdev>;
        };
 
-       vcc12v_dcin: vcc12v-dcin {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
                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;
index d2ffa5f..2cdc201 100644 (file)
@@ -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;
                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>;
index 3bf8f95..e5fc05c 100644 (file)
@@ -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;
index 5cd69dd..1ac6bc1 100644 (file)
 #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;
index 195410b..3ae645e 100644 (file)
        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;
index f5f8b9c..b1c9bd0 100644 (file)
@@ -54,7 +54,7 @@
                };
        };
 
-       vdd_5v: vdd-5v {
+       vdd_5v: regulator-vdd-5v {
                compatible = "regulator-fixed";
                regulator-name = "vdd_5v";
                regulator-always-on;
index 65ea8df..b169be0 100644 (file)
@@ -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>;
index 2a354a3..2ddd4da 100644 (file)
@@ -65,7 +65,7 @@
                };
        };
 
-       dc_12v: dc-12v {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
        };
 
        /* 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;
                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>;
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
                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>;
                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>;
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
                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>;
index 3adf19e..5473070 100644 (file)
 
        /* Power tree */
        /* Root power source */
-       vcc_sysin: vcc-sysin {
+       vcc_sysin: regulator-vcc-sysin {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sysin";
                regulator-always-on;
 
        /* 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;
        };
 
        /* 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;
        };
 
        /* 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>;
        };
 
        /* RK3399 logic supply */
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc_sysin>;
 
        /* 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;
        };
 
        /* 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;
        };
 
        /* 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>;
        };
 
        /* 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>;
        };
 
        /* 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>;
 
        /* 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>;
 
        /* 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>;
 
        /* 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>;
index e3c5cfd..d9df844 100644 (file)
                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;
                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>;
                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>;
        };
 
        /* 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";
        };
 
        /* 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";
index c04bb98..947bbd6 100644 (file)
@@ -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;
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc3v3_baseboard: vcc3v3-baseboard {
+       vcc3v3_baseboard: regulator-vcc3v3-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_baseboard";
                regulator-always-on;
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_baseboard: vcc5v0-baseboard {
+       vcc5v0_baseboard: regulator-vcc5v0-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_baseboard";
                regulator-always-on;
                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>;
                regulator-always-on;
        };
 
-       vdda_codec: vdda-codec {
+       vdda_codec: regulator-vdda-codec {
                compatible = "regulator-fixed";
                regulator-name = "vdda_codec";
                regulator-boot-on;
                vin-supply = <&vcc5v0_baseboard>;
        };
 
-       vddd_codec: vddd-codec {
+       vddd_codec: regulator-vddd-codec {
                compatible = "regulator-fixed";
                regulator-name = "vddd_codec";
                regulator-boot-on;
index 5b57731..d12e661 100644 (file)
@@ -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>;
index 9447c87..ce057e2 100644 (file)
@@ -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;
index 2c41e01..0ebbfdc 100644 (file)
@@ -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;
index 9b0b3e5..0393da2 100644 (file)
                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;
                regulator-max-microvolt = <5000000>;
        };
 
-       sys_12v: sys-12v {
+       sys_12v: regulator-sys-12v {
                compatible = "regulator-fixed";
                regulator-name = "sys_12v";
                regulator-always-on;
        };
 
        /* 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;
                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>;
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
                vin-supply = <&sys_12v>;
        };
 
-       vcca_0v9: vcca-0v9 {
+       vcca_0v9: regulator-vcca-0v9 {
                compatible = "regulator-fixed";
                regulator-name = "vcca_0v9";
                regulator-always-on;
        };
 
        /* 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>;
                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>;
                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>;
                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";
index f8c3454..15da5c8 100644 (file)
@@ -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>;
                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;
                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>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vdd_log: vdd-log-regulator {
+       vdd_log: regulator-vdd-log {
                compatible = "regulator-fixed";
                regulator-name = "vdd_log";
                regulator-always-on;
index 9814f57..541dca1 100644 (file)
@@ -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;
                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>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
                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>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc-sys {
+       vcc5v0_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc_0v9: vcc-0v9 {
+       vcc_0v9: regulator-vcc-0v9 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_0v9";
                regulator-always-on;
                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>;
index 335aa3c..813b47d 100644 (file)
@@ -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;
index ddba184..69a9d61 100644 (file)
                };
        };
 
-       avdd: avdd-regulator {
+       avdd: regulator-avdd {
                compatible = "regulator-fixed";
                regulator-name = "avdd";
                regulator-min-microvolt = <11000000>;
                vin-supply = <&vcc3v3_s0>;
        };
 
-       vcc12v_dcin: vcc12v-dcin {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
        };
 
        /* 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;
        };
 
        /* 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>;
                };
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc3v3_sys: vcc3v3-sys {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
        };
 
        /* 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>;
                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>;
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_sys: vcc5v0-sys {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
                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>;
index cd891bc..e5c4add 100644 (file)
@@ -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>;
                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>;
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
                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>;
index 86cf2f2..64e6ba3 100644 (file)
@@ -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>;
index 55da1db..3c32eaa 100644 (file)
@@ -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>;
                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>;
index de4c082..938f847 100644 (file)
                };
        };
 
-       vbat_4g: vbat-4g {
+       vbat_4g: regulator-vbat-4g {
                compatible = "regulator-fixed";
                regulator-name = "vbat_4g";
                regulator-min-microvolt = <3800000>;
                vin-supply = <&vbat_4g_en>;
        };
 
-       vcc_1v8: vcc-1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_1v8";
                regulator-always-on;
                vin-supply = <&vcc_1v8_en>;
        };
 
-       vcc_bat: vcc-bat {
+       vcc_bat: regulator-vcc-bat {
                compatible = "regulator-fixed";
                regulator-name = "vcc_bat";
                regulator-always-on;
                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;
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sys: vcc-sys {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
                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>;
                vin-supply = <&vcc_bat>;
        };
 
-       vdda_0v9: vdda-0v9 {
+       vdda_0v9: regulator-vdda-0v9 {
                compatible = "regulator-fixed";
                regulator-name = "vdda_0v9";
                regulator-always-on;
index 5ac3d44..26cf765 100644 (file)
                VCC-supply = <&vcc_bat>;
        };
 
-       vcc_3v3: vcc-3v3-regulator {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_3v3";
                regulator-always-on;
                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>;
                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";
                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>;
                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>;
                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>;
                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;
                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>;
index 1ba20aa..98e75df 100644 (file)
                };
        };
 
-       vcc12v_dcin: vcc12v_dcin {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
         * 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;
                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>;
                vin-supply = <&vcc_3v3>;
        };
 
-       vcc5v0_usb: vcc5v0_usb {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
         * 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>;
                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>;
                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";
        };
 
        /* 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;
        };
 
        /* 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;
index a80042b..24928a1 100644 (file)
@@ -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;
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                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>;
                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;
                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;
index 3ae24e3..b5b253f 100644 (file)
@@ -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;
index d09e654..2a9fb6f 100644 (file)
@@ -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;
index 8bd1f60..7e49906 100644 (file)
@@ -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>;
                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>;
                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;
                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;
index 9a8f4f7..53e7152 100644 (file)
@@ -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;
                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>;
                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>;
                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>;
                };
        };
 
-       vcc_mipi: vcc-mipi-regulator {
+       vcc_mipi: regulator-vcc-mipi {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
index fdbb4a6..b64d0c9 100644 (file)
@@ -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;
index 2b6f0df..3815531 100644 (file)
@@ -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;
index 9a6a632..2e130ee 100644 (file)
@@ -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;
index 4f4af04..6b9aa0e 100644 (file)
@@ -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;
index 5dd93a0..4d3ebe5 100644 (file)
@@ -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;
                vin-supply = <&vcc3v3_sys>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;
        };
 
        /* 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>;
        };
 
        /* 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>;
        };
 
        /* 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>;
                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;
                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>;
                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>;
index 6e6d3c4..b073a4d 100644 (file)
@@ -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;
                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>;
                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>;
                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>;
                };
        };
 
-       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>;
index 4976e64..b0ac1e5 100644 (file)
@@ -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>;
index ce6d5dc..0cfbd9d 100644 (file)
@@ -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;
                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;
                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;
                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;
index cee052f..00c479a 100644 (file)
@@ -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>;
                vin-supply = <&vcc5v0_usb>;
        };
 
-       pcie30_avdd0v9: pcie30-avdd0v9-regulator {
+       pcie30_avdd0v9: regulator-pcie30-avdd0v9 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd0v9";
                regulator-always-on;
                vin-supply = <&vcc3v3_sys>;
        };
 
-       pcie30_avdd1v8: pcie30-avdd1v8-regulator {
+       pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
                compatible = "regulator-fixed";
                regulator-name = "pcie30_avdd1v8";
                regulator-always-on;
index 913d565..0f84480 100644 (file)
@@ -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;
                };
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                enable-active-high;
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                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;
                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;
index 0e447ff..729e38b 100644 (file)
@@ -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;
index 01aec26..1aa3b97 100644 (file)
@@ -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>;
index ce14ff8..5e0dbf1 100644 (file)
@@ -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;
                vin-supply = <&dc_12v>;
        };
 
-       vcc3v3_pcie: vcc3v3-pcie-regulator {
+       vcc3v3_pcie: regulator-vcc3v3-pcie {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie";
                enable-active-high;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                enable-active-high;
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_otg: vcc5v0-otg-regulator {
+       vcc5v0_otg: regulator-vcc5v0-otg {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_otg";
                enable-active-high;
index 4fa6eff..ac79140 100644 (file)
                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;
        };
 
        /* 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;
                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>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
                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>;
                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>;
                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>;
                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>;
                };
        };
 
-       vcc_mipi: vcc-mipi-regulator {
+       vcc_mipi: regulator-vcc-mipi {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
index fa61633..048933d 100644 (file)
@@ -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";
index 048cc4e..e8243c9 100644 (file)
@@ -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>;
                vin-supply = <&vcc5v_in>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "3v3_sys";
                regulator-always-on;
                vin-supply = <&vcc5v_in>;
        };
 
-       vcc5v_in: vcc5v-in-regulator {
+       vcc5v_in: regulator-vcc5v-in {
                compatible = "regulator-fixed";
                regulator-name = "5v_in";
                regulator-always-on;
index d221efd..a3138d2 100644 (file)
@@ -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;
index aefa0d3..08f0905 100644 (file)
@@ -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;
                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;
index 12abbab..779cd1b 100644 (file)
@@ -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>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;
index 610a610..9d525c8 100644 (file)
@@ -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;
index 9ec2374..92f0ed8 100644 (file)
@@ -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;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_lcd: vcc3v3-lcd-regulator {
+       vcc3v3_lcd: regulator-vcc3v3-lcd {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_lcd";
                enable-active-high;
                vin-supply = <&vcc3v3_sys>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-boot-on;
                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;
index fde8b22..71ed680 100644 (file)
@@ -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;
index 03fd193..5e72d0e 100644 (file)
@@ -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;
index 7b13178..05ae9bd 100644 (file)
@@ -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>;
index e9a3855..2128ffc 100644 (file)
@@ -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 */
index 863a73b..d6e464c 100644 (file)
                };
        };
 
-       pcie20_avdd0v85: pcie20-avdd0v85-regulator {
+       pcie20_avdd0v85: regulator-pcie20-avdd0v85 {
                compatible = "regulator-fixed";
                regulator-name = "pcie20_avdd0v85";
                regulator-always-on;
                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;
                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;
                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;
                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>;
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
                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>;
                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;
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usbdcin: vcc5v0-usbdcin-regulator {
+       vcc5v0_usbdcin: regulator-vcc5v0-usbdcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usbdcin";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
index 47e64d5..3900513 100644 (file)
@@ -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;
index 024b601..90f823b 100644 (file)
@@ -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;
                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;
                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;
        };
 
        /* 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;
                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>;
                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>;
                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>;
                enable-active-high;
        };
 
-       vcc3v3_mdot2: vcc3v3-mdot2-regulator {
+       vcc3v3_mdot2: regulator-vcc3v3-mdot2 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_mdot2";
                regulator-always-on;
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                vin-supply = <&dc_12v>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
index 2d92bbb..ff85506 100644 (file)
@@ -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>;
index 92321c1..40290a8 100644 (file)
@@ -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>;
index bf8e1f1..9ba94fa 100644 (file)
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
        };
 
        /* vcc5v0_sys powers peripherals */
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
        };
 
        /* 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;
                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;
                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;
                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>;
                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>;
                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>;
                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;
index b8c3305..1c0851b 100644 (file)
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
                regulator-max-microvolt = <12000000>;
        };
 
-       vcc1v8_sys: vcc1v8-sys-regulator {
+       vcc1v8_sys: regulator-vcc1v8-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_sys";
                regulator-always-on;
                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>;
                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>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_pcie30: vcc3v3_pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3_pcie30 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_pcie30";
                regulator-always-on;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc3v3_sys: vcc3v3-sys-regulator {
+       vcc3v3_sys: regulator-vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
                regulator-always-on;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
index 9b1f985..92de273 100644 (file)
                };
        };
 
-       vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+       vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>;
                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";
                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>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                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>;
index 50c7a5e..11d7594 100644 (file)
                };
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
                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>;
                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>;
                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>;
                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;
                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>;
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
index ca9a025..dd0f970 100644 (file)
@@ -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>;
                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>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_host";
                regulator-boot-on;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                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;
index 270d59a..3187b49 100644 (file)
@@ -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;
                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;
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_baseboard: vcc5v0-baseboard-regulator {
+       vcc5v0_baseboard: regulator-vcc5v0-baseboard {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_baseboard";
                regulator-always-on;
                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>;
                regulator-always-on;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
                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;
index 54a20fb..81a6a05 100644 (file)
@@ -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;
index d002152..9a31eae 100644 (file)
@@ -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;
                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;
                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>;
                vin-supply = <&vcc5v0_usb>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usbdcin: vcc5v0-usbdcin-regulator {
+       vcc5v0_usbdcin: regulator-vcc5v0-usbdcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usbdcin";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
                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;
index 7fc7fb7..63ba503 100644 (file)
@@ -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;
index 4a63dab..9c394f7 100644 (file)
@@ -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;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usbdcin: vcc5v0-usbdcin-regulator {
+       vcc5v0_usbdcin: regulator-vcc5v0-usbdcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usbdcin";
                regulator-always-on;
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_usb";
                regulator-always-on;
                vin-supply = <&vcc5v0_usbdcin>;
        };
 
-       avdd0v85_pcie20: avdd0v85-pcie20-regulator {
+       avdd0v85_pcie20: regulator-avdd0v85-pcie20 {
                compatible = "regulator-fixed";
                regulator-name = "avdd0v85_pcie20";
                regulator-boot-on;
                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;
                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>;
                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>;
                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>;
                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;
index cd9ad44..812bba0 100644 (file)
                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;
                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>;
                };
        };
 
-       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>;
                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>;
                };
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
index 3a41b9c..5e6a5df 100644 (file)
@@ -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;
        };
 
        /* 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;
                };
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
                regulator-name = "vcc5v0_sys";
        };
 
-       vcc5v0_usb: vcc5v0-usb-regulator {
+       vcc5v0_usb: regulator-vcc5v0-usb {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
                vin-supply = <&vcc5v0_usbdcin>;
        };
 
-       vcc5v0_usbdcin: vcc5v0-usbdcin-regulator {
+       vcc5v0_usbdcin: regulator-vcc5v0-usbdcin {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
index b80a552..ac48e7f 100644 (file)
@@ -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;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                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;
                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>;
index 2e22a49..76a6e8e 100644 (file)
@@ -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;
                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;
                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>;
                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;
                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;
                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>;
                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>;
index 9c0d134..ad6d047 100644 (file)
@@ -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>;
index 0573b8f..d86aeac 100644 (file)
@@ -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>;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                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";
index 3ca2355..70a4343 100644 (file)
@@ -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;
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc5v0-sys-regulator {
+       vcc5v0_sys: regulator-vcc5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc5v0_sys";
                regulator-always-on;
                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>;
                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;