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

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

Fix all Rockchip DT regulator nodenames.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/cfc3cfe1-086b-48f1-9b89-f17c9391d3cc@gmail.com
[Also include the backlight-regulator and panel-regulator from
 rk3288-veyron-edp, and adapt the Pinky device accordingly]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
index e32c73d..44675a2 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
@@ -80,7 +80,7 @@
                };
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts
index f924d4d..c227691 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts
@@ -22,7 +22,7 @@
                reg = <0x60000000 0x40000000>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm3 0 1000>;
                regulator-name = "vdd_log";
@@ -34,7 +34,7 @@
                status = "okay";
        };
 
-       vcc_sd0: fixed-regulator {
+       vcc_sd0: regulator-fixed {
                compatible = "regulator-fixed";
                regulator-name = "sdmmc-supply";
                regulator-min-microvolt = <3000000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts b/arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts
index f6e8d49..ada7dbf 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts
+++ b/arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts
@@ -19,7 +19,7 @@
                reg = <0x60000000 0x40000000>;
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm3 0 1000>;
                regulator-name = "vdd_log";
@@ -31,7 +31,7 @@
                status = "okay";
        };
 
-       vcc_sd0: sdmmc-regulator {
+       vcc_sd0: regulator-sdmmc {
                compatible = "regulator-fixed";
                regulator-name = "sdmmc-supply";
                regulator-min-microvolt = <3000000>;
@@ -41,7 +41,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vsys: vsys-regulator {
+       vsys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vsys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3066a-mk808.dts b/arch/arm/boot/dts/rockchip/rk3066a-mk808.dts
index 4de9a45..25c0bcf 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3066a-mk808.dts
+++ b/arch/arm/boot/dts/rockchip/rk3066a-mk808.dts
@@ -61,21 +61,21 @@
                };
        };
 
-       vcc_2v5: vcc-2v5 {
+       vcc_2v5: regulator-vcc-2v5 {
                compatible = "regulator-fixed";
                regulator-name = "vcc_2v5";
                regulator-min-microvolt = <2500000>;
                regulator-max-microvolt = <2500000>;
        };
 
-       vcc_io: vcc-io {
+       vcc_io: regulator-vcc-io {
                compatible = "regulator-fixed";
                regulator-name = "vcc_io";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vcc_host: usb-host-regulator {
+       vcc_host: regulator-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -89,7 +89,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_otg: usb-otg-regulator {
+       vcc_otg: regulator-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
@@ -103,7 +103,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
                pinctrl-0 = <&sdmmc_pwr>;
@@ -115,7 +115,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_wifi: sdio-regulator {
+       vcc_wifi: regulator-sdio {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts b/arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts
index 29d8e5b..b0b029f 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts
@@ -42,7 +42,7 @@
                };
        };
 
-       vdd_log: vdd-log {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm3 0 1000>;
                regulator-name = "vdd_log";
@@ -54,7 +54,7 @@
                status = "okay";
        };
 
-       vsys: vsys-regulator {
+       vsys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vsys";
                regulator-min-microvolt = <5000000>;
@@ -64,7 +64,7 @@
        };
 
        /* input for 5V_STDBY is VSYS or DC5V, selectable by jumper J4 */
-       vcc_stdby: stdby-regulator {
+       vcc_stdby: regulator-stdby {
                compatible = "regulator-fixed";
                regulator-name = "5v_stdby";
                regulator-min-microvolt = <5000000>;
@@ -73,7 +73,7 @@
                regulator-boot-on;
        };
 
-       vcc_emmc: emmc-regulator {
+       vcc_emmc: regulator-emmc {
                compatible = "regulator-fixed";
                regulator-name = "emmc_vccq";
                regulator-min-microvolt = <3000000>;
@@ -81,7 +81,7 @@
                vin-supply = <&vsys>;
        };
 
-       vcc_sata: sata-regulator {
+       vcc_sata: regulator-sata {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
@@ -94,7 +94,7 @@
                vin-supply = <&vcc_stdby>;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -106,7 +106,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_host: usb-host-regulator {
+       vcc_host: regulator-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -119,7 +119,7 @@
                vin-supply = <&vcc_stdby>;
        };
 
-       vcc_otg: usb-otg-regulator {
+       vcc_otg: regulator-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/rockchip/rk3128-evb.dts b/arch/arm/boot/dts/rockchip/rk3128-evb.dts
index c7ab7fc..3d27d92 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3128-evb.dts
+++ b/arch/arm/boot/dts/rockchip/rk3128-evb.dts
@@ -24,7 +24,7 @@
                reg = <0x60000000 0x40000000>;
        };
 
-       vcc5v0_otg: vcc5v0-otg-regulator {
+       vcc5v0_otg: regulator-vcc5v0-otg {
                compatible = "regulator-fixed";
                gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
@@ -34,7 +34,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc5v0_host: vcc5v0-host-regulator {
+       vcc5v0_host: regulator-vcc5v0-host {
                compatible = "regulator-fixed";
                gpio = <&gpio2 23 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
index 21c1678..21f824b 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
+++ b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
@@ -38,7 +38,7 @@
                };
        };
 
-       dc_5v: dc-5v-regulator {
+       dc_5v: regulator-dc-5v {
                compatible = "regulator-fixed";
                regulator-name = "DC_5V";
                regulator-min-microvolt = <5000000>;
@@ -62,7 +62,7 @@
         * This is a vbus-supply, which also supplies the GL852G usb hub,
         * thus has to be always-on
         */
-       host_pwr_5v: host-pwr-5v-regulator {
+       host_pwr_5v: regulator-host-pwr-5v {
                compatible = "regulator-fixed";
                gpio = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;
                startup-delay-us = <1500>;
@@ -111,7 +111,7 @@
                };
        };
 
-       mcu3v3: mcu3v3-regulator {
+       mcu3v3: regulator-mcu3v3 {
                compatible = "regulator-fixed";
                regulator-name = "MCU3V3";
                regulator-min-microvolt = <3300000>;
@@ -121,7 +121,7 @@
                regulator-boot-on;
        };
 
-       vcc_ddr: vcc-ddr-regulator {
+       vcc_ddr: regulator-vcc-ddr {
                compatible = "regulator-fixed";
                regulator-name = "VCC_DDR";
                regulator-min-microvolt = <1500000>;
@@ -131,7 +131,7 @@
                regulator-boot-on;
        };
 
-       vcc_io: vcc-io-regulator {
+       vcc_io: regulator-vcc-io {
                compatible = "regulator-fixed";
                regulator-name = "VCC_IO";
                regulator-min-microvolt = <3300000>;
@@ -141,7 +141,7 @@
                regulator-boot-on;
        };
 
-       vcc_lan: vcc-lan-regulator {
+       vcc_lan: regulator-vcc-lan {
                compatible = "regulator-fixed";
                regulator-name = "VCC_LAN";
                regulator-min-microvolt = <3300000>;
@@ -151,7 +151,7 @@
                regulator-boot-on;
        };
 
-       vcc_sd: vcc-sd-regulator {
+       vcc_sd: regulator-vcc-sd {
                compatible = "regulator-fixed";
                gpio = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
                startup-delay-us = <500>;
@@ -163,7 +163,7 @@
                pinctrl-0 = <&sdmmc_pwren>;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "VCC_SYS";
                regulator-min-microvolt = <5000000>;
@@ -173,7 +173,7 @@
                regulator-boot-on;
        };
 
-       vcc33_hdmi: vcc33-hdmi-regulator {
+       vcc33_hdmi: regulator-vcc33-hdmi {
                compatible = "regulator-fixed";
                regulator-name = "VCC33_HDMI";
                regulator-min-microvolt = <3300000>;
@@ -183,7 +183,7 @@
                regulator-boot-on;
        };
 
-       vcca_33: vcca-33-regulator {
+       vcca_33: regulator-vcca-33 {
                compatible = "regulator-fixed";
                regulator-name = "VCCA_33";
                regulator-min-microvolt = <3300000>;
@@ -193,7 +193,7 @@
                regulator-boot-on;
        };
 
-       vdd_11: vdd-11-regulator {
+       vdd_11: regulator-vdd-11 {
                compatible = "regulator-fixed";
                regulator-name = "VDD_11";
                regulator-min-microvolt = <1100000>;
@@ -203,7 +203,7 @@
                regulator-boot-on;
        };
 
-       vdd11_hdmi: vdd11-hdmi-regulator {
+       vdd11_hdmi: regulator-vdd11-hdmi {
                compatible = "regulator-fixed";
                regulator-name = "VDD11_HDMI";
                regulator-min-microvolt = <1100000>;
@@ -213,7 +213,7 @@
                regulator-boot-on;
        };
 
-       vdd_arm: vdd-arm-regulator {
+       vdd_arm: regulator-vdd-arm {
                compatible = "pwm-regulator";
                regulator-name = "VDD_ARM";
                pwms = <&pwm1 0 25000 1>;
@@ -231,7 +231,7 @@
         * driver does not implement regulator support we have to make
         * sure here that the voltage never drops below 1050 mV.
         */
-       vdd_log: vdd-log-regulator {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                regulator-name = "VDD_LOG";
                pwms = <&pwm2 0 25000 1>;

diff --git a/arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts b/arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts
index 9312be3..edc2b7f 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts
+++ b/arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts
@@ -130,7 +130,7 @@
                reset-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_LOW>;
        };
 
-       avdd_cif: cif-avdd-regulator {
+       avdd_cif: regulator-cif-avdd {
                compatible = "regulator-fixed";
                regulator-name = "avdd-cif";
                regulator-min-microvolt = <2800000>;
@@ -142,7 +142,7 @@
                vin-supply = <&vcc28_cif>;
        };
 
-       vcc_5v: vcc-5v-regulator {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "vcc-5v";
                regulator-min-microvolt = <5000000>;
@@ -154,7 +154,7 @@
                vin-supply = <&vsys>;
        };
 
-       vcc_lcd: lcd-regulator {
+       vcc_lcd: regulator-lcd {
                compatible = "regulator-fixed";
                regulator-name = "vcc-lcd";
                gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>;
@@ -164,7 +164,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_otg: usb-otg-regulator {
+       vcc_otg: regulator-usb-otg {
                compatible = "regulator-fixed";
                regulator-name = "vcc-otg";
                regulator-min-microvolt = <5000000>;
@@ -177,7 +177,7 @@
                vin-supply = <&vcc_5v>;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                regulator-name = "vcc-sd";
                regulator-min-microvolt = <3300000>;
@@ -189,7 +189,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vccq_emmc: emmc-vccq-regulator {
+       vccq_emmc: regulator-emmc-vccq {
                compatible = "regulator-fixed";
                regulator-name = "vccq-emmc";
                regulator-min-microvolt = <2800000>;
@@ -198,7 +198,7 @@
        };
 
        /* supplied from the bq24196 */
-       vsys: vsys-regulator {
+       vsys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vsys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3188-px3-evb.dts b/arch/arm/boot/dts/rockchip/rk3188-px3-evb.dts
index 0a1ae68..32f36d7 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3188-px3-evb.dts
+++ b/arch/arm/boot/dts/rockchip/rk3188-px3-evb.dts
@@ -39,7 +39,7 @@
                };
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vsys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3188-radxarock.dts b/arch/arm/boot/dts/rockchip/rk3188-radxarock.dts
index 118deac..1f31c0a 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rockchip/rk3188-radxarock.dts
@@ -78,7 +78,7 @@
                pinctrl-0 = <&ir_recv_pin>;
        };
 
-       vcc_otg: usb-otg-regulator {
+       vcc_otg: regulator-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PD7 GPIO_ACTIVE_HIGH>;
@@ -91,7 +91,7 @@
                regulator-boot-on;
        };
 
-       vcc_sd0: sdmmc-regulator {
+       vcc_sd0: regulator-sdmmc {
                compatible = "regulator-fixed";
                regulator-name = "sdmmc-supply";
                regulator-min-microvolt = <3300000>;
@@ -103,7 +103,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_host: usb-host-regulator {
+       vcc_host: regulator-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -116,7 +116,7 @@
                regulator-boot-on;
        };
 
-       vsys: vsys-regulator {
+       vsys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vsys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3228-evb.dts b/arch/arm/boot/dts/rockchip/rk3228-evb.dts
index 69a5e23..a450cf3 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3228-evb.dts
+++ b/arch/arm/boot/dts/rockchip/rk3228-evb.dts
@@ -17,7 +17,7 @@
                reg = <0x60000000 0x40000000>;
        };
 
-       vcc_phy: vcc-phy-regulator {
+       vcc_phy: regulator-vcc-phy {
                compatible = "regulator-fixed";
                enable-active-high;
                regulator-name = "vcc_phy";

diff --git a/arch/arm/boot/dts/rockchip/rk3229-evb.dts b/arch/arm/boot/dts/rockchip/rk3229-evb.dts
index 5c3d08e..c35757d 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3229-evb.dts
+++ b/arch/arm/boot/dts/rockchip/rk3229-evb.dts
@@ -18,7 +18,7 @@
                reg = <0x60000000 0x40000000>;
        };
 
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -34,7 +34,7 @@
                #clock-cells = <0>;
        };
 
-       vcc_host: vcc-host-regulator {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;
@@ -46,7 +46,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_phy: vcc-phy-regulator {
+       vcc_phy: regulator-vcc-phy {
                compatible = "regulator-fixed";
                enable-active-high;
                regulator-name = "vcc_phy";
@@ -57,7 +57,7 @@
                vin-supply = <&vccio_1v8>;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -67,7 +67,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vccio_1v8: vccio-1v8-regulator {
+       vccio_1v8: regulator-vccio-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vccio_1v8";
                regulator-min-microvolt = <1800000>;
@@ -76,7 +76,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vccio_3v3: vccio-3v3-regulator {
+       vccio_3v3: regulator-vccio-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vccio_3v3";
                regulator-min-microvolt = <3300000>;
@@ -85,7 +85,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vdd_arm: vdd-arm-regulator {
+       vdd_arm: regulator-vdd-arm {
                compatible = "pwm-regulator";
                pwms = <&pwm1 0 25000 1>;
                pwm-supply = <&vcc_sys>;
@@ -96,7 +96,7 @@
                regulator-boot-on;
        };
 
-       vdd_log: vdd-log-regulator {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc_sys>;

diff --git a/arch/arm/boot/dts/rockchip/rk3229-xms6.dts b/arch/arm/boot/dts/rockchip/rk3229-xms6.dts
index 7bfbfd1..2833344 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3229-xms6.dts
+++ b/arch/arm/boot/dts/rockchip/rk3229-xms6.dts
@@ -20,7 +20,7 @@
                reg = <0x60000000 0x40000000>;
        };
 
-       dc_12v: dc-12v-regulator {
+       dc_12v: regulator-dc-12v {
                compatible = "regulator-fixed";
                regulator-name = "dc_12v";
                regulator-always-on;
@@ -51,7 +51,7 @@
                              <&gpio2 29 GPIO_ACTIVE_LOW>;
        };
 
-       vcc_host: vcc-host-regulator {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;
@@ -63,7 +63,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_phy: vcc-phy-regulator {
+       vcc_phy: regulator-vcc-phy {
                compatible = "regulator-fixed";
                enable-active-high;
                regulator-name = "vcc_phy";
@@ -74,7 +74,7 @@
                vin-supply = <&vccio_1v8>;
        };
 
-       vcc_sys: vcc-sys-regulator {
+       vcc_sys: regulator-vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-always-on;
@@ -84,7 +84,7 @@
                vin-supply = <&dc_12v>;
        };
 
-       vccio_1v8: vccio-1v8-regulator {
+       vccio_1v8: regulator-vccio-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vccio_1v8";
                regulator-min-microvolt = <1800000>;
@@ -93,7 +93,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vccio_3v3: vccio-3v3-regulator {
+       vccio_3v3: regulator-vccio-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vccio_3v3";
                regulator-min-microvolt = <3300000>;
@@ -102,7 +102,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vdd_arm: vdd-arm-regulator {
+       vdd_arm: regulator-vdd-arm {
                compatible = "pwm-regulator";
                pwms = <&pwm1 0 25000 1>;
                pwm-supply = <&vcc_sys>;
@@ -113,7 +113,7 @@
                regulator-boot-on;
        };
 
-       vdd_log: vdd-log-regulator {
+       vdd_log: regulator-vdd-log {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 1>;
                pwm-supply = <&vcc_sys>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-evb-act8846.dts b/arch/arm/boot/dts/rockchip/rk3288-evb-act8846.dts
index 8a635c2..e1821fa 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-evb-act8846.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-evb-act8846.dts
@@ -7,7 +7,7 @@
        model = "Rockchip RK3288 EVB ACT8846";
        compatible = "rockchip,rk3288-evb-act8846", "rockchip,rk3288";
 
-       vcc_lcd: vcc-lcd {
+       vcc_lcd: regulator-vcc-lcd {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio7 RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -17,7 +17,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_wl: vcc-wl {
+       vcc_wl: regulator-vcc-wl {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio7 RK_PB1 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-evb.dtsi b/arch/arm/boot/dts/rockchip/rk3288-evb.dtsi
index 382d283..11bb970 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-evb.dtsi
@@ -129,7 +129,7 @@
        };
 
        /* This turns on USB vbus for both host0 (ehci) and host1 (dwc2) */
-       vcc_host: vcc-host-regulator {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
@@ -140,7 +140,7 @@
                regulator-boot-on;
        };
 
-       vcc_phy: vcc-phy-regulator {
+       vcc_phy: regulator-vcc-phy {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -153,7 +153,7 @@
                regulator-boot-on;
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;
@@ -167,7 +167,7 @@
         * vcc_io directly.  Those boards won't be able to power cycle SD cards
         * but it shouldn't hurt to toggle this pin there anyway.
         */
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/rockchip/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rockchip/rk3288-firefly-reload-core.dtsi
index 36efa36..5902948 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-firefly-reload-core.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-firefly-reload-core.dtsi
@@ -21,7 +21,7 @@
        };
 
 
-       vcc_flash: flash-regulator {
+       vcc_flash: regulator-flash {
                compatible = "regulator-fixed";
                regulator-name = "vcc_flash";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts
index a5a0826..a552706 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts
@@ -85,7 +85,7 @@
                #sound-dai-cells = <0>;
        };
 
-       vcc_host_5v: usb-host-regulator {
+       vcc_host_5v: regulator-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
@@ -98,7 +98,7 @@
                vin-supply = <&vcc_5v>;
        };
 
-       vcc_5v: vcc_sys: vsys-regulator {
+       vcc_5v: vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_5v";
                regulator-min-microvolt = <5000000>;
@@ -107,7 +107,7 @@
                regulator-boot-on;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -119,7 +119,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_otg_5v: usb-otg-regulator {
+       vcc_otg_5v: regulator-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
@@ -132,7 +132,7 @@
                vin-supply = <&vcc_5v>;
        };
 
-       dovdd_1v8: dovdd-1v8-regulator {
+       dovdd_1v8: regulator-dovdd-1v8 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
@@ -144,7 +144,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc28_dvp: vcc28-dvp-regulator {
+       vcc28_dvp: regulator-vcc28-dvp {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
@@ -156,7 +156,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       af_28: af_28-regulator {
+       af_28: regulator-af-28 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
@@ -168,7 +168,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       dvdd_1v2: af_28-regulator {
+       dvdd_1v2: regulator-dvdd-1v2 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>;
@@ -180,7 +180,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vbat_wl: wifi-regulator {
+       vbat_wl: regulator-wifi {
                compatible = "regulator-fixed";
                regulator-name = "vbat_wl";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-firefly.dtsi b/arch/arm/boot/dts/rockchip/rk3288-firefly.dtsi
index 3836c61..187d4f0 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-firefly.dtsi
@@ -25,7 +25,7 @@
                };
        };
 
-       dovdd_1v8: dovdd-1v8-regulator {
+       dovdd_1v8: regulator-dovdd-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "dovdd_1v8";
                regulator-min-microvolt = <1800000>;
@@ -79,7 +79,7 @@
                };
        };
 
-       vbat_wl: vcc_sys: vsys-regulator {
+       vbat_wl: vcc_sys:  regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;
@@ -88,7 +88,7 @@
                regulator-boot-on;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -100,7 +100,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_flash: flash-regulator {
+       vcc_flash: regulator-flash {
                compatible = "regulator-fixed";
                regulator-name = "vcc_flash";
                regulator-min-microvolt = <1800000>;
@@ -108,7 +108,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_5v: usb-regulator {
+       vcc_5v: regulator-usb {
                compatible = "regulator-fixed";
                regulator-name = "vcc_5v";
                regulator-min-microvolt = <5000000>;
@@ -118,7 +118,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_host_5v: usb-host-regulator {
+       vcc_host_5v: regulator-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
@@ -131,7 +131,7 @@
                vin-supply = <&vcc_5v>;
        };
 
-       vcc_otg_5v: usb-otg-regulator {
+       vcc_otg_5v: regulator-usb-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
@@ -148,7 +148,7 @@
         * A TT8142 creates both dovdd_1v8 and vcc28_dvp, controlled
         * by the dvp_pwr pin.
         */
-       vcc28_dvp: vcc28-dvp-regulator {
+       vcc28_dvp: regulator-vcc28-dvp {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
index db1eb64..dd42f8d 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
@@ -37,7 +37,7 @@
                };
        };
 
-       vcc_flash: flash-regulator {
+       vcc_flash: regulator-flash {
                compatible = "regulator-fixed";
                regulator-name = "vcc_flash";
                regulator-min-microvolt = <1800000>;
@@ -45,7 +45,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_host: usb-host-regulator {
+       vcc_host: regulator-usb-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
@@ -58,7 +58,7 @@
                vin-supply = <&vcc_sys>;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -70,7 +70,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts b/arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts
index 1a51569..10ce055 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts
@@ -35,7 +35,7 @@
                };
        };
 
-       vcc_host0_5v: usb-host0-regulator {
+       vcc_host0_5v: regulator-usb-host0 {
                compatible = "regulator-fixed";
                gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
@@ -47,7 +47,7 @@
                vin-supply = <&vdd_in_otg_out>;
        };
 
-       vcc_host1_5v: usb-host1-regulator {
+       vcc_host1_5v: regulator-usb-host1 {
                compatible = "regulator-fixed";
                gpio = <&gpio2 0 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
@@ -59,7 +59,7 @@
                vin-supply = <&vdd_in_otg_out>;
        };
 
-       vcc_otg_5v: usb-otg-regulator {
+       vcc_otg_5v: regulator-usb-otg {
                compatible = "regulator-fixed";
                gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi b/arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi
index e43887c..12ab10c 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi
@@ -46,7 +46,7 @@
                };
        };
 
-       vdd_emmc_io: vdd-emmc-io {
+       vdd_emmc_io: regulator-vdd-emmc-io {
                compatible = "regulator-fixed";
                regulator-name = "vdd_emmc_io";
                regulator-min-microvolt = <1800000>;
@@ -54,7 +54,7 @@
                vin-supply = <&vdd_3v3_io>;
        };
 
-       vdd_in_otg_out: vdd-in-otg-out {
+       vdd_in_otg_out: regulator-vdd-in-otg-out {
                compatible = "regulator-fixed";
                regulator-name = "vdd_in_otg_out";
                regulator-always-on;
@@ -63,7 +63,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vdd_misc_1v8: vdd-misc-1v8 {
+       vdd_misc_1v8: regulator-vdd-misc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vdd_misc_1v8";
                regulator-always-on;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-popmetal.dts b/arch/arm/boot/dts/rockchip/rk3288-popmetal.dts
index fd90f3b..560bc23 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-popmetal.dts
@@ -47,7 +47,7 @@
                pinctrl-0 = <&ir_int>;
        };
 
-       vcc_flash: flash-regulator {
+       vcc_flash: regulator-flash {
                compatible = "regulator-fixed";
                regulator-name = "vcc_flash";
                regulator-min-microvolt = <1800000>;
@@ -55,7 +55,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -67,7 +67,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;
@@ -80,7 +80,7 @@
         * A PT5128 creates both dovdd_1v8 and vcc28_dvp, controlled
         * by the dvp_pwr pin.
         */
-       vcc18_dvp: vcc18-dvp-regulator {
+       vcc18_dvp: regulator-vcc18-dvp {
                compatible = "regulator-fixed";
                regulator-name = "vcc18-dvp";
                regulator-min-microvolt = <1800000>;
@@ -88,7 +88,7 @@
                vin-supply = <&vcc28_dvp>;
        };
 
-       vcc28_dvp: vcc28-dvp-regulator {
+       vcc28_dvp: regulator-vcc28-dvp {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-r89.dts b/arch/arm/boot/dts/rockchip/rk3288-r89.dts
index 633e5a0..40c65db 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-r89.dts
@@ -48,7 +48,7 @@
                pinctrl-0 = <&ir_int>;
        };
 
-       vcc_host: vcc-host-regulator {
+       vcc_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
@@ -59,7 +59,7 @@
                regulator-boot-on;
        };
 
-       vcc_otg: vcc-otg-regulator {
+       vcc_otg: regulator-vcc-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
@@ -70,7 +70,7 @@
                regulator-boot-on;
        };
 
-       vcc_sdmmc: sdmmc-regulator {
+       vcc_sdmmc: regulator-sdmmc {
                compatible = "regulator-fixed";
                regulator-name = "sdmmc-supply";
                regulator-min-microvolt = <3300000>;
@@ -80,7 +80,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sys: sys-regulator {
+       vcc_sys: regulator-sys {
                compatible = "regulator-fixed";
                regulator-name = "sys-supply";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rockchip/rk3288-rock2-som.dtsi
index 76363b8..30f914f 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-rock2-som.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-rock2-som.dtsi
@@ -23,7 +23,7 @@
                clock-output-names = "ext_gmac";
        };
 
-       vcc_flash: flash-regulator {
+       vcc_flash: regulator-flash {
                compatible = "regulator-fixed";
                regulator-name = "vcc_flash";
                regulator-min-microvolt = <1800000>;
@@ -32,7 +32,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-rock2-square.dts b/arch/arm/boot/dts/rockchip/rk3288-rock2-square.dts
index 13cfdaa..58a7270 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-rock2-square.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-rock2-square.dts
@@ -70,7 +70,7 @@
                };
        };
 
-       sata_pwr: sata-prw-regulator {
+       sata_pwr: regulator-sata-prw {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
@@ -108,7 +108,7 @@
                reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>;
        };
 
-       vcc_usb_host: vcc-host-regulator {
+       vcc_usb_host: regulator-vcc-host {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
@@ -117,7 +117,7 @@
                regulator-name = "vcc_host";
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
index 09618bb..8e27a20 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
@@ -85,7 +85,7 @@
                };
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <5000000>;
@@ -94,7 +94,7 @@
                regulator-boot-on;
        };
 
-       vcc_sd: sdmmc-regulator {
+       vcc_sd: regulator-sdmmc {
                compatible = "regulator-fixed";
                gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts
index aa33d09..ade9cc2 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts
@@ -14,11 +14,11 @@
        compatible = "google,veyron-brain-rev0", "google,veyron-brain",
                     "google,veyron", "rockchip,rk3288";
 
-       vcc33_sys: vcc33-sys {
+       vcc33_sys: regulator-vcc33-sys {
                vin-supply = <&vcc_5v>;
        };
 
-       vcc33_io: vcc33_io {
+       vcc33_io: regulator-vcc33-io {
                compatible = "regulator-fixed";
                regulator-name = "vcc33_io";
                regulator-always-on;
@@ -28,7 +28,7 @@
        };
 
        /* This turns on vbus for host2 and otg (dwc2) */
-       vcc5_host2: vcc5-host2-regulator {
+       vcc5_host2: regulator-vcc5-host2 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi
index 092316b..3677571 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi
@@ -43,23 +43,23 @@
        };
 
        /* A non-regulated voltage from power supply or battery */
-       vccsys: vccsys {
+       vccsys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vccsys";
                regulator-boot-on;
                regulator-always-on;
        };
 
-       vcc33_sys: vcc33-sys {
+       vcc33_sys: regulator-vcc33-sys {
                vin-supply = <&vccsys>;
        };
 
-       vcc_5v: vcc-5v {
+       vcc_5v: regulator-vcc-5v {
                vin-supply = <&vccsys>;
        };
 
        /* This turns on vbus for host1 (dwc2) */
-       vcc5_host1: vcc5-host1-regulator {
+       vcc5_host1: regulator-vcc5-host1 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
@@ -71,7 +71,7 @@
        };
 
        /* This turns on vbus for otg for host mode (dwc2) */
-       vcc5v_otg: vcc5v-otg-regulator {
+       vcc5v_otg: regulator-vcc5v-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi
index 32c0f10..fb03196 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi
@@ -6,7 +6,7 @@
  */
 
 / {
-       backlight_regulator: backlight-regulator {
+       backlight_regulator: regulator-backlight {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
@@ -17,7 +17,7 @@
                startup-delay-us = <15000>;
        };
 
-       panel_regulator: panel-regulator {
+       panel_regulator: regulator-panel {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts
index 309b122..6a0844e 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts
@@ -18,7 +18,7 @@
                     "google,veyron-fievel-rev0", "google,veyron-fievel",
                     "google,veyron", "rockchip,rk3288";
 
-       vccsys: vccsys {
+       vccsys: regulator-vccsys {
                compatible = "regulator-fixed";
                regulator-name = "vccsys";
                regulator-boot-on;
@@ -29,14 +29,14 @@
         * vcc33_pmuio and vcc33_io is sourced directly from vcc33_sys,
         * enabled by vcc_18
         */
-       vcc33_io: vcc33-io {
+       vcc33_io: regulator-vcc33-io {
                compatible = "regulator-fixed";
                regulator-always-on;
                regulator-boot-on;
                regulator-name = "vcc33_io";
        };
 
-       vcc5_host1: vcc5-host1-regulator {
+       vcc5_host1: regulator-vcc5-host1 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio5 RK_PC2 GPIO_ACTIVE_HIGH>;
@@ -47,7 +47,7 @@
                regulator-boot-on;
        };
 
-       vcc5_host2: vcc5-host2-regulator {
+       vcc5_host2: regulator-vcc5-host2 {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio5 RK_PB6 GPIO_ACTIVE_HIGH>;
@@ -58,7 +58,7 @@
                regulator-boot-on;
        };
 
-       vcc5v_otg: vcc5v-otg-regulator {
+       vcc5v_otg: regulator-vcc5v-otg {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts
index ffd1121..d665c3e 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts
@@ -18,11 +18,11 @@
                     "google,veyron-mickey-rev0", "google,veyron-mickey",
                     "google,veyron", "rockchip,rk3288";
 
-       vcc_5v: vcc-5v {
+       vcc_5v: regulator-vcc-5v {
                vin-supply = <&vcc33_sys>;
        };
 
-       vcc33_io: vcc33_io {
+       vcc33_io: regulator-vcc33-io {
                compatible = "regulator-fixed";
                regulator-name = "vcc33_io";
                regulator-always-on;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts
index 6337238..cc27d11 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts
@@ -14,8 +14,8 @@
        compatible = "google,veyron-pinky-rev2", "google,veyron-pinky",
                     "google,veyron", "rockchip,rk3288";
 
-       /delete-node/backlight-regulator;
-       /delete-node/panel-regulator;
+       /delete-node/regulator-backlight;
+       /delete-node/regulator-panel;
        /delete-node/emmc-pwrseq;
        /delete-node/vcc18-lcd;
 };

diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi b/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi
index d838bf0..260d6c9 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi
@@ -75,7 +75,7 @@
                reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>;
        };
 
-       vcc_5v: vcc-5v {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "vcc_5v";
                regulator-always-on;
@@ -84,7 +84,7 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc33_sys: vcc33-sys {
+       vcc33_sys: regulator-vcc33-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc33_sys";
                regulator-always-on;
@@ -93,7 +93,7 @@
                regulator-max-microvolt = <3300000>;
        };
 
-       vcc50_hdmi: vcc50-hdmi {
+       vcc50_hdmi: regulator-vcc50-hdmi {
                compatible = "regulator-fixed";
                regulator-name = "vcc50_hdmi";
                regulator-always-on;
@@ -101,7 +101,7 @@
                vin-supply = <&vcc_5v>;
        };
 
-       vdd_logic: vdd-logic {
+       vdd_logic: regulator-vdd-logic {
                compatible = "pwm-regulator";
                regulator-name = "vdd_logic";
 

diff --git a/arch/arm/boot/dts/rockchip/rk3288-vmarc-som.dtsi b/arch/arm/boot/dts/rockchip/rk3288-vmarc-som.dtsi
index 7939516..44a9efc 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-vmarc-som.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-vmarc-som.dtsi
@@ -11,7 +11,7 @@
 / {
        compatible = "vamrs,rk3288-vmarc-som", "rockchip,rk3288";
 
-       vccio_flash: vccio-flash-regulator {
+       vccio_flash: regulator-vccio-flash {
                compatible = "regulator-fixed";
                regulator-name = "vccio_flash";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm/boot/dts/rockchip/rk3288-vyasa.dts b/arch/arm/boot/dts/rockchip/rk3288-vyasa.dts
index b156a83..1954475 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3288-vyasa.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-vyasa.dts
@@ -19,7 +19,7 @@
                device_type = "memory";
        };
 
-       dc12_vbat: dc12-vbat {
+       dc12_vbat: regulator-dc12-vbat {
                compatible = "regulator-fixed";
                regulator-name = "dc12_vbat";
                regulator-min-microvolt = <12000000>;
@@ -28,7 +28,7 @@
                regulator-boot-on;
        };
 
-       vboot_3v3: vboot-3v3 {
+       vboot_3v3: regulator-vboot-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vboot_3v3";
                regulator-min-microvolt = <3300000>;
@@ -38,7 +38,7 @@
                vin-supply = <&dc12_vbat>;
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
                regulator-min-microvolt = <3700000>;
@@ -48,7 +48,7 @@
                vin-supply = <&dc12_vbat>;
        };
 
-       vboot_5v: vboot-5v {
+       vboot_5v: regulator-vboot-5v {
                compatible = "regulator-fixed";
                regulator-name = "vboot_sv";
                regulator-min-microvolt = <5000000>;
@@ -58,7 +58,7 @@
                vin-supply = <&dc12_vbat>;
        };
 
-       v3g_3v3: v3g-3v3 {
+       v3g_3v3: regulator-v3g-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "v3g_3v3";
                regulator-min-microvolt = <3300000>;
@@ -68,7 +68,7 @@
                vin-supply = <&dc12_vbat>;
        };
 
-       vsus_5v: vsus-5v {
+       vsus_5v: regulator-vsus-5v {
                compatible = "regulator-fixed";
                regulator-name = "vsus_5v";
                regulator-min-microvolt = <5000000>;
@@ -78,7 +78,7 @@
                vin-supply = <&vcc_io>;
        };
 
-       vcc50_hdmi: vcc50-hdmi {
+       vcc50_hdmi: regulator-vcc50-hdmi {
                compatible = "regulator-fixed";
                regulator-name = "vcc50_hdmi";
                enable-active-high;
@@ -90,7 +90,7 @@
                vin-supply = <&vsus_5v>;
        };
 
-       vusb1_5v: vusb1-5v {
+       vusb1_5v: regulator-vusb1-5v {
                compatible = "regulator-fixed";
                regulator-name = "vusb1_5v";
                enable-active-high;
@@ -102,7 +102,7 @@
                vin-supply = <&vsus_5v>;
        };
 
-       vusb2_5v: vusb2-5v {
+       vusb2_5v: regulator-vusb2-5v {
                compatible = "regulator-fixed";
                regulator-name = "vusb2_5v";
                enable-active-high;

diff --git a/arch/arm/boot/dts/rockchip/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/boot/dts/rockchip/rockchip-radxa-dalang-carrier.dtsi
index da1d548..cf5e2ed 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rockchip-radxa-dalang-carrier.dtsi
+++ b/arch/arm/boot/dts/rockchip/rockchip-radxa-dalang-carrier.dtsi
@@ -23,7 +23,7 @@
                pinctrl-0 = <&wifi_enable_h>;
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -32,7 +32,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;
@@ -42,7 +42,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       vbus_host: vbus-host {
+       vbus_host: regulator-vbus-host {
                compatible = "regulator-fixed";
                pinctrl-names = "default";
                pinctrl-0 = <&usb1_en_oc>;
@@ -51,7 +51,7 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vbus_typec: vbus-typec {
+       vbus_typec: regulator-vbus-typec {
                compatible = "regulator-fixed";
                pinctrl-names = "default";
                pinctrl-0 = <&usb0_en_oc>;

diff --git a/arch/arm/boot/dts/rockchip/rv1108-elgin-r1.dts b/arch/arm/boot/dts/rockchip/rv1108-elgin-r1.dts
index 89ca2f8..3c64f0c 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rv1108-elgin-r1.dts
+++ b/arch/arm/boot/dts/rockchip/rv1108-elgin-r1.dts
@@ -25,7 +25,7 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vsys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rv1108-evb.dts b/arch/arm/boot/dts/rockchip/rv1108-evb.dts
index ef150f4..0b04a83 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rv1108-evb.dts
+++ b/arch/arm/boot/dts/rockchip/rv1108-evb.dts
@@ -60,7 +60,7 @@
                pwms = <&pwm0 0 25000 0>;
        };
 
-       vcc_sys: vsys-regulator {
+       vcc_sys: regulator-vsys {
                compatible = "regulator-fixed";
                regulator-name = "vsys";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2-io.dts b/arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2-io.dts
index 7707d1b..d4e93d7 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2-io.dts
+++ b/arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2-io.dts
@@ -21,7 +21,7 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       vcc12v_dcin: vcc12v-dcin-regulator {
+       vcc12v_dcin: regulator-vcc12v-dcin {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
                regulator-always-on;
@@ -30,7 +30,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;
@@ -40,7 +40,7 @@
                vin-supply = <&vcc12v_dcin>;
        };
 
-       v3v3_sys: v3v3-sys-regulator {
+       v3v3_sys: regulator-v3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "v3v3_sys";
                regulator-always-on;

diff --git a/arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2.dtsi b/arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2.dtsi
index 7ea8d7d..5c1b60d 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2.dtsi
+++ b/arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2.dtsi
@@ -11,7 +11,7 @@
                mmc0 = &emmc;
        };
 
-       vccio_flash: vccio-flash-regulator {
+       vccio_flash: regulator-vccio-flash {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;