lantiq: cleanup dts files

- remove not existing properties
- remove properties having the same values as the included dtsi
- remove nodes which are disabled in the included dtsi and not enabled
  in dts
- replace the deprecated pinctrl-* compatible strings
- use the same labels for nodes as the included dtsi
- move common used vr9 pci properties to vr9.dtsi
- remove the unused stp node from HomeHub 2B devcie tree source file
- fix spaces vs. tabs and remove superfluous linebreaks

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

diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/dts/ARV4510PW.dts
index 68aae2b246309efa29fa83b7e59e114e17a5dfe4..6f07c5f996e5d923953976ce9c68d6223c2d2bf3 100644 (file)
--- a/target/linux/lantiq/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/dts/ARV4510PW.dts
@@ -134,7 +134,6 @@
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                        req-mask = <0x7>;
                };
-
        };
 
        gpio-keys-polled {

diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dts b/target/linux/lantiq/dts/ARV4518PWR01.dts
index 3642cbe44bb6b585047be2e2aff8088bcb65cd65..21a03dde484a06ec79b0f047c73f219ad48d03ec 100644 (file)
--- a/target/linux/lantiq/dts/ARV4518PWR01.dts
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dts
@@ -4,12 +4,4 @@
 
 / {
        model = "ARV4518PWR01 - SMC7908A-ISP";
-
-       fpi@10000000 {
-
-               pci@E105400 {
-                       lantiq,internal-clock;
-               };
-
-       };
 };

diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
index 31731444d9fc70f2fa2d55c8ddac98feb9a7191e..49b7e50eb61ae722b3de18d362587793efd834a6 100644 (file)
--- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
@@ -125,7 +125,6 @@
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                        req-mask = <0xf>;
                };
-
        };
 
        gpio-keys-polled {

diff --git a/target/linux/lantiq/dts/ARV4518PWR01A.dts b/target/linux/lantiq/dts/ARV4518PWR01A.dts
index 6c5047ceb44b7d6935d4790d6077b3ba1293987c..e94076b43da782a3bcb4ef8222380f4f8d33bfa2 100644 (file)
--- a/target/linux/lantiq/dts/ARV4518PWR01A.dts
+++ b/target/linux/lantiq/dts/ARV4518PWR01A.dts
@@ -6,10 +6,8 @@
        model = "ARV4518PWR01A - SMC7908A-ISP, Airties WAV-221";
 
        fpi@10000000 {
-
                pci@E105400 {
                        lantiq,external-clock;
                };
-
        };
 };

diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/dts/ARV4520PW.dts
index 231ae156f598fc964585f836d60d1964cef5570b..17288b35273f058bf52c107afca9a65651bf15a3 100644 (file)
--- a/target/linux/lantiq/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/dts/ARV4520PW.dts
@@ -118,7 +118,7 @@
 
                ifxhcd@E101000 {
                        status = "okay";
-                        gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
                };
 
                pci@E105400 {
@@ -126,7 +126,6 @@
                        lantiq,external-clock;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
-
        };
 
 // gpiomm 10 - switch

