ARM: dts: Fix DTC warnings

The DTC was warning a lot about unit names etc, I think I fixed
them all. Stopping to include skeleton.dtsi fixes the last one.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index 89ce0d1..fb5c954 100644 (file)
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -13,7 +13,7 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       memory {
+       memory@0 {
                /* 128 MB SDRAM in 2 x Hynix HY5DU121622DTP-D43 */
                device_type = "memory";
                reg = <0x00000000 0x8000000>;
@@ -26,8 +26,7 @@
 
        gpio_keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
+
                button-esc {
                        debounce-interval = <50>;
                        wakeup-source;

diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
index da78a0a..d132932 100644 (file)
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -15,7 +15,7 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       memory {
+       memory@0 {
                /* 64 MB SDRAM in a Nanya NT5DS32M16BS-6K package */
                device_type = "memory";
                reg = <0x00000000 0x4000000>;
@@ -32,8 +32,7 @@
 
        gpio_keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
+
                button-esc {
                        debounce-interval = <50>;
                        wakeup-source;

diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts
index b67078e..a407414 100644 (file)
--- a/arch/arm/boot/dts/gemini-nas4220b.dts
+++ b/arch/arm/boot/dts/gemini-nas4220b.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@29 {
+               button-setup {
                        debounce-interval = <50>;
                        wakeup-source;
                        linux,code = <KEY_SETUP>;
@@ -37,7 +35,7 @@
                        /* Conflict with TVC */
                        gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
                };
-               button@31 {
+               button-restart {
                        debounce-interval = <50>;
                        wakeup-source;
                        linux,code = <KEY_RESTART>;
@@ -49,13 +47,13 @@
 
        leds {
                compatible = "gpio-leds";
-               led@28 {
+               led-orange-hdd {
                        label = "nas4220b:orange:hdd";
                        /* Conflict with TVC */
                        gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
-               led@30 {
+               led-green-os {
                        label = "nas4220b:green:os";
                        /* Conflict with TVC */
                        gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts
index a2f14ee..eb4f0bf 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 */

diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
index 229c026..e5cf9d1 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,10 +26,8 @@
 
        gpio_keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@18 {
+               button-setup {
                        debounce-interval = <50>;
                        wakeup-source;
                        linux,code = <KEY_SETUP>;
@@ -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>;

diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts
index b31a918..29af86c 100644 (file)
--- a/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/arch/arm/boot/dts/gemini-wbd111.dts
@@ -14,7 +14,8 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       memory { /* 128 MB */
+       memory@0 {
+               /* 128 MB */
                device_type = "memory";
                reg = <0x00000000 0x8000000>;
        };
@@ -26,10 +27,8 @@
 
        gpio_keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@5 {
+               button-setup {
                        debounce-interval = <50>;
                        wakeup-source;
                        linux,code = <KEY_SETUP>;
@@ -42,25 +41,25 @@
        leds {
                compatible = "gpio-leds";
 
-               led@1 {
+               led-red-l3 {
                        label = "wbd111:red:L3";
                        /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
-               led@2 {
+               led-green-l4 {
                        label = "wbd111:green:L4";
                        /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
-               led@3 {
+               led-red-l4 {
                        label = "wbd111:red:L4";
                        /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
-               led@5 {
+               led-greeb-l3 {
                        label = "wbd111:green:L3";
                        /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts
index 0be867f..24e6ae3 100644 (file)
--- a/arch/arm/boot/dts/gemini-wbd222.dts
+++ b/arch/arm/boot/dts/gemini-wbd222.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@5 {
+               button-setup {
                        debounce-interval = <50>;
                        wakeup-source;
                        linux,code = <KEY_SETUP>;
@@ -42,25 +40,25 @@
        leds {
                compatible = "gpio-leds";
 
-               led@1 {
+               led-red-l3 {
                        label = "wbd111:red:L3";
                        /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
-               led@2 {
+               led-green-l4 {
                        label = "wbd111:green:L4";
                        /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
-               led@3 {
+               led-red-l4 {
                        label = "wbd111:red:L4";
                        /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
-               led@5 {
+               led-green-l3 {
                        label = "wbd111:green:L3";
                        /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi
index 0568bac..eb752e9 100644 (file)
--- a/arch/arm/boot/dts/gemini.dtsi
+++ b/arch/arm/boot/dts/gemini.dtsi
@@ -3,8 +3,6 @@
  * Device Tree file for Cortina systems Gemini SoC
  */
 
-/include/ "skeleton.dtsi"
-
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/clock/cortina,gemini-clock.h>
 #include <dt-bindings/reset/cortina,gemini-reset.h>