Merge tag 'zonefs-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / amlogic / meson-g12a-sei510.dts

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>;