diff --git a/target/linux/lantiq/dts/ARV4525PW.dts b/target/linux/lantiq/dts/ARV4525PW.dts
index 3813b07539dbb67597378e1cf5b9c5498e720fa7..69fd1aa29d0bf9269fd6077ef162e71577f20f4d 100644 (file)
--- a/target/linux/lantiq/dts/ARV4525PW.dts
+++ b/target/linux/lantiq/dts/ARV4525PW.dts
@@ -111,7 +111,6 @@
                        status = "okay";
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
-
        };
 
 /*

diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts
index eb9b45a626cfc8d51478d04b171627c4d6476ebf..4710a0148680ab918efe834c0c442149500a5ca1 100644 (file)
--- a/target/linux/lantiq/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/dts/ARV452CQW.dts
@@ -135,7 +135,6 @@
                        lantiq,external-clock;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
-
        };
 
 /*
@@ -209,7 +208,7 @@
                };
                voice {
                        label = "arv452cqw:blue:sprache";
-                       gpios = <&gpiomm 4  1>;
+                       gpios = <&gpiomm 4 1>;
                };
                usb: usb {
                        label = "arv452cqw:blue:usb";

diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/dts/ARV7518PW.dts
index e5e5e703965644a564cf34480ee1baba95ad1bfb..d44927b813e88a97caea51ba8963a79a87685ac6 100644 (file)
--- a/target/linux/lantiq/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/dts/ARV7518PW.dts
@@ -144,7 +144,6 @@
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                        req-mask = <0xf>;
                };
-
        };
 
 /*

diff --git a/target/linux/lantiq/dts/ARV7519PW.dts b/target/linux/lantiq/dts/ARV7519PW.dts
index 4639ce7967f6fd75e4d7427f3a122cfcb1ef534c..9c29c8c9c93773e341dcb79f66cf709d24b05c66 100644 (file)
--- a/target/linux/lantiq/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/dts/ARV7519PW.dts
@@ -125,7 +125,7 @@
        ralink_eep {
                compatible = "ralink,eeprom";
                ralink,eeprom = "RT2860.eeprom";
-        };
+       };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";

diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts
index 5d78448eb6b4ac2c3ca3c21dbac2821434b81b67..3d08b9384059ae2ce2bbbd89b9802f634b886739 100644 (file)
--- a/target/linux/lantiq/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/dts/ARV7519RW22.dts
@@ -91,11 +91,6 @@
                pcie@d900000 {
                        status = "disabled";
                };
-
-               pci@E105400 {
-                       status = "disabled";
-                       compatible = "lantiq,pci-xway";
-               };
        };
 
        gphy-xrx200 {

diff --git a/target/linux/lantiq/dts/ARV7525PW.dts b/target/linux/lantiq/dts/ARV7525PW.dts
index 8e3673346de04a86676ef809b2a64a1f2acdb264..aeba079a48dce4f23500dcc0c95f07c9698a8f44 100644 (file)
--- a/target/linux/lantiq/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/dts/ARV7525PW.dts
@@ -100,9 +100,7 @@
                pci@E105400 {
                        status = "okay";
                        interrupt-map = <0x7000 0 0 1 &icu0 135 1>;
-                       req-mask = <0x1>;
                };
-
        };
 
        gpio-keys-polled {

diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts
index b80005582ed286b8ce2cf9a8f51d87c2281e92cd..d6de881faeb7fe5631cd8c1378b231e7785137e1 100644 (file)
--- a/target/linux/lantiq/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/dts/ARV752DPW.dts
@@ -143,7 +143,6 @@
                        interrupt-map = <0x7000 0 0 1 &icu0 135>;
                        req-mask = <0x3>;
                };
-
        };
 
        ralink_eep {

diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts
index 9977ec1ddb1bb06ca09b582b98edab264c339a02..0b0fddbd8277b3fe6208b2eef2f38d4104a9a23d 100644 (file)
--- a/target/linux/lantiq/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/dts/ARV752DPW22.dts
@@ -139,15 +139,14 @@
                        status = "okay";
                        lantiq,external-clock;
                        interrupt-map = <
-                                0x7000 0 0 1 &icu0 30
-                               0x7800 0 0 1 &icu0 135
-                               0x7800 0 0 2 &icu0 135
-                               0x7800 0 0 3 &icu0 135
+                               0x7000 0 0 1 &icu0 30
+                               0x7800 0 0 1 &icu0 135
+                               0x7800 0 0 2 &icu0 135
+                               0x7800 0 0 3 &icu0 135
                        >;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                        req-mask = <0x3>;
                };
-
        };
 
        ralink_eep {

diff --git a/target/linux/lantiq/dts/ARV8539PW22.dts b/target/linux/lantiq/dts/ARV8539PW22.dts
index a03b745a07463d6ff2d91b20fc69afca22787298..5728993017cef1d974c2f61dc82ba4bb213cb6ec 100644 (file)
--- a/target/linux/lantiq/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/dts/ARV8539PW22.dts
@@ -72,7 +72,6 @@
                                ath,mac-increment = <1>;
                                ath,pci-slot = <14>;
                                ath,eep-endian;
-                               ath,arv-ath9k-fix;
                        };
                };
 
@@ -120,7 +119,6 @@
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                        lantiq,portmask = <0x3>;
                };
-
        };
 
        gpio-keys-polled {

diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
index 7a0edaeecf0031c197edd1217f83ca5b2ec0039f..502132e4e9cec22c2401258f1182ee3fb03f1b7a 100644 (file)
--- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
@@ -30,15 +30,7 @@
        };
 
        fpi@10000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                localbus@0 {
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-                       ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
-                               1 0 0x4000000 0x4000010>; /* addsel1 */
-                       compatible = "lantiq,localbus", "simple-bus";
-
                        nor-boot@0 {                            /* NOR Flash: Spansion S29AL004D 512KB */
                                compatible = "lantiq,nor";      /* "AMD AM29LV400BB" compatible on 3.3.8 */
                                lantiq,cs = <0>;
@@ -111,7 +103,6 @@
                                };
                        };
 
