arm64: dts: amlogic: replace underscores in node names

Underscores should not be used in node names (dtc with W=2 warns about
them), so replace them with hyphens.

Cc: Marc Gonzalez <mgonzalez@freebox.fr>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240213143217.336341-1-krzysztof.kozlowski@linaro.org
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
index 1c20516fa653a8a0994d604258bf2db54b80b882..4bc30af0584875d8961b3ae8bde280e375e92322 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
@@ -106,7 +106,7 @@
        pinctrl-0 = <&spifc_pins>;
        pinctrl-names = "default";
 
-       spi_nand@0 {
+       flash@0 {
                compatible = "spi-nand";
                status = "okay";
                reg = <0>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
index 55802fb03a46fe9425dabd613c89b81fb9301b66..9b65ae818e2f29335a551529c15fdc46be18dce7 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
@@ -35,7 +35,7 @@
                reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -44,7 +44,7 @@
                regulator-always-on;
        };
 
-       vcc_5v: regulator-vcc_5v {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "VCC5V";
                regulator-min-microvolt = <5000000>;
@@ -52,7 +52,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
@@ -61,7 +61,7 @@
                regulator-always-on;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
@@ -70,7 +70,7 @@
                regulator-always-on;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <3300000>;
@@ -79,7 +79,7 @@
                regulator-always-on;
        };
 
-       vccq_1v8: regulator-vccq_1v8 {
+       vccq_1v8: regulator-vccq-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VCCQ_1V8";
                regulator-min-microvolt = <1800000>;
@@ -88,7 +88,7 @@
                regulator-always-on;
        };
 
-       usb_pwr: regulator-usb_pwr {
+       usb_pwr: regulator-usb-pwr {
                compatible = "regulator-fixed";
                regulator-name = "USB_PWR";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index c8905663bc754176c43295b3810dae81c0c9a36c..7ed526f45175f607f4fe871e3aad088c2b8218c8 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -12,7 +12,7 @@
        compatible = "amlogic,s400", "amlogic,a113d", "amlogic,meson-axg";
        model = "Amlogic Meson AXG S400 Development Board";
 
-       adc_keys {
+       keys {
                compatible = "adc-keys";
                io-channels = <&saradc 0>;
                io-channel-names = "buttons";
@@ -111,7 +111,7 @@
                reg = <0x0 0x0 0x0 0x40000000>;
        };
 
-       main_12v: regulator-main_12v {
+       main_12v: regulator-main-12v {
                compatible = "regulator-fixed";
                regulator-name = "12V";
                regulator-min-microvolt = <12000000>;
@@ -119,7 +119,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -128,7 +128,7 @@
                regulator-always-on;
        };
 
-       vcc_5v: regulator-vcc_5v {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "VCC5V";
                regulator-min-microvolt = <5000000>;
@@ -139,7 +139,7 @@
                enable-active-high;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
@@ -148,7 +148,7 @@
                regulator-always-on;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
@@ -157,7 +157,7 @@
                regulator-always-on;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
@@ -166,7 +166,7 @@
                regulator-always-on;
        };
 
-       usb_pwr: regulator-usb_pwr {
+       usb_pwr: regulator-usb-pwr {
                compatible = "regulator-fixed";
                regulator-name = "USB_PWR";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
index fcd7e1d8e16ff2bdf601da9f582d9104065b54ee..15b9bc28070617d02ae92e998d644f8c0921b817 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
@@ -60,7 +60,7 @@
                clock-names = "ext_clock";
        };
 
-       ao_5v: regulator-ao_5v {
+       ao_5v: regulator-ao-5v {
                compatible = "regulator-fixed";
                regulator-name = "AO_5V";
                regulator-min-microvolt = <5000000>;
@@ -68,7 +68,7 @@
                regulator-always-on;
        };
 
-       vcc_1v8: regulator-vcc_1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -77,7 +77,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -86,7 +86,7 @@
                regulator-always-on;
        };
 
-       hdmi_pw: regulator-hdmi_pw {
+       hdmi_pw: regulator-hdmi-pw {
                compatible = "regulator-fixed";
                regulator-name = "HDMI_PW";
                regulator-min-microvolt = <5000000>;
@@ -95,7 +95,7 @@
                regulator-always-on;
        };
 
-       vddao_1v8: regulator-vddao_1v8 {
+       vddao_1v8: regulator-vddao-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_1V8";
                regulator-min-microvolt = <1800000>;
@@ -104,7 +104,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
index 4c4550dd47112796ffe04ef6c41f928c4d797f49..61cb8135a392554169e9b6512965648fccd58270 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
@@ -15,7 +15,7 @@
        compatible = "seirobotics,sei510", "amlogic,g12a";
        model = "SEI Robotics SEI510";
 
-       adc_keys {
+       keys {
                compatible = "adc-keys";
                io-channels = <&saradc 0>;
                io-channel-names = "buttons";
@@ -83,7 +83,7 @@
                reg = <0x0 0x0 0x0 0x40000000>;
        };
 
-       ao_5v: regulator-ao_5v {
+       ao_5v: regulator-ao-5v {
                compatible = "regulator-fixed";
                regulator-name = "AO_5V";
                regulator-min-microvolt = <5000000>;
@@ -92,7 +92,7 @@
                regulator-always-on;
        };
 
-       dc_in: regulator-dc_in {
+       dc_in: regulator-dc-in {
                compatible = "regulator-fixed";
                regulator-name = "DC_IN";
                regulator-min-microvolt = <5000000>;
@@ -100,7 +100,7 @@
                regulator-always-on;
        };
 
-       emmc_1v8: regulator-emmc_1v8 {
+       emmc_1v8: regulator-emmc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "EMMC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -109,7 +109,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
@@ -118,7 +118,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3_t: regultor-vddao_3v3_t {
+       vddao_3v3_t: regulator-vddao-3v3-t {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3_T";
                regulator-min-microvolt = <3300000>;
@@ -147,7 +147,7 @@
                regulator-always-on;
        };
 
-       vddio_ao1v8: regulator-vddio_ao1v8 {
+       vddio_ao1v8: regulator-vddio-ao1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO1V8";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
index 8355ddd7e9ae0f591d84735677034eb2cc26d80a..3da7922d83f1bc34d0e01ed5c2fff3bc9c77c650 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
@@ -75,7 +75,7 @@
                reg = <0x0 0x0 0x0 0x40000000>;
        };
 
-       flash_1v8: regulator-flash_1v8 {
+       flash_1v8: regulator-flash-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "FLASH_1V8";
                regulator-min-microvolt = <1800000>;
@@ -84,7 +84,7 @@
                regulator-always-on;
        };
 
-       main_12v: regulator-main_12v {
+       main_12v: regulator-main-12v {
                compatible = "regulator-fixed";
                regulator-name = "12V";
                regulator-min-microvolt = <12000000>;
@@ -92,7 +92,7 @@
                regulator-always-on;
        };
 
-       usb_pwr_en: regulator-usb_pwr_en {
+       usb_pwr_en: regulator-usb-pwr-en {
                compatible = "regulator-fixed";
                regulator-name = "USB_PWR_EN";
                regulator-min-microvolt = <5000000>;
@@ -103,7 +103,7 @@
                enable-active-high;
        };
 
-       vcc_1v8: regulator-vcc_1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -112,7 +112,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -122,7 +122,7 @@
                /* FIXME: actually controlled by VDDCPU_B_EN */
        };
 
-       vcc_5v: regulator-vcc_5v {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "VCC_5V";
                regulator-min-microvolt = <5000000>;
@@ -133,7 +133,7 @@
                enable-active-high;
        };
 
-       vddao_1v8: regulator-vddao_1v8 {
+       vddao_1v8: regulator-vddao-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_1V8";
                regulator-min-microvolt = <1800000>;
@@ -142,7 +142,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
index 9b55982b6a6bbd106978b560c38c87259297a28d..05c7a1e3f1b71afe923f1ae83ad072e2e9c4f3e4 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
@@ -66,7 +66,7 @@
                clock-names = "ext_clock";
        };
 
-       flash_1v8: regulator-flash_1v8 {
+       flash_1v8: regulator-flash-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "FLASH_1V8";
                regulator-min-microvolt = <1800000>;
@@ -75,7 +75,7 @@
                regulator-always-on;
        };
 
-       dc_in: regulator-dc_in {
+       dc_in: regulator-dc-in {
                compatible = "regulator-fixed";
                regulator-name = "DC_IN";
                regulator-min-microvolt = <5000000>;
@@ -83,7 +83,7 @@
                regulator-always-on;
        };
 
-       vcc_1v8: regulator-vcc_1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -92,7 +92,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -102,7 +102,7 @@
                /* FIXME: actually controlled by VDDCPU_B_EN */
        };
 
-       vcc_5v: regulator-vcc_5v {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "VCC_5V";
                regulator-min-microvolt = <5000000>;
@@ -112,7 +112,7 @@
                gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
        };
 
-       vddao_1v8: regulator-vddao_1v8 {
+       vddao_1v8: regulator-vddao-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_1V8";
                regulator-min-microvolt = <1800000>;
@@ -121,7 +121,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
index 91c9769fda20108bfecf2a60ef30b2c34a9826b6..d80dd9a3da316ab083c508ae6222d181d28c2b0d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -19,7 +19,7 @@
                status = "okay";
        };
 
-       hub_5v: regulator-hub_5v {
+       hub_5v: regulator-hub-5v {
                compatible = "regulator-fixed";
                regulator-name = "HUB_5V";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
index 9e12a34b2840b8dfaada9226e718c3ccaeb89cd4..09d959aefb1843d8513881815b7127c1a5bfcfc6 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
@@ -48,7 +48,7 @@
                };
        };
 
-       tflash_vdd: regulator-tflash_vdd {
+       tflash_vdd: regulator-tflash-vdd {
                compatible = "regulator-fixed";
 
                regulator-name = "TFLASH_VDD";
@@ -60,7 +60,7 @@
                regulator-always-on;
        };
 
-       tf_io: gpio-regulator-tf_io {
+       tf_io: gpio-regulator-tf-io {
                compatible = "regulator-gpio";
 
                regulator-name = "TF_IO";
@@ -74,7 +74,7 @@
                         <1800000 1>;
        };
 
-       flash_1v8: regulator-flash_1v8 {
+       flash_1v8: regulator-flash-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "FLASH_1V8";
                regulator-min-microvolt = <1800000>;
@@ -83,7 +83,7 @@
                regulator-always-on;
        };
 
-       main_12v: regulator-main_12v {
+       main_12v: regulator-main-12v {
                compatible = "regulator-fixed";
                regulator-name = "12V";
                regulator-min-microvolt = <12000000>;
@@ -91,7 +91,7 @@
                regulator-always-on;
        };
 
-       usb_pwr_en: regulator-usb_pwr_en {
+       usb_pwr_en: regulator-usb-pwr-en {
                compatible = "regulator-fixed";
                regulator-name = "USB_PWR_EN";
                regulator-min-microvolt = <5000000>;
@@ -103,7 +103,7 @@
                enable-active-high;
        };
 
-       vcc_5v: regulator-vcc_5v {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "5V";
                regulator-min-microvolt = <5000000>;
@@ -114,7 +114,7 @@
                enable-active-high;
        };
 
-       vcc_1v8: regulator-vcc_1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -123,7 +123,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -171,7 +171,7 @@
                regulator-always-on;
        };
 
-       vddao_1v8: regulator-vddao_1v8 {
+       vddao_1v8: regulator-vddao-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_1V8";
                regulator-min-microvolt = <1800000>;
@@ -180,7 +180,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
index ac8b7178257e06779bd628aa4489d77153209e4e..4cb6930ffb19620de9eef45029cfa43b08640a30 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
@@ -39,7 +39,7 @@
                clock-names = "ext_clock";
        };
 
-       flash_1v8: regulator-flash_1v8 {
+       flash_1v8: regulator-flash-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "FLASH_1V8";
                regulator-min-microvolt = <1800000>;
@@ -48,7 +48,7 @@
                regulator-always-on;
        };
 
-       main_12v: regulator-main_12v {
+       main_12v: regulator-main-12v {
                compatible = "regulator-fixed";
                regulator-name = "12V";
                regulator-min-microvolt = <12000000>;
@@ -56,7 +56,7 @@
                regulator-always-on;
        };
 
-       vcc_5v: regulator-vcc_5v {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "VCC_5V";
                regulator-min-microvolt = <5000000>;
@@ -67,7 +67,7 @@
                enable-active-high;
        };
 
-       vcc_1v8: regulator-vcc_1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -76,7 +76,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
index 5e7b9273b06243ded245bcfdea85ba65fe13ca8a..efd662a452e8812398133cf00fa6ed6a9adef459 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
@@ -84,7 +84,7 @@
                reg = <0x0 0x0 0x0 0x80000000>;
        };
 
-       ao_5v: regulator-ao_5v {
+       ao_5v: regulator-ao-5v {
                compatible = "regulator-fixed";
                regulator-name = "AO_5V";
                regulator-min-microvolt = <5000000>;
@@ -93,7 +93,7 @@
                regulator-always-on;
        };
 
-       dc_in: regulator-dc_in {
+       dc_in: regulator-dc-in {
                compatible = "regulator-fixed";
                regulator-name = "DC_IN";
                regulator-min-microvolt = <5000000>;
@@ -120,7 +120,7 @@
                };
        };
 
-       vcc_card: regulator-vcc_card {
+       vcc_card: regulator-vcc-card {
                compatible = "regulator-fixed";
                regulator-name = "VCC_CARD";
                regulator-min-microvolt = <3300000>;
@@ -141,7 +141,7 @@
                gpio = <&gpio GPIOH_3 GPIO_OPEN_DRAIN>;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
@@ -150,7 +150,7 @@
                regulator-always-on;
        };
 
-       vddio_ao3v3: regulator-vddio_ao3v3 {
+       vddio_ao3v3: regulator-vddio-ao3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO3V3";
                regulator-min-microvolt = <3300000>;
@@ -159,7 +159,7 @@
                regulator-always-on;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
index e59c3c92b1e7c6a660c2221954cf1277b47a69cf..08d6b69ba469183d432da40ff6cccec78f20326b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@ -50,28 +50,28 @@
                regulator-always-on;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
index 4aab1ab705b4967973f7f52f197649b8efd4065a..cca129ce2c5834af7adda219963d7a59f459df94 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
@@ -78,21 +78,21 @@
                         <3300000 1>;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index e6d2de7c45a9d7bd1b5ddcd0aff5921a2ad7f83f..c431986e6a3314d663473352a055a72eb692b68f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -67,7 +67,7 @@
                regulator-always-on;
        };
 
-       hdmi_p5v0: regulator-hdmi_p5v0 {
+       hdmi_p5v0: regulator-hdmi-p5v0 {
                compatible = "regulator-fixed";
                regulator-name = "HDMI_P5V0";
                regulator-min-microvolt = <5000000>;
@@ -76,7 +76,7 @@
                vin-supply = <&p5v0>;
        };
 
-       tflash_vdd: regulator-tflash_vdd {
+       tflash_vdd: regulator-tflash-vdd {
                compatible = "regulator-fixed";
 
                regulator-name = "TFLASH_VDD";
@@ -92,7 +92,7 @@
                vin-supply = <&vddio_ao3v3>;
        };
 
-       tf_io: gpio-regulator-tf_io {
+       tf_io: gpio-regulator-tf-io {
                compatible = "regulator-gpio";
 
                regulator-name = "TF_IO";
@@ -148,7 +148,7 @@
                vin-supply = <&p5v0>;
        };
 
-       ddr3_1v5: regulator-ddr3_1v5 {
+       ddr3_1v5: regulator-ddr3-1v5 {
                compatible = "regulator-fixed";
                regulator-name = "DDR3_1V5";
                regulator-min-microvolt = <1500000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
index 591455c50e8866b4579cf417bc05c3d940d25626..7f94716876d39f593f2c3eb752f1bba15ea0c152 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
@@ -21,14 +21,14 @@
                sound-name-prefix = "DIT";
        };
 
-       avdd18_usb_adc: regulator-avdd18_usb_adc {
+       avdd18_usb_adc: regulator-avdd18-usb-adc {
                compatible = "regulator-fixed";
                regulator-name = "AVDD18_USB_ADC";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       adc_keys {
+       keys {
                compatible = "adc-keys";
                io-channels = <&saradc 0>;
                io-channel-names = "buttons";

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index e803a466fe4ebb15c160c480790749c46c419cbf..52d57773a77fa8f54955f45d01355cd6feea6283 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -53,21 +53,21 @@
                regulator-settling-time-down-us = <150000>;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 74df32534231897f61aab3cc5ab88d96e3235573..255e93a0b36d9ea5fba47ed5b57429132134c95a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -47,28 +47,28 @@
                enable-active-high;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
index 94dafb955301b19b976d7c09b2dcf831489ad873..deb295227189d29c78e9bb929bbb4a94822c5fc7 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
@@ -49,21 +49,21 @@
                enable-active-high;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
@@ -71,7 +71,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
index a29b49f051ae6bf2ba940cd8bb408a89f763e9db..90ef9c17d80bac172843c7de5900b69b66954e84 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
@@ -42,7 +42,7 @@
                };
        };
 
-       dc_5v: regulator-dc_5v {
+       dc_5v: regulator-dc-5v {
                compatible = "regulator-fixed";
                regulator-name = "DC_5V";
                regulator-min-microvolt = <5000000>;
@@ -89,7 +89,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -98,7 +98,7 @@
                regulator-always-on;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
@@ -107,7 +107,7 @@
                regulator-always-on;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
index c0d6eb55100af166fc2ff10ebb2de6c8353431db..08a4718219b10876a59376e6d4a902559450acf1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
@@ -64,28 +64,28 @@
                reg = <0x0 0x0 0x0 0x20000000>;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
index a18d6d241a5ad27646f946ed677de73778fc4111..2b94b6e5285e29934d6e29d292a3412ffbee1597 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
@@ -37,28 +37,28 @@
                stdout-path = "serial0:115200n8";
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
index c8d74e61dec182a5b4cfa54d87dc936cd72ce70f..89fe5110f7a2e7abfdf973bb774d38010f28f091 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
@@ -42,21 +42,21 @@
                         <3300000 1>;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
index 2825db91e46282f36398cca85d3505cd3651a993..63b20860067c0939c7b9a3a5d3def29412813dd9 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
@@ -67,7 +67,7 @@
                reg = <0x0 0x0 0x0 0x80000000>;
        };
 
-       ao_5v: regulator-ao_5v {
+       ao_5v: regulator-ao-5v {
                compatible = "regulator-fixed";
                regulator-name = "AO_5V";
                regulator-min-microvolt = <5000000>;
@@ -76,7 +76,7 @@
                regulator-always-on;
        };
 
-       dc_in: regulator-dc_in {
+       dc_in: regulator-dc-in {
                compatible = "regulator-fixed";
                regulator-name = "DC_IN";
                regulator-min-microvolt = <5000000>;
@@ -93,7 +93,7 @@
                regulator-always-on;
        };
 
-       vcc_card: regulator-vcc_card {
+       vcc_card: regulator-vcc-card {
                compatible = "regulator-fixed";
                regulator-name = "VCC_CARD";
                regulator-min-microvolt = <3300000>;
@@ -114,7 +114,7 @@
                gpio = <&gpio GPIOH_3 GPIO_OPEN_DRAIN>;
        };
 
-       vddio_ao3v3: regulator-vddio_ao3v3 {
+       vddio_ao3v3: regulator-vddio-ao3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO3V3";
                regulator-min-microvolt = <3300000>;
@@ -139,7 +139,7 @@
                regulator-settling-time-down-us = <50000>;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
@@ -148,7 +148,7 @@
                regulator-always-on;
        };
 
-       vcc_1v8: regulator-vcc_1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VCC 1V8";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index 27093e6ac9e2c7af3382fe6e6132c2bdba5b0d63..8b26c9661be1f6d00593b40b8ceb9ca4b8c8c2b6 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
@@ -93,7 +93,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -117,7 +117,7 @@
                regulator-settling-time-down-us = <50000>;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
@@ -125,7 +125,7 @@
        };
 
        /* This is provided by LDOs on the eMMC daugther card */
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
index f1acca5c443426544cff268c0fddb4a82c426aea..c79f9f2099bf8213102ccb0fb378cbd54dc52101 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
@@ -42,21 +42,21 @@
                         <3300000 1>;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
index a150cc0e18ff3b28721b7a6f9614fb7e34d8770a..7e7dc87ede2d2686e3b0dd3ca24af420fb53317d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
@@ -39,28 +39,28 @@
                regulator-always-on;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
index 860f307494c58498cad7603959f1ac557b435c5a..07e7c3bedea0084312f7916c4e1dee52926d6570 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
@@ -112,28 +112,28 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddio_boot: regulator-vddio_boot {
+       vddio_boot: regulator-vddio-boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts
index 4eda9f634c428d26b73b0a0d38912a8ec65097a3..a66f19851ac9a4e35c8a0a67d0228f7310685a1c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts
@@ -14,7 +14,7 @@
                     "amlogic,meson-gxm";
        model = "Libre Computer AML-S912-PC";
 
-       typec2_vbus: regulator-typec2_vbus {
+       typec2_vbus: regulator-typec2-vbus {
                compatible = "regulator-fixed";
                regulator-name = "TYPEC2_VBUS";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
index 514a6dd4b12406ca2e49f37093dca305007fdd51..e78cc9b577a0551bcfb7c1fe4fe7c25a6076c3c5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
@@ -80,7 +80,7 @@
                clock-names = "ext_clock";
        };
 
-       dc_in: regulator-dc_in {
+       dc_in: regulator-dc-in {
                compatible = "regulator-fixed";
                regulator-name = "DC_IN";
                regulator-min-microvolt = <5000000>;
@@ -88,7 +88,7 @@
                regulator-always-on;
        };
 
-       vcc_5v: regulator-vcc_5v {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "VCC_5V";
                regulator-min-microvolt = <5000000>;
@@ -99,7 +99,7 @@
                enable-active-high;
        };
 
-       vcc_1v8: regulator-vcc_1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -108,7 +108,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -118,7 +118,7 @@
                /* FIXME: actually controlled by VDDCPU_B_EN */
        };
 
-       vddao_1v8: regulator-vddao_1v8 {
+       vddao_1v8: regulator-vddao-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO1V8";
                regulator-min-microvolt = <1800000>;
@@ -127,7 +127,7 @@
                regulator-always-on;
        };
 
-       emmc_1v8: regulator-emmc_1v8 {
+       emmc_1v8: regulator-emmc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "EMMC_AO1V8";
                regulator-min-microvolt = <1800000>;
@@ -136,7 +136,7 @@
                regulator-always-on;
        };
 
-       vsys_3v3: regulator-vsys_3v3 {
+       vsys_3v3: regulator-vsys-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VSYS_3V3";
                regulator-min-microvolt = <3300000>;
@@ -145,7 +145,7 @@
                regulator-always-on;
        };
 
-       usb_pwr: regulator-usb_pwr {
+       usb_pwr: regulator-usb-pwr {
                compatible = "regulator-fixed";
                regulator-name = "USB_PWR";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi
index 35e8f5bae9901af81f2b9e3096b783b583471fac..082b72703cdf952cd46de3882c02ce5bab3929f3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi
@@ -150,7 +150,7 @@
                gpio-open-drain;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
@@ -171,7 +171,7 @@
                pwm-dutycycle-range = <100 0>;
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
+       vddio_ao18: regulator-vddio-ao18 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
@@ -180,7 +180,7 @@
                vin-supply = <&vddao_3v3>;
        };
 
-       vddio_c: regulator-vddio_c {
+       vddio_c: regulator-vddio-c {
                compatible = "regulator-gpio";
                regulator-name = "VDDIO_C";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
index 46a34731f7e2221822b430c885cd42e187017acf..d1fa8b8bf7959da7cdbe119ae379a90562741c9b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
@@ -54,7 +54,7 @@
                reg = <0x0 0x0 0x0 0x40000000>;
        };
 
-       ao_5v: regulator-ao_5v {
+       ao_5v: regulator-ao-5v {
                compatible = "regulator-fixed";
                regulator-name = "AO_5V";
                regulator-min-microvolt = <5000000>;
@@ -63,7 +63,7 @@
                regulator-always-on;
        };
 
-       dc_in: regulator-dc_in {
+       dc_in: regulator-dc-in {
                compatible = "regulator-fixed";
                regulator-name = "DC_IN";
                regulator-min-microvolt = <5000000>;
@@ -71,7 +71,7 @@
                regulator-always-on;
        };
 
-       emmc_1v8: regulator-emmc_1v8 {
+       emmc_1v8: regulator-emmc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "EMMC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -80,7 +80,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
@@ -105,7 +105,7 @@
                regulator-always-on;
        };
 
-       vddio_ao1v8: regulator-vddio_ao1v8 {
+       vddio_ao1v8: regulator-vddio-ao1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO1V8";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
index 62404743e62d1d1fb452d256bc951ea45f0881dd..81dce862902adeabaaf5a1007894bf9b4091eb5a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
@@ -82,7 +82,7 @@
                reg = <0x0 0x0 0x0 0x40000000>;
        };
 
-       emmc_1v8: regulator-emmc_1v8 {
+       emmc_1v8: regulator-emmc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "EMMC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -91,7 +91,7 @@
                regulator-always-on;
        };
 
-       dc_in: regulator-dc_in {
+       dc_in: regulator-dc-in {
                compatible = "regulator-fixed";
                regulator-name = "DC_IN";
                regulator-min-microvolt = <5000000>;
@@ -99,7 +99,7 @@
                regulator-always-on;
        };
 
-       vddio_c: regulator-vddio_c {
+       vddio_c: regulator-vddio-c {
                compatible = "regulator-gpio";
                regulator-name = "VDDIO_C";
                regulator-min-microvolt = <1800000>;
@@ -116,7 +116,7 @@
                         <3300000 1>;
        };
 
-       tflash_vdd: regulator-tflash_vdd {
+       tflash_vdd: regulator-tflash-vdd {
                compatible = "regulator-fixed";
                regulator-name = "TFLASH_VDD";
                regulator-min-microvolt = <3300000>;
@@ -127,7 +127,7 @@
                regulator-always-on;
        };
 
-       vddao_1v8: regulator-vddao_1v8 {
+       vddao_1v8: regulator-vddao-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_1V8";
                regulator-min-microvolt = <1800000>;
@@ -136,7 +136,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
@@ -165,7 +165,7 @@
        };
 
        /* USB Hub Power Enable */
-       vl_pwr_en: regulator-vl_pwr_en {
+       vl_pwr_en: regulator-vl-pwr-en {
                compatible = "regulator-fixed";
                regulator-name = "VL_PWR_EN";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
index 846a2d6c20e53b2155afb8580b6e9f81a754d01e..0170139b8d32f4274ad991b0f3d9a0f6c67969ce 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
@@ -43,7 +43,7 @@
        };
 
        /* Powers the SATA Disk 0 regulator, which is enabled when a disk load is detected */
-       p12v_0: regulator-p12v_0 {
+       p12v_0: regulator-p12v-0 {
                compatible = "regulator-fixed";
                regulator-name = "P12V_0";
                regulator-min-microvolt = <12000000>;
@@ -56,7 +56,7 @@
        };
 
        /* Powers the SATA Disk 1 regulator, which is enabled when a disk load is detected */
-       p12v_1: regulator-p12v_1 {
+       p12v_1: regulator-p12v-1 {
                compatible = "regulator-fixed";
                regulator-name = "P12V_1";
                regulator-min-microvolt = <12000000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
index 1db2327bbd13e72aa33d2b2357fda06461b2aac1..951eb8e3f0c0c92633adcc686801847affd5f040 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -28,7 +28,7 @@
                reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
        };
 
-       tflash_vdd: regulator-tflash_vdd {
+       tflash_vdd: regulator-tflash-vdd {
                compatible = "regulator-fixed";
 
                regulator-name = "TFLASH_VDD";
@@ -40,7 +40,7 @@
                regulator-always-on;
        };
 
-       tf_io: gpio-regulator-tf_io {
+       tf_io: gpio-regulator-tf-io {
                compatible = "regulator-gpio";
 
                regulator-name = "TF_IO";
@@ -59,7 +59,7 @@
                         <1800000 1>;
        };
 
-       flash_1v8: regulator-flash_1v8 {
+       flash_1v8: regulator-flash-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "FLASH_1V8";
                regulator-min-microvolt = <1800000>;
@@ -68,7 +68,7 @@
                regulator-always-on;
        };
 
-       main_12v: regulator-main_12v {
+       main_12v: regulator-main-12v {
                compatible = "regulator-fixed";
                regulator-name = "12V";
                regulator-min-microvolt = <12000000>;
@@ -76,7 +76,7 @@
                regulator-always-on;
        };
 
-       vcc_5v: regulator-vcc_5v {
+       vcc_5v: regulator-vcc-5v {
                compatible = "regulator-fixed";
                regulator-name = "5V";
                regulator-min-microvolt = <5000000>;
@@ -87,7 +87,7 @@
                enable-active-high;
        };
 
-       vcc_1v8: regulator-vcc_1v8 {
+       vcc_1v8: regulator-vcc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -96,7 +96,7 @@
                regulator-always-on;
        };
 
-       vcc_3v3: regulator-vcc_3v3 {
+       vcc_3v3: regulator-vcc-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
@@ -125,7 +125,7 @@
                regulator-always-on;
        };
 
-       usb_pwr_en: regulator-usb_pwr_en {
+       usb_pwr_en: regulator-usb-pwr-en {
                compatible = "regulator-fixed";
                regulator-name = "USB_PWR_EN";
                regulator-min-microvolt = <5000000>;
@@ -137,7 +137,7 @@
                enable-active-high;
        };
 
-       vddao_1v8: regulator-vddao_1v8 {
+       vddao_1v8: regulator-vddao-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_1V8";
                regulator-min-microvolt = <1800000>;
@@ -146,7 +146,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
index 109932068dbe6c0c7d12528ab632f1d3052e9d1b..3581e14cbf18db7dd80a99ee23ab614786ffa816 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
@@ -127,7 +127,7 @@
                reg = <0x0 0x0 0x0 0x40000000>;
        };
 
-       ao_5v: regulator-ao_5v {
+       ao_5v: regulator-ao-5v {
                compatible = "regulator-fixed";
                regulator-name = "AO_5V";
                regulator-min-microvolt = <5000000>;
@@ -136,7 +136,7 @@
                regulator-always-on;
        };
 
-       dc_in: regulator-dc_in {
+       dc_in: regulator-dc-in {
                compatible = "regulator-fixed";
                regulator-name = "DC_IN";
                regulator-min-microvolt = <5000000>;
@@ -144,7 +144,7 @@
                regulator-always-on;
        };
 
-       emmc_1v8: regulator-emmc_1v8 {
+       emmc_1v8: regulator-emmc-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "EMMC_1V8";
                regulator-min-microvolt = <1800000>;
@@ -153,7 +153,7 @@
                regulator-always-on;
        };
 
-       vddao_3v3: regulator-vddao_3v3 {
+       vddao_3v3: regulator-vddao-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
@@ -163,7 +163,7 @@
        };
 
        /* Used by Tuner, RGB Led & IR Emitter LED array */
-       vddao_3v3_t: regulator-vddao_3v3_t {
+       vddao_3v3_t: regulator-vddao-3v3-t {
                compatible = "regulator-fixed";
                regulator-name = "VDDAO_3V3_T";
                regulator-min-microvolt = <3300000>;
@@ -192,7 +192,7 @@
                regulator-always-on;
        };
 
-       vddio_ao1v8: regulator-vddio_ao1v8 {
+       vddio_ao1v8: regulator-vddio-ao1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_AO1V8";
                regulator-min-microvolt = <1800000>;