From: Christian Lamparter <chunkeey@gmail.com>
Date: Fri, 21 Sep 2018 22:38:39 +0000 (+0200)
Subject: apm821xx: fix dtc compiler warnings for MX60(W) and MR24's dts files
X-Git-Tag: v19.07.0-rc1~2465
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c417aee9f146f26cd12642138bc0cedf5950a59a;p=oweals%2Fopenwrt.git

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 63cb88b8f1..fc879fe8c1 100644
--- 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 881d9335a1..80b82e4ff0 100644
--- 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>;