lantiq: cleanup dts files
authorMathias Kresin <dev@kresin.me>
Wed, 2 Nov 2016 18:49:04 +0000 (19:49 +0100)
committerMathias Kresin <dev@kresin.me>
Thu, 3 Nov 2016 18:00:28 +0000 (19:00 +0100)
- 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>
33 files changed:
target/linux/lantiq/dts/ARV4510PW.dts
target/linux/lantiq/dts/ARV4518PWR01.dts
target/linux/lantiq/dts/ARV4518PWR01.dtsi
target/linux/lantiq/dts/ARV4518PWR01A.dts
target/linux/lantiq/dts/ARV4520PW.dts
target/linux/lantiq/dts/ARV4525PW.dts
target/linux/lantiq/dts/ARV452CQW.dts
target/linux/lantiq/dts/ARV7518PW.dts
target/linux/lantiq/dts/ARV7519PW.dts
target/linux/lantiq/dts/ARV7519RW22.dts
target/linux/lantiq/dts/ARV7525PW.dts
target/linux/lantiq/dts/ARV752DPW.dts
target/linux/lantiq/dts/ARV752DPW22.dts
target/linux/lantiq/dts/ARV8539PW22.dts
target/linux/lantiq/dts/BTHOMEHUBV2B.dts
target/linux/lantiq/dts/BTHOMEHUBV3A.dts
target/linux/lantiq/dts/BTHOMEHUBV5A.dts
target/linux/lantiq/dts/DGN1000B.dts
target/linux/lantiq/dts/DGN3500.dtsi
target/linux/lantiq/dts/EASY50712.dts
target/linux/lantiq/dts/EASY50810.dts
target/linux/lantiq/dts/EASY80920.dtsi
target/linux/lantiq/dts/FRITZ7320.dts
target/linux/lantiq/dts/GIGASX76X.dts
target/linux/lantiq/dts/P2601HNFX.dts
target/linux/lantiq/dts/P2812HNUF1.dts
target/linux/lantiq/dts/P2812HNUFX.dtsi
target/linux/lantiq/dts/TDW89X0.dtsi
target/linux/lantiq/dts/VGV7510KW22.dtsi
target/linux/lantiq/dts/VGV7519.dtsi
target/linux/lantiq/dts/amazonse.dtsi
target/linux/lantiq/dts/danube.dtsi
target/linux/lantiq/dts/vr9.dtsi

index 68aae2b..6f07c5f 100644 (file)
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                        req-mask = <0x7>;
                };
-
        };
 
        gpio-keys-polled {
index 3642cbe..21a03dd 100644 (file)
@@ -4,12 +4,4 @@
 
 / {
        model = "ARV4518PWR01 - SMC7908A-ISP";
-
-       fpi@10000000 {
-
-               pci@E105400 {
-                       lantiq,internal-clock;
-               };
-
-       };
 };
index 3173144..49b7e50 100644 (file)
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                        req-mask = <0xf>;
                };
-
        };
 
        gpio-keys-polled {
index 6c5047c..e94076b 100644 (file)
@@ -6,10 +6,8 @@
        model = "ARV4518PWR01A - SMC7908A-ISP, Airties WAV-221";
 
        fpi@10000000 {
-
                pci@E105400 {
                        lantiq,external-clock;
                };
-
        };
 };
index 231ae15..17288b3 100644 (file)
 
                ifxhcd@E101000 {
                        status = "okay";
-                        gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
                };
 
                pci@E105400 {
                        lantiq,external-clock;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
-
        };
 
 // gpiomm 10 - switch
