From: Mathias Kresin Date: Sun, 27 Jan 2019 15:34:33 +0000 (+0100) Subject: lantiq: dts: move localbus childs to dts X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fblogic.git;a=commitdiff_plain;h=3b215a01bbfa95f039da3599244c44c1ca64c2d7 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 --- 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 6d9f974bffbc..3998f1f13f58 100644 --- 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 8f50ee27e2aa..d7263eb104f2 100644 --- 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 ad5d65a1e63b..275abdd0aa6c 100644 --- 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 2dcf42ff6203..64bde23383b3 100644 --- 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 b8ab0282e606..9459fe0072a1 100644 --- 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 c4ca4b4e1a2b..c66df234fb18 100644 --- 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 8e1d5248b815..f809bcb19dfd 100644 --- 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 aeadb2fceb56..794dc76a5dbc 100644 --- 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 e1d8a393354f..cadfb807502f 100644 --- 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 {