apm821xx: fix dtc compiler warnings for MX60(W) and MR24's dts files

This patch fixes some of the dtc warnings:

MR24:
"reg" property in [...]mdio/phy@1 has invalid length (4 bytes)
Node [...]button@1 has a unit name, but no reg property
Relying on default #address-cells value for [...]phy@1
Relying on default #size-cells value for [...]phy@1

MX60(W):
Node [..]nand/all has a reg or ranges property, but no unit name
Node [..]button@1 has a unit name, but no reg property

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index 63cb88b8f1bf821daa937bf4effe43a04a3c2743..fc879fe8c1cdb4e85135c285ad8f0d34d2212a7f 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -95,6 +95,9 @@
        phy-handle = <&phy>;
 
        mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                phy: phy@1 {
                        compatible = "ethernet-phy-ieee802.3-c22";
                        reg = <1>;
@@ -149,8 +152,9 @@
                poll-interval = <60>;   /* 3 * 20 = 60ms */
                autorepeat;
 
-               button@1 {
-                       label = "Reset button";
+               reset {
+                       /* Label as per Meraki's "MR24 Installation Guide" */
+                       label = "Factory Reset Button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&GPIO0 16 GPIO_ACTIVE_LOW>;
                };

diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
index 881d9335a1eb5a7e0ae874fc5384aaea8b98b49b..80b82e4ff0f5448e38662b8e401015bd83ce2469 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@@ -77,11 +77,6 @@
                                label = "ubi";
                                reg = <0x00240000 0x3fdc0000>;
                        };
-
-                       all {
-                               label = "all";
-                               reg = <0x00000000 0x40000000>;
-                       };
                };
        };
 };
@@ -171,7 +166,7 @@
                poll-interval = <60>;   /* 3 * 20 = 60ms */
                autorepeat;
 
-               button@1 {
+               reset {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&GPIO0 16 GPIO_ACTIVE_LOW>;