index 3813b07..69fd1aa 100644 (file)
                        status = "okay";
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
-
        };
 
 /*
index eb9b45a..4710a01 100644 (file)
                        lantiq,external-clock;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
-
        };
 
 /*
                };
                voice {
                        label = "arv452cqw:blue:sprache";
-                       gpios = <&gpiomm 4  1>;
+                       gpios = <&gpiomm 4 1>;
                };
                usb: usb {
                        label = "arv452cqw:blue:usb";
index e5e5e70..d44927b 100644 (file)
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                        req-mask = <0xf>;
                };
-
        };
 
 /*
index 4639ce7..9c29c8c 100644 (file)
        ralink_eep {
                compatible = "ralink,eeprom";
                ralink,eeprom = "RT2860.eeprom";
-        };
+       };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
index 5d78448..3d08b93 100644 (file)
                pcie@d900000 {
                        status = "disabled";
                };
-
-               pci@E105400 {
-                       status = "disabled";
-                       compatible = "lantiq,pci-xway";
-               };
        };
 
        gphy-xrx200 {
index 8e36733..aeba079 100644 (file)
                pci@E105400 {
                        status = "okay";
                        interrupt-map = <0x7000 0 0 1 &icu0 135 1>;
-                       req-mask = <0x1>;
                };
-
        };
 
        gpio-keys-polled {
index b800055..d6de881 100644 (file)
                        interrupt-map = <0x7000 0 0 1 &icu0 135>;
                        req-mask = <0x3>;
                };
-
        };
 
        ralink_eep {
index 9977ec1..0b0fddb 100644 (file)
                        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 {
index a03b745..5728993 100644 (file)
@@ -72,7 +72,6 @@
                                ath,mac-increment = <1>;
                                ath,pci-slot = <14>;
                                ath,eep-endian;
-                               ath,arv-ath9k-fix;
                        };
                };
 
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                        lantiq,portmask = <0x3>;
                };
-
        };
 
        gpio-keys-polled {
index 7a0edae..502132e 100644 (file)
        };
 
        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>;
                                };
                        };
 
-
                        ath9k_eep {
                                compatible = "ath9k,eeprom";
                                ath,eep-flash = <&ath9k_cal 0x0000>;
                };
 
                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";
                };
 
                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 {
 
                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>;
                };
        };
 };
index 996d5b2..e3a252b 100644 (file)
        };
 
        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>;
                };
 
                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";
                        status = "okay";
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
-
        };
 
        gpio-keys-polled {
                };
        };
 };
-
index 62d28fa..c2fe11a 100644 (file)
@@ -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";
 
                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>;
                };
        };
index fdcce1b..a63199f 100644 (file)
                                };
                        };
                };
+
                ifxhcd@E101000 {
                        status = "okay";
                };
index 983d854..c7d0b2d 100644 (file)
@@ -62,7 +62,6 @@
 
                etop@E180000 {
                        phy-mode = "mii";
-                       mac-address = [ 00 11 22 33 44 55 ];
                };
 
                ifxhcd@E101000 {
 
                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 */
                };
        };
 
                        label = "dgn3500:red:power";
                        gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
-        /*
+               /*
                        power amber is missing
                */
                wifi: wifi {
index a751375..28fc66b 100644 (file)
        };
 
        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>;
                };
 
                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";
                };
 
                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 */
                };
-
        };
 };
index f04796c..44e08ca 100644 (file)
        };
 
        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>;
                };
 
                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";
                };
 
                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 {
                        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 */
-               };
-
        };
 };
index c643bf1..bce8d5e 100644 (file)
        };
 
        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";
                        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 {
index 9884038..e1e70be 100644 (file)
@@ -96,7 +96,6 @@
 
                etop@E180000 {
                        phy-mode = "mii";
-                       mac-address = [ 00 11 22 33 44 55 ];
                };
 
                ifxhcd@E101000 {
                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 */
                };
        };
 
index 003083c..6507157 100644 (file)
@@ -89,9 +89,7 @@
 
                pci@E105400 {
                        status = "okay";
-                       lantiq,internal-clock;
                        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x1>;
                };
        };
 
index 3994c18..250de38 100644 (file)
        };
 
        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>;
                };
 
                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";
                        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 {
index 5829ee5..53ffbdd 100644 (file)
@@ -44,6 +44,7 @@
                                };
                        };
                };
+
                pcie@d900000 {
                        status = "disabled";
                };
index be3d73d..f0dfe98 100644 (file)
                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";
 
                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 */
                };
        };
 
index 0f070ef..fd37352 100644 (file)
                compatible = "gpio-leds";
                /*
                        power is not controllable via gpio
-        */
+               */
                dsl: dsl {
                        label = "tdw89x0:green:dsl";
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
index 88ceabe..181e852 100644 (file)
 
                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 {
index 2ed253c..31b429b 100644 (file)
@@ -2,7 +2,7 @@
 
 / {
 
-    model = "VGV7519 - KPN Experiabox V8";
+       model = "VGV7519 - KPN Experiabox V8";
 
        chosen {
                bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
 
                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 {
index 84a3a9a..520f0e0 100644 (file)
@@ -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";
                };
 
index ea40970..39f2865 100644 (file)
                                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 */
                };
        };
 
index 1a50d0e..5478e1a 100644 (file)
                        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 {
                };
 
                pci0: pci@E105400 {
+                       status = "disabled";
+
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
                                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 */
                };
        };