lantiq: dts: move localbus childs to dts

The localbus childs are highly board specific and need to be part of the
board dts. Otherwise we run into duplicate unit address issues if a
board has something else (NAND) connected to the bus id.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
index 6d9f974bffbc5d7e59363df90aded2d63bd63427..3998f1f13f586f1c8658c607b5d70d33f3214c39 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
@@ -135,11 +135,6 @@
        };
 };
 
-&gpiomm {
-       status = "okay";
-       lantiq,shadow = <0x0>;
-};
-
 &gsw {
        phy-mode = "mii";
        mtd-mac-address = <&boardconfig 0x16>;
@@ -180,6 +175,16 @@
                        };
                };
        };
+
+       gpiomm: gpiomm@1 {
+               compatible = "lantiq,gpio-mm";
+               reg = <1 0x0 0x10 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               lantiq,shadow = <0x0>;
+       };
 };
 
 &pci0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts
index 8f50ee27e2aa59ed42aeaa35ef1651cfb20c4a88..d7263eb104f205f7cdf757a4acd0cb3c016b878e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts
@@ -132,11 +132,6 @@
        };
 };
 
-&gpiomm {
-       status = "okay";
-       lantiq,shadow = <0x400>;
-};
-
 &gsw {
        phy-mode = "mii";
        mtd-mac-address = <&boardconfig 0x16>;
@@ -176,6 +171,16 @@
                        };
                };
        };
+
+       gpiomm: gpiomm@1 {
+               compatible = "lantiq,gpio-mm";
+               reg = <1 0x0 0x10 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               lantiq,shadow = <0x400>;
+       };
 };
 
 &pci0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
index ad5d65a1e63b3c5ccc1c9ba6d4631557f06a9f04..275abdd0aa6cb33e927a722fba0900bd555a9d0e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
@@ -155,11 +155,6 @@
        };
 };
 
-&gpiomm {
-       status = "okay";
-       lantiq,shadow = <0x400>;
-};
-
 &gsw {
        /* gpiomm 10 - switch */
        phy-mode = "rmii";
@@ -201,6 +196,16 @@
                        };
                };
        };
+
+       gpiomm: gpiomm@1 {
+               compatible = "lantiq,gpio-mm";
+               reg = <1 0x0 0x10 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               lantiq,shadow = <0x400>;
+       };
 };
 
 &pci0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
index 2dcf42ff6203e9c2c1b1f75a55e685ef93cdd5fb..64bde23383b3b186c3dcc616efea2871ab05831e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
@@ -171,11 +171,6 @@
        };
 };
 
-&gpiomm {
-       status = "okay";
-       lantiq,shadow = <0x77f>;
-};
-
 /*
 #define ARV452CPW_SWITCH_RESET          110
 */
@@ -219,6 +214,16 @@
                        };
                };
        };
+
+       gpiomm: gpiomm@1 {
+               compatible = "lantiq,gpio-mm";
+               reg = <1 0x0 0x10 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               lantiq,shadow = <0x77f>;
+       };
 };
 
 &pci0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
index b8ab0282e606a7e83329f172a926f172fa9a220a..9459fe0072a1bb79c715f708dab6a684958118da 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
@@ -159,11 +159,6 @@
        };
 };
 
-&gpiomm {
-       status = "okay";
-       lantiq,shadow = <0x0>;
-};
-
 /*
 #define SWITCH_RESET          13
 */
@@ -206,6 +201,16 @@
                        };
                };
        };
+
+       gpiomm: gpiomm@1 {
+               compatible = "lantiq,gpio-mm";
+               reg = <1 0x0 0x10 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               lantiq,shadow = <0x0>;
+       };
 };
 
 &pci0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
index c4ca4b4e1a2b7f5b5fc9985a530ac89dbd6e13a6..c66df234fb1835c928519517a2b835d0fefe4d08 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
@@ -166,11 +166,6 @@
        };
 };
 
-&gpiomm {
-       status = "okay";
-       lantiq,shadow = <0x3>;
-};
-
 &gsw {
        phy-mode = "rmii";
        mtd-mac-address = <&boardconfig 0x16>;
@@ -211,6 +206,16 @@
                        };
                };
        };
+
+       gpiomm: gpiomm@1 {
+               compatible = "lantiq,gpio-mm";
+               reg = <1 0x0 0x10 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               lantiq,shadow = <0x3>;
+       };
 };
 
 &pci0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
index 8e1d5248b81508d0ad009292b7e353b0e4e5ff51..f809bcb19dfda09645cf7887d791db3e7cde7628 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
@@ -181,12 +181,6 @@
        };
 };
 
-
-&gpiomm {
-       status = "okay";
-       lantiq,shadow = <3>;
-};
-
 &gsw {
        phy-mode = "mii";
        mtd-mac-address = <&boardconfig 0x16>;
@@ -227,6 +221,16 @@
                        };
                };
        };
+
+       gpiomm: gpiomm@1 {
+               compatible = "lantiq,gpio-mm";
+               reg = <1 0x0 0x10 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               lantiq,shadow = <3>;
+       };
 };
 
 &pci0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
index aeadb2fceb56b3267b6dc21a8d3138b68061757b..794dc76a5dbc519a5e53c8863676bd8bded50f6d 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
@@ -64,12 +64,6 @@
        };
 };
 
-
-&gpiomm {
-       status = "okay";
-       lantiq,shadow = <0x3>;
-};
-
 &gpios {
        status = "okay";
 };
@@ -105,6 +99,16 @@
                        };
                };
        };
+
+       gpiomm: gpiomm@1 {
+               compatible = "lantiq,gpio-mm";
+               reg = <1 0x0 0x10 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               lantiq,shadow = <0x3>;
+       };
 };
 
 &pci0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
index e1d8a393354fdd3899d3cbafd228d7a2ef431f37..cadfb807502f90b76710ede8e39e9134e25310a1 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
@@ -130,16 +130,6 @@
                        ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
                                1 0 0x4000000 0x4000010>; /* addsel1 */
                        compatible = "lantiq,localbus", "simple-bus";
-
-                       gpiomm: gpiomm@1 {
-                               compatible = "lantiq,gpio-mm";
-                               reg = <1 0x0 0x10 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               status = "disabled";
-                       };
                };
 
                gptu@e100a00 {