apm821xx: dts: Unify naming of gpio-led nodes

[oweals/openwrt.git] / target / linux / apm821xx / dts / meraki-mr24.dts

diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index e06d37cbbddbf727e5282fde054916a4e4d37f43..a66eba7efaedd7ac359eb0a7d67efffe61298ba0 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -27,9 +27,8 @@
        };
 
        chosen {
-               linux,stdout-path = "/plb/opb/serial@ef600400";
+               stdout-path = "/plb/opb/serial@ef600400";
        };
-
 };
 
 
@@ -56,7 +55,30 @@
 
                        partition@0 {
                                label = "u-boot";
-                               reg = <0x00000000 0x00170000>;
+                               reg = <0x00000000 0x00150000>;
+                               read-only;
+                       };
+
+                       partition@150000 {
+                               /*
+                                * The u-boot environment size is one NAND
+                                * block (16KiB). u-boot allocates four NAND
+                                * blocks (64KiB) in order to have spares
+                                * around for bad block management
+                                */
+                               label = "u-boot-env";
+                               reg = <0x00150000 0x00010000>;
+                               read-only;
+                       };
+
+                       partition@160000 {
+                               /*
+                                * redundant u-boot environment.
+                                * has to be kept it in sync with the
+                                * data in "u-boot-env".
+                                */
+                               label = "u-boot-env-redundant";
+                               reg = <0x00160000 0x00010000>;
                                read-only;
                        };
 
@@ -96,6 +118,9 @@
        phy-handle = <&phy>;
 
        mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                phy: phy@1 {
                        compatible = "ethernet-phy-ieee802.3-c22";
                        reg = <1>;
@@ -104,7 +129,7 @@
 };
 
 &POB0 {
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                status: power-green {
@@ -143,15 +168,16 @@
                };
        };
 
-       gpio_keys_polled {
+       keys {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
                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>;
                };