apm821xx: dts overhaul

 - remove stray #address-cells / #size-cells

 - fix partition unit-addresses in wd-mybooklive.dts

 - remove index from MBL's gpio node name

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

diff --git a/target/linux/apm821xx/dts/apm82181.dtsi b/target/linux/apm821xx/dts/apm82181.dtsi
index 45d4eac171c10cb8ff9a2a8ad50101582b07749b..65032ba217919c7084091301619fc99d5c66b62f 100644 (file)
--- a/target/linux/apm821xx/dts/apm82181.dtsi
+++ b/target/linux/apm821xx/dts/apm82181.dtsi
@@ -253,8 +253,6 @@
                                        reg = <00000003 00000000 00002000>;
                                        ccr = <0x00001000>;
                                        bank-settings = <0x80002222>;
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
                                        status = "disabled";
 
                                        nand {

diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index a66eba7efaedd7ac359eb0a7d67efffe61298ba0..cb7c095dbb95b5ce36b587843ec37a0cdf0c739c 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -50,9 +50,6 @@
                status = "okay";
                /* 32 MiB NAND Flash */
                nand {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
                        partition@0 {
                                label = "u-boot";
                                reg = <0x00000000 0x00150000>;

diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
index 62a77a62c03e6d17e092aec7e1ecd0d1ba32c4f2..fc3213e92ccbb219173585d38480c5e5ae7f29fd 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@@ -53,9 +53,6 @@
        ndfc@1,0 {
                status = "okay";
                nand {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
                        partition@0 {
                                label = "u-boot";
                                reg = <0x00000000 0x00100000>;
@@ -161,8 +158,6 @@
 
        keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <60>;   /* 3 * 20 = 60ms */
                autorepeat;
 

diff --git a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
index 04611aad1ecc3a1e941575cf8b072f2327ff00c4..d591070368b5a235a1bdc2dbd3389e6723cc389e 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
+++ b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
@@ -39,9 +39,6 @@
                status = "okay";
                /* 32 MiB SLC NAND Flash */
                nand {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
                        partition@0 {
                                label = "u-boot";
                                reg = <0x00000000 0x00100000>;
@@ -127,8 +124,6 @@
 &POB0 {
        keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                #interrupt-cells = <2>;
                poll-interval = <60>;   /* 3 * 20 = 60ms */
                autorepeat;

diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
index 3fbcfaebbc08bb6048265fc3d6544196f07a9874..14f6762110f5715a2f3d831b21a19abed06c60c9 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndr4700.dts
+++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts
@@ -157,9 +157,6 @@
                status = "okay";
                /* 128 MiB Nand Flash */
                nand {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
                        partition0,0@0 {
                                label = "NAND 128MiB 3,3V 8-bit";
                                reg = <0x00000000 0x08000000>;
@@ -310,8 +307,6 @@
 &POB0 {
        keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                #interrupt-cells = <2>;
                autorepeat;
                poll-interval = <60>;   /* 3 * 20 = 60ms */

diff --git a/target/linux/apm821xx/dts/wd-mybooklive.dts b/target/linux/apm821xx/dts/wd-mybooklive.dts
index db27e1778d9c34f90c2bb97b0684d73817bc59dd..6cba7d2f26dd05c7d41edfcd5a45acc52f82e03c 100644 (file)
--- a/target/linux/apm821xx/dts/wd-mybooklive.dts
+++ b/target/linux/apm821xx/dts/wd-mybooklive.dts
@@ -40,19 +40,19 @@
                                reg = <0x00000000 0x0001e000>;
                        };
 
-                       partition@1 {
+                       partition@1e000 {
                                label = "env";
                                reg = <0x0001e000 0x00002000>;
                        };
 
-                       partition@2 {
+                       partition@20000 {
                                label = "uboot";
                                reg = <0x00020000 0x00050000>;
                        };
                };
        };
 
-       GPIO1: gpio1@e0000000 {
+       GPIO1: gpio@e0000000 {
                compatible = "wd,mbl-gpio", "ti,74273";
                reg-names = "dat";
                reg = <0xe0000000 0x1>;
@@ -77,7 +77,7 @@
                };
        };
 
-       GPIO2: gpio2@e0100000 {
+       GPIO2: gpio@e0100000 {
                compatible = "wd,mbl-gpio", "ti,74244";
                reg-names = "dat";
                reg = <0xe0100000 0x1>;
@@ -109,8 +109,6 @@
 
        keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <60>;   /* 3 * 20 = 60ms */
                autorepeat;