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-sq201.dts

diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
index 63c02ca9513c408ee9a67e6d31f718722ea5cef6..e5cf9d1a98cd4f27da7e557c423acf57955bf1e2 100644 (file)
--- a/arch/arm/boot/dts/gemini-sq201.dts
+++ b/arch/arm/boot/dts/gemini-sq201.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,11 +26,9 @@
 
        gpio_keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@18 {
-                       debounce_interval = <50>;
+               button-setup {
+                       debounce-interval = <50>;
                        wakeup-source;
                        linux,code = <KEY_SETUP>;
                        label = "factory reset";
@@ -41,14 +39,14 @@
 
        leds {
                compatible = "gpio-leds";
-               led@20 {
+               led-green-info {
                        label = "sq201:green:info";
                        /* Conflict with parallel flash */
                        gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
-               led@31 {
+               led-green-usb {
                        label = "sq201:green:usb";
                        /* Conflict with parallel and NAND flash */
                        gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;