-
                        ath9k_eep {
                                compatible = "ath9k,eeprom";
                                ath,eep-flash = <&ath9k_cal 0x0000>;
@@ -122,22 +113,10 @@
                };
 
                gpio: pinmux@E100B10 {
-                       compatible = "lantiq,pinctrl-xway";
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
 
-                       #gpio-cells = <2>;
-                       gpio-controller;
-                       reg = <0xE100B10 0xA0>;
-
                        state_default: pinmux {
-                               stp {
-                                       lantiq,groups = "stp";
-                                       lantiq,function = "stp";
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
                                nand_out {
                                        lantiq,groups = "nand cle", "nand ale";
                                        lantiq,function = "ebu";
@@ -186,38 +165,21 @@
                };
 
                etop@E180000 {
-                       compatible = "lantiq,etop-xway";
-                       reg = <0xE180000 0x40000>;
-                       interrupt-parent = <&icu0>;
-                       interrupts = <73 78>;
                        phy-mode = "rmii";
-                       mac-address = [ 00 11 22 33 44 55 ];
                };
 
                ifxhcd@E101000 {
                        status = "okay";
                };
 
-               stp0: stp@E100BB0 {
+               gpios: stp@E100BB0 {
                        status = "okay";
-                       #gpio-cells = <2>;
-                       compatible = "lantiq,gpio-stp-xway";
-                       gpio-controller;
-                       reg = <0xE100BB0 0x40>;
-
-                       lantiq,shadow = <0xfff>;
-                       lantiq,groups = <0x3>;
                };
 
                pci@E105400 {
                        status = "okay";
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;                /* GNT1 */
                };
-
        };
 
        gpio-keys-polled {
@@ -248,52 +210,52 @@
 
                upgrading-orange {
                        label = "bthomehubv2b:orange:upgrading";
-                       gpios = <&stp0 5 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 5 GPIO_ACTIVE_HIGH>;
                };
 
                phone-orange {
                        label = "bthomehubv2b:orange:phone";
-                       gpios = <&stp0 6 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 6 GPIO_ACTIVE_HIGH>;
                };
                phone-blue {
                        label = "bthomehubv2b:blue:phone";
-                       gpios = <&stp0 7 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
                };
 
                wireless-orange {
                        label = "bthomehubv2b:orange:wireless";
-                       gpios = <&stp0 8 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
                };
                wireless_blue: wireless-blue {
                        label = "bthomehubv2b:blue:wireless";
-                       gpios = <&stp0 9 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
                };
 
                broadband-red {
                        label = "bthomehubv2b:red:broadband";
-                       gpios = <&stp0 10 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 10 GPIO_ACTIVE_HIGH>;
                };
                broadband-orange {
                        label = "bthomehubv2b:orange:broadband";
-                       gpios = <&stp0 11 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 11 GPIO_ACTIVE_HIGH>;
                };
                broadband_blue: broadband-blue {
                        label = "bthomehubv2b:blue:broadband";
-                       gpios = <&stp0 12 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 12 GPIO_ACTIVE_HIGH>;
                };
 
                power_red: power-red {
                        label = "bthomehubv2b:red:power";
-                       gpios = <&stp0 13 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 13 GPIO_ACTIVE_HIGH>;
                };
                power_orange: power-orange {
                        label = "bthomehubv2b:orange:power";
-                       gpios = <&stp0 14 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 14 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
                power_blue: power-blue {
                        label = "bthomehubv2b:blue:power";
-                       gpios = <&stp0 15 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpios 15 GPIO_ACTIVE_HIGH>;
                };
        };
 };

diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
index 996d5b2abff792ecbde79f637996646a9624ef54..e3a252bfc411a5ad70bfc4d5c1123d0c55915556 100644 (file)
--- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
@@ -30,15 +30,7 @@
        };
 
        fpi@10000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                localbus@0 {
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-                       ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
-                               1 0 0x4000000 0x4000010>; /* addsel1 */
-                       compatible = "lantiq,localbus", "simple-bus";
-
                        nand-parts@0 {            /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
                                compatible = "gen_nand", "lantiq,nand-xway";
                                lantiq,cs = <1>;
@@ -91,14 +83,9 @@
                };
 
                gpio: pinmux@E100B10 {
-                       compatible = "lantiq,pinctrl-xr9";
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
 
-                       #gpio-cells = <2>;
-                       gpio-controller;
-                       reg = <0xE100B10 0xA0>;
-
                        state_default: pinmux {
                                nand_out {
                                        lantiq,groups = "nand cle", "nand ale";
@@ -150,7 +137,6 @@
                        status = "okay";
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
-
        };
 
        gpio-keys-polled {
@@ -219,4 +205,3 @@
                };
        };
 };
-

diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
index 62d28fa712fabdbbf8085ba847807c73a13e4cf0..c2fe11a59e3abc0e990aadca2b293d634430bacf 100644 (file)
--- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
@@ -67,9 +67,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
 
-                       interrupt-parent = <&icu0>;
-                       interrupts = <166 135 66 40 41 42 38>;
-
                        state_default: pinmux {
                                mdio {
                                        lantiq,groups = "mdio";
@@ -115,9 +112,6 @@
 
                pci@E105400 {
                        status = "okay";
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/lantiq/dts/DGN1000B.dts b/target/linux/lantiq/dts/DGN1000B.dts
index fdcce1bb34d0dd5163431b3ba8576349328cf130..a63199f4f55af097f6d92d8e8838dba3c6df6b9e 100644 (file)
--- a/target/linux/lantiq/dts/DGN1000B.dts
+++ b/target/linux/lantiq/dts/DGN1000B.dts
@@ -104,6 +104,7 @@
                                };
                        };
                };
+
                ifxhcd@E101000 {
                        status = "okay";
                };

diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi
index 983d8545044103dd6e21145316f92dd7fb957c78..c7d0b2d30ccb29c6327410522ff6e78b457f4586 100644 (file)
--- a/target/linux/lantiq/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/dts/DGN3500.dtsi
@@ -62,7 +62,6 @@
 
                etop@E180000 {
                        phy-mode = "mii";
-                       mac-address = [ 00 11 22 33 44 55 ];
                };
 
                ifxhcd@E101000 {
@@ -71,12 +70,7 @@
 
                pci@E105400 {
                        status = "okay";
-
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>; /* GNT1 */
                };
        };
 
@@ -143,7 +137,7 @@
                        label = "dgn3500:red:power";
                        gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
-        /*
+               /*
                        power amber is missing
                */
                wifi: wifi {

diff --git a/target/linux/lantiq/dts/EASY50712.dts b/target/linux/lantiq/dts/EASY50712.dts
index a751375c2a74a0e7549c61c1a7d682a9d9de9a7e..28fc66b98351f2363d3b7d7d765bb7b9dd683d2f 100644 (file)
--- a/target/linux/lantiq/dts/EASY50712.dts
+++ b/target/linux/lantiq/dts/EASY50712.dts
@@ -12,15 +12,7 @@
        };
 
        fpi@10000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                localbus@0 {
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-                       ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
-                               1 0 0x4000000 0x4000010>; /* addsel1 */
-                       compatible = "lantiq,localbus", "simple-bus";
-
                        nor-boot@0 {
                                compatible = "lantiq,nor";
                                bank-width = <2>;
@@ -57,14 +49,9 @@
                };
 
                gpio: pinmux@E100B10 {
-                       compatible = "lantiq,pinctrl-xway";
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
 
-                       #gpio-cells = <2>;
-                       gpio-controller;
-                       reg = <0xE100B10 0xA0>;
-
                        state_default: pinmux {
                                stp {
                                        lantiq,groups = "stp";
@@ -87,33 +74,7 @@
                };
 
                etop@E180000 {
-                       compatible = "lantiq,etop-xway";
-                       reg = <0xE180000 0x40000>;
-                       interrupt-parent = <&icu0>;
-                       interrupts = <73 78>;
                        phy-mode = "rmii";
-                       mac-address = [ 00 11 22 33 44 55 ];
-               };
-
-               stp0: stp@E100BB0 {
-                       #gpio-cells = <2>;
-                       compatible = "lantiq,gpio-stp-xway";
-                       gpio-controller;
-                       reg = <0xE100BB0 0x40>;
-
-                       lantiq,shadow = <0xfff>;
-                       lantiq,groups = <0x3>;
-               };
-
-               pci@E105400 {
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <
-                                0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
-                       >;
-                       gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;               /* GNT1 */
                };
-
        };
 };

diff --git a/target/linux/lantiq/dts/EASY50810.dts b/target/linux/lantiq/dts/EASY50810.dts
index f04796c73a177c8aa0609bb3fbfb5d2e88c77af0..44e08cac983401a7378dc9e667641e7ac3a84a38 100644 (file)
--- a/target/linux/lantiq/dts/EASY50810.dts
+++ b/target/linux/lantiq/dts/EASY50810.dts
@@ -12,15 +12,7 @@
        };
 
        fpi@10000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                localbus@0 {
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-                       ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
-                               1 0 0x4000000 0x4000010>; /* addsel1 */
-                       compatible = "lantiq,localbus", "simple-bus";
-
                        nor-boot@0 {
                                compatible = "lantiq,nor";
                                bank-width = <2>;
@@ -57,14 +49,9 @@
                };
 
                gpio: pinmux@E100B10 {
-                       compatible = "lantiq,pinctrl-xr9";
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
 
-                       #gpio-cells = <2>;
-                       gpio-controller;
-                       reg = <0xE100B10 0xA0>;
-
                        state_default: pinmux {
                                stp {
                                        lantiq,groups = "stp";
@@ -87,13 +74,7 @@
                };
 
                etop@E180000 {
-                       compatible = "lantiq,etop-xway";
-                       reg = <0xE180000 0x40000
-                               0xE108000 0x200>;
-                       interrupt-parent = <&icu0>;
-                       interrupts = <72 73>;
                        phy-mode = "rmii";
-                       mac-address = [ 00 11 22 33 44 55 ];
                };
 
                stp0: stp@E100BB0 {
@@ -105,16 +86,5 @@
                        lantiq,shadow = <0xfff>;
                        lantiq,groups = <0x3>;
                };
-
-               pci@E105400 {
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <
-                                0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
-                       >;
-                       gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;               /* GNT1 */
-               };
-
        };
 };

diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index c643bf1c23b5a8f444158d9d72d35625b9958816..bce8d5e2657b917cbe975de39b15b761cade3cfc 100644 (file)
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -19,31 +19,10 @@
        };
 
        fpi@10000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "lantiq,fpi", "simple-bus";
-               ranges = <0x0 0x10000000 0xEEFFFFF>;
-               reg = <0x10000000 0xEF00000>;
-
-               localbus@0 {
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-                       compatible = "lantiq,localbus", "simple-bus";
-
-               };
-
                gpio: pinmux@E100B10 {
-                       compatible = "lantiq,pinctrl-xr9";
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
 
-                       interrupt-parent = <&icu0>;
-                       interrupts = <166 135 66 40 41 42 38>;
-
-                       #gpio-cells = <2>;
-                       gpio-controller;
-                       reg = <0xE100B10 0xA0>;
-
                        state_default: pinmux {
                                exin3 {
                                        lantiq,groups = "exin3";
@@ -119,28 +98,6 @@
                        gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
                        lantiq,portmask = <0x3>;
                };
-
-               pci@E105400 {
-                       #address-cells = <3>;
-                       #size-cells = <2>;
-                       #interrupt-cells = <1>;
-                       compatible = "lantiq,pci-xway1";
-                       bus-range = <0x0 0x0>;
-                       ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000   /* pci memory */
-                               0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */
-                       reg = <0x7000000 0x8000         /* config space */
-                               0xE105400 0x400>;       /* pci bridge */
-                       lantiq,bus-clock = <33333333>;
-                       /*lantiq,external-clock;*/
-                       lantiq,delay-hi = <0>; /* 0ns delay */
-                       lantiq,delay-lo = <0>; /* 0.0ns delay */
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <
-                               0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
-                               >;
-                       gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;       /* GNT1 */
-               };
        };
 
        gphy-xrx200 {

diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/dts/FRITZ7320.dts
index 9884038867bbc5bd3f5fa366ef0c2bbff7d3aaaa..e1e70bef6c43b0c934f20b3ea9382bae5c45f3da 100644 (file)
--- a/target/linux/lantiq/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/dts/FRITZ7320.dts
@@ -96,7 +96,6 @@
 
                etop@E180000 {
                        phy-mode = "mii";
-                       mac-address = [ 00 11 22 33 44 55 ];
                };
 
                ifxhcd@E101000 {
@@ -106,11 +105,7 @@
                pci@E105400 {
                        status = "okay";
                        req-mask = <0xf>;
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0xf>; /* GNT1 */
                };
        };
 

diff --git a/target/linux/lantiq/dts/GIGASX76X.dts b/target/linux/lantiq/dts/GIGASX76X.dts
index 003083ca9f4a8265d99b4c1a88edab2d4be96893..6507157d986fc3d4af0e7cc9e494339ea6dfda19 100644 (file)
--- a/target/linux/lantiq/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/dts/GIGASX76X.dts
@@ -89,9 +89,7 @@
 
                pci@E105400 {
                        status = "okay";
-                       lantiq,internal-clock;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;
                };
        };
 

diff --git a/target/linux/lantiq/dts/P2601HNFX.dts b/target/linux/lantiq/dts/P2601HNFX.dts
index 3994c18cb7517ab154d9005a656701003b8d5037..250de38122e7a1e12ccb2417b45af0e59a59b5fa 100644 (file)
--- a/target/linux/lantiq/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/dts/P2601HNFX.dts
@@ -24,15 +24,7 @@
        };
 
        fpi@10000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                localbus@0 {
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-                       ranges = <0 0 0x0 0x3ffffff
-                                 1 0 0x4000000 0x4000010>;
-                       compatible = "lantiq,localbus", "simple-bus";
-
                        nor-boot@0 {
                                compatible = "lantiq,nor";
                                bank-width = <2>;
@@ -66,14 +58,9 @@
                };
 
                gpio: pinmux@E100B10 {
-                       compatible = "lantiq,pinctrl-xr9";
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
 
-                       #gpio-cells = <2>;
-                       gpio-controller;
-                       reg = <0xE100B10 0xA0>;
-
                        state_default: pinmux {
                                stp {
                                        lantiq,groups = "stp";
@@ -120,14 +107,6 @@
                        lantiq,shadow = <0xfff>;
                        lantiq,groups = <0x3>;
                };
-
-               pci@E105400 {
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <0x7000 0 0 1 &icu0 29 1>;
-                       gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;
-               };
        };
 
        gpio-keys-polled {

diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/dts/P2812HNUF1.dts
index 5829ee5262c8dd0f454a2f6938478bc892e48d97..53ffbdd56c724301031bf67aa6e63eec17b7368d 100644 (file)
--- a/target/linux/lantiq/dts/P2812HNUF1.dts
+++ b/target/linux/lantiq/dts/P2812HNUF1.dts
@@ -44,6 +44,7 @@
                                };
                        };
                };
+
                pcie@d900000 {
                        status = "disabled";
                };

diff --git a/target/linux/lantiq/dts/P2812HNUFX.dtsi b/target/linux/lantiq/dts/P2812HNUFX.dtsi
index be3d73d4fac03b6c8c235437d99d311641c98632..f0dfe98501869bb2cc55433469164804fb9a757a 100644 (file)
--- a/target/linux/lantiq/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi
@@ -19,33 +19,11 @@
                reg = <0x0 0x8000000>;
        };
 
-        fpi@10000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "lantiq,fpi", "simple-bus";
-               ranges = <0x0 0x10000000 0xEEFFFFF>;
-               reg = <0x10000000 0xEF00000>;
-
-               localbus@0 {
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-                       ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
-                               1 0 0x4000000 0x4000010>; /* addsel1 */
-                       compatible = "lantiq,localbus", "simple-bus";
-               };
-
+       fpi@10000000 {
                gpio: pinmux@E100B10 {
-                       compatible = "lantiq,pinctrl-xr9";
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
 
-                       interrupt-parent = <&icu0>;
-                       interrupts = <166 135 66 40 41 42 38>;
-
-                       #gpio-cells = <2>;
-                       gpio-controller;
-                       reg = <0xE100B10 0xA0>;
-
                        state_default: pinmux {
                                exin3 {
                                        lantiq,groups = "exin3";
@@ -143,25 +121,7 @@
 
                pci@E105400 {
                        status = "okay";
-                       #address-cells = <3>;
-                       #size-cells = <2>;
-                       #interrupt-cells = <1>;
-                       compatible = "lantiq,pci-xway";
-                       bus-range = <0x0 0x0>;
-                       ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000   /* pci memory */
-                               0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */
-                       reg = <0x7000000 0x8000         /* config space */
-                               0xE105400 0x400>;       /* pci bridge */
-                       lantiq,bus-clock = <33333333>;
-                       /*lantiq,external-clock;*/
-                       lantiq,delay-hi = <0>; /* 0ns delay */
-                       lantiq,delay-lo = <0>; /* 0.0ns delay */
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <
-                               0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
-                               >;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;       /* GNT1 */
                };
        };
 

diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi
index 0f070ef5e1ce2367813055916a501a0373dcce70..fd37352959df32ef1524f55faf09fbded1d42f22 100644 (file)
--- a/target/linux/lantiq/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/dts/TDW89X0.dtsi
@@ -120,7 +120,7 @@
                compatible = "gpio-leds";
                /*
                        power is not controllable via gpio
-        */
+               */
                dsl: dsl {
                        label = "tdw89x0:green:dsl";
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;

diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi
index 88ceabeb107f867405199e2f2966653035819fa8..181e852dee14565d9c0a994c76d0ac65596fbaa6 100644 (file)
--- a/target/linux/lantiq/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi
@@ -77,13 +77,7 @@
 
                pci@E105400 {
                        status = "okay";
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <
-                               0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
-                               >;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;       /* GNT1 */
                };
 
                pcie@d900000 {

diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi
index 2ed253c39c5a641d7391c83a0da37906c9f947b2..31b429ba0228bf2bc932fb5be9852367797781b9 100644 (file)
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -2,7 +2,7 @@
 
 / {
 
-    model = "VGV7519 - KPN Experiabox V8";
+       model = "VGV7519 - KPN Experiabox V8";
 
        chosen {
                bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
@@ -104,13 +104,7 @@
 
                pci@E105400 {
                        status = "okay";
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <
-                               0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
-                               >;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;       /* GNT1 */
                };
 
                pcie@d900000 {

diff --git a/target/linux/lantiq/dts/amazonse.dtsi b/target/linux/lantiq/dts/amazonse.dtsi
index 84a3a9a5970b35e027031cb6c8a02e7d8344cc43..520f0e0e852c2cdd3bbd9f7b4a0ca7ec2fb2ab02 100644 (file)
--- a/target/linux/lantiq/dts/amazonse.dtsi
+++ b/target/linux/lantiq/dts/amazonse.dtsi
@@ -90,7 +90,7 @@
                        compatible = "lantiq,gptu-xway";
                        reg = <0xE100A00 0x100>;
                        interrupt-parent = <&icu0>;
-                        interrupts = <97 98 99 100 101 102>;
+                       interrupts = <97 98 99 100 101 102>;
                        status = "disabled";
                };
 

diff --git a/target/linux/lantiq/dts/danube.dtsi b/target/linux/lantiq/dts/danube.dtsi
index ea40970f2147fdc2ddb3a8660d3b5a93bcea8f80..39f2865779b92c4cef98a34c78ac97b5d265fdd6 100644 (file)
--- a/target/linux/lantiq/dts/danube.dtsi
+++ b/target/linux/lantiq/dts/danube.dtsi
@@ -197,8 +197,8 @@
                                0xE105400 0x400>;       /* pci bridge */
                        lantiq,bus-clock = <33333333>;
                        interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
-                       req-mask = <0x1>;
+                       interrupt-map = <0x7000 0 0 1 &icu0 30 1>; /* slot 14, irq 30 */
+                       req-mask = <0x1>; /* GNT1 */
                };
        };
 

diff --git a/target/linux/lantiq/dts/vr9.dtsi b/target/linux/lantiq/dts/vr9.dtsi
index 1a50d0ebc811726674d7b137c89c5ba203b37723..5478e1a9df73df1960f961f9c8cd13043913ac85 100644 (file)
--- a/target/linux/lantiq/dts/vr9.dtsi
+++ b/target/linux/lantiq/dts/vr9.dtsi
@@ -116,7 +116,7 @@
                        compatible = "lantiq,gptu-xway";
                        reg = <0xE100A00 0x100>;
                        interrupt-parent = <&icu0>;
-                        interrupts = <126 127 128 129 130 131>;
+                       interrupts = <126 127 128 129 130 131>;
                };
 
                asc0: serial@E100400 {
@@ -219,6 +219,8 @@
                };
 
                pci0: pci@E105400 {
+                       status = "disabled";
+
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
@@ -228,7 +230,10 @@
                                0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */
                        reg = <0x7000000 0x8000         /* config space */
                                0xE105400 0x400>;       /* pci bridge */
-                       status = "disabled";
+                       lantiq,bus-clock = <33333333>;
+                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                       interrupt-map = <0x7000 0 0 1 &icu0 30 1>; /* slot 14, irq 30 */
+                       req-mask = <0x1>; /* GNT1 */
                };
        };