Merge tag 'mvebu-fixes-4.17-2' of git://git.infradead.org/linux-mvebu into fixes

[mirror_ubuntu-eoan-kernel.git] / arch / arm / boot / dts / gemini-rut1xx.dts

diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts
index a2f14ee3759920262d2c780cc5bb6cc97e4ec628..eb4f0bf074da368495b96c8a8f1b146cba812909 100644 (file)
--- a/arch/arm/boot/dts/gemini-rut1xx.dts
+++ b/arch/arm/boot/dts/gemini-rut1xx.dts
@@ -14,7 +14,7 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       memory { /* 128 MB */
+       memory@0 { /* 128 MB */
                device_type = "memory";
                reg = <0x00000000 0x8000000>;
        };
@@ -26,10 +26,8 @@
 
        gpio_keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@28 {
+               button-setup {
                        debounce-interval = <50>;
                        wakeup-source;
                        linux,code = <KEY_SETUP>;
@@ -41,14 +39,14 @@
 
        leds {
                compatible = "gpio-leds";
-               led@7 {
+               led-gsm {
                        /* FIXME: add the LED color */
                        label = "rut1xx::gsm";
                        /* Conflict with ICE */
                        gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
-               led@31 {
+               led-power {
                        /* FIXME: add the LED color */
                        label = "rut1xx::power";
                        /* Conflict with NAND CE0 */