lantiq: kernel 4.14: cleanup dts files
authorMathias Kresin <dev@kresin.me>
Mon, 1 Jan 2018 16:58:30 +0000 (17:58 +0100)
committerMathias Kresin <dev@kresin.me>
Tue, 20 Feb 2018 18:25:17 +0000 (19:25 +0100)
Move common used parts to dtsi. Add labels to nodes and reference nodes
via labels in dts files.

Signed-off-by: Mathias Kresin <dev@kresin.me>
55 files changed:
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01A.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4525PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7506PW11.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7525PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ASL56026.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN1000B.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN3500.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/DM200.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50712.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50810.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NOR.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF1.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW8980.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VG3503J.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22BRN.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22NOR.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519BRN.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519NOR.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/amazonse.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ar9.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/danube.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi

index 7294720..2c69402 100644 (file)
        memory@0 {
                reg = <0x0 0x4000000>;
        };
+};
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+       state_default: pinmux {
+               exin {
+                       lantiq,groups = "exin1";
+                       lantiq,function = "exin";
+               };
+               pci {
+                       lantiq,groups = "gnt1", "req1";
+                       lantiq,function = "pci";
                };
        };
+};
+
+&gsw {
+       phy-mode = "rmii";
+};
 
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x0 0x20000>;
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               label = "uboot_env";
-                                               reg = <0x20000 0x20000>;
-                                       };
-
-                                       partition@40000 {
-                                               label = "boardconfig";
-                                               reg = <0x40000 0x60000>;
-                                               read-only;
-                                       };
-
-                                       partition@a0000 {
-                                               label = "firmware";
-                                               reg = <0xa0000 0xf20000>;
-                                       };
-
-                                       partition@fc0000 {
-                                               label = "sysconfig";
-                                               reg = <0xfc0000 0x40000>;
-                                       };
-
-                                       partition@0x1000000 {
-                                               label = "rootfs_data";
-                                               reg = <0x1000000 0x1000000>;
-                                       };
-                               };
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x0 0x20000>;
+                               read-only;
                        };
-               };
 
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               exin {
-                                       lantiq,groups = "exin1";
-                                       lantiq,function = "exin";
-                               };
-                               pci {
-                                       lantiq,groups = "gnt1", "req1";
-                                       lantiq,function = "pci";
-                               };
+                       partition@20000 {
+                               label = "uboot_env";
+                               reg = <0x20000 0x20000>;
                        };
-               };
 
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
-               };
+                       partition@40000 {
+                               label = "boardconfig";
+                               reg = <0x40000 0x60000>;
+                               read-only;
+                       };
 
-               etop@E180000 {
-                       phy-mode = "rmii";
-               };
+                       partition@a0000 {
+                               label = "firmware";
+                               reg = <0xa0000 0xf20000>;
+                       };
+
+                       partition@fc0000 {
+                               label = "sysconfig";
+                               reg = <0xfc0000 0x40000>;
+                       };
 
-               pci@E105400 {
-                       status = "okay";
+                       partition@0x1000000 {
+                               label = "rootfs_data";
+                               reg = <0x1000000 0x1000000>;
+                       };
                };
        };
 };
+
+&pci0 {
+       status = "okay";
+};
+
+&usb {
+       status = "okay";
+       gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
index 16c5fac..0d128e0 100644 (file)
                reg = <0x0 0x1000000>;
        };
 
-       fpi@b0000000 {
-               etop@E180000 {
-                       phy-mode = "mii";
-               };
-       };
-
-       fpi@10000000 {
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               asc {
-                                       lantiq,groups = "asc";
-                                       lantiq,function = "asc";
-                               };
-                               keys_in {
-                                       lantiq,pins = "io0",/* "io25", */"io29";
-                                       lantiq,pull = <2>;
-                                       lantiq,open-drain = <1>;
-                               };
-                       };
-               };
-
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x400000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@10000 {
-                                               label = "firmware";
-                                               reg = <0x10000 0x3ef200>;
-                                       };
-
-                                       partition@3ff200 {
-                                               label = "uboot_env";
-                                               reg = <0x3ff200 0xc00>;
-                                               read-only;
-                                       };
-
-                                       partition@3ffe00 {
-                                               label = "dummy_bits";
-                                               reg = <0x3ffe00 0x200>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               asc {
+                       lantiq,groups = "asc";
+                       lantiq,function = "asc";
+               };
+               keys_in {
+                       lantiq,pins = "io0",/* "io25", */"io29";
+                       lantiq,pull = <2>;
+                       lantiq,open-drain = <1>;
+               };
+       };
+};
+
+&gsw {
+       phy-mode = "mii";
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x400000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               label = "firmware";
+                               reg = <0x10000 0x3ef200>;
+                       };
+
+                       partition@3ff200 {
+                               label = "uboot_env";
+                               reg = <0x3ff200 0xc00>;
+                               read-only;
+                       };
+
+                       partition@3ffe00 {
+                               label = "dummy_bits";
+                               reg = <0x3ffe00 0x200>;
+                               read-only;
+                       };
+               };
+       };
+};
index 4720b57..0d0b70c 100644 (file)
@@ -19,8 +19,8 @@
 
                led-dsl = &adsl;
                led-internet = &internet;
-               led-usb = &usb;
-               led-usb2 = &usb2;
+               led-usb = &led_usb;
+               led-usb2 = &led_usb2;
                led-wifi = &wifi;
        };
 
                reg = <0x0 0x2000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x1000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               lantiq,noxip;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x40000>;
-                                               read-only;
-                                       };
-
-                                       partition@40000 {
-                                               label = "uboot_env";
-                                               reg = <0x40000 0x20000>;
-                                               read-only;
-                                       };
-
-                                       partition@60000 {
-                                               label = "firmware";
-                                               reg = <0x60000 0xfa0000>;
-                                       };
-                               };
-                       };
-               };
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu a23";
-                                       lantiq,function = "ebu";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               stp {
-                                       lantiq,groups = "stp";
-                                       lantiq,function = "stp";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               exin {
-                                       lantiq,groups = "exin1", "exin2";
-                                       lantiq,function = "exin";
-                                       lantiq,output = <0>;
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1", "req2";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1", "gnt2";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               buttons {
-                                       lantiq,pins = "io3", "io14";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                       };
-               };
-
-               gpios: stp@E100BB0 {
-                       status = "okay";
-                       lantiq,groups = <0x7>;
-               };
-
-               etop@E180000 {
-                       phy-mode = "rmii";
-               };
-
-               pci@E105400 {
-                       status = "okay";
-                       lantiq,external-clock;
-                       interrupt-map = <
-                               0x6000 0 0 1 &icu0 135
-                               0x7800 0 0 1 &icu0 66
-                               0x7800 0 0 2 &icu0 66
-                               0x7800 0 0 3 &icu0 66
-                       >;
-                       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0x7>;
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                        label = "phone2";
                        gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
                };
-               usb: usb {
+               led_usb: usb {
                        label = "usb";
                        gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
                };
-               usb2: usb2 {
+               led_usb2: usb2 {
                        label = "usb2";
                        gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
                };
                };
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu a23";
+                       lantiq,function = "ebu";
+                       lantiq,open-drain = <0>;
+                       lantiq,output = <1>;
+               };
+               stp {
+                       lantiq,groups = "stp";
+                       lantiq,function = "stp";
+                       lantiq,open-drain = <0>;
+                       lantiq,output = <1>;
+               };
+               exin {
+                       lantiq,groups = "exin1", "exin2";
+                       lantiq,function = "exin";
+                       lantiq,output = <0>;
+               };
+               pci_in {
+                       lantiq,groups = "req1", "req2";
+                       lantiq,function = "pci";
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1", "gnt2";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,open-drain = <0>;
+                       lantiq,output = <1>;
+               };
+               buttons {
+                       lantiq,pins = "io3", "io14";
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+       };
+};
+
+&gpios {
+       status = "okay";
+       lantiq,groups = <0x7>;
+};
+
+&gsw {
+       phy-mode = "rmii";
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x1000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               lantiq,noxip;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x40000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "uboot_env";
+                               reg = <0x40000 0x20000>;
+                               read-only;
+                       };
+
+                       partition@60000 {
+                               label = "firmware";
+                               reg = <0x60000 0xfa0000>;
+                       };
+               };
+       };
+};
+
+&pci0 {
+       status = "okay";
+       lantiq,external-clock;
+       interrupt-map = <
+               0x6000 0 0 1 &icu0 135
+               0x7800 0 0 1 &icu0 66
+               0x7800 0 0 2 &icu0 66
+               0x7800 0 0 3 &icu0 66
+       >;
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+       req-mask = <0x7>;
+};
+
+&vmmc {
+       status = "okay";
+};
index 8e712bf..de657c6 100644 (file)
@@ -14,7 +14,7 @@
 
                led-dsl = &dsl;
                led-internet = &online;
-               led-usb = &usb;
+               led-usb = &led_usb;
                led-wifi = &wifi;
        };
 
                reg = <0x0 0x4000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>; /* 64 KB */
-                                               read-only;
-                                       };
-
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x10000 0x10000>; /* 64 KB */
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x20000 0x3d0000>;
-                                       };
-
-                                       boardconfig: partition@400000 {
-                                               label = "boardconfig";
-                                               reg = <0x3f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-
-                       gpiomm: gpiomm@4000000 {
-                               compatible = "lantiq,gpio-mm";
-                               reg = <1 0x0 0x10 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               lantiq,shadow = <0x0>;
-                       };
-
-                       ath5k_eep {
-                               compatible = "ath5k,eeprom";
-                               ath,eep-flash = <&boardconfig 0x400>;
-                               ath,mac-offset = <0x16>;
-                               ath,mac-increment = <1>;
-                               ath,eep-swap;
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu cs1";
-                                       lantiq,function = "ebu";
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1", "req2";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1", "gnt2";
-                                       lantiq,function = "pci";
-                                       lantiq,pull = <0>;
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-               };
-
-               pci@E105400 {
-                       status = "okay";
-                       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0xf>;
-               };
+       ath5k_eep {
+               compatible = "ath5k,eeprom";
+               ath,eep-flash = <&boardconfig 0x400>;
+               ath,mac-offset = <0x16>;
+               ath,mac-increment = <1>;
+               ath,eep-swap;
        };
 
        gpio-keys-polled {
                        label = "dsl2";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
-               usb: usb {
+               led_usb: usb {
                        label = "usb";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
                };
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu cs1";
+                       lantiq,function = "ebu";
+               };
+               pci_in {
+                       lantiq,groups = "req1", "req2";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1", "gnt2";
+                       lantiq,function = "pci";
+                       lantiq,pull = <0>;
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+&gpiomm {
+       status = "okay";
+       lantiq,shadow = <0x0>;
+};
+
+&gsw {
+       phy-mode = "mii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>; /* 64 KB */
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x10000 0x10000>; /* 64 KB */
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x20000 0x3d0000>;
+                       };
+
+                       boardconfig: partition@400000 {
+                               label = "boardconfig";
+                               reg = <0x3f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pci0 {
+       status = "okay";
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+       req-mask = <0xf>;
+};
+
+&usb {
+       status = "okay";
+       gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
index 771d014..9617398 100644 (file)
@@ -5,10 +5,8 @@
 / {
        compatible = "arcadyan,arv4518pwr01a", "lantiq,xway", "lantiq,danube";
        model = "SMC7908A-ISP, Airties WAV-221";
+};
 
-       fpi@10000000 {
-               pci@E105400 {
-                       lantiq,external-clock;
-               };
-       };
+&pci0 {
+       lantiq,external-clock;
 };
index 8f78176..11e57e1 100644 (file)
@@ -19,7 +19,7 @@
 
                led-dsl = &dsl;
                led-internet = &internet_green;
-               led-usb = &usb;
+               led-usb = &led_usb;
                led-wifi = &wifi;
        };
 
                reg = <0x0 0x2000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x10000 0x10000>;
-                                       };
-
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x20000 0x3d0000>;
-                                       };
-
-                                       boardconfig: partition@3f0000 {
-                                               label = "boardconfig";
-                                               reg = <0x3f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-
-                       gpiomm: gpiomm@4000000 {
-                               compatible = "lantiq,gpio-mm";
-                               reg = <1 0x0 0x10 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               lantiq,shadow = <0x400>;
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu cs1";
-                                       lantiq,function = "ebu";
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-               };
-
-               pci@E105400 {
-                       status = "okay";
-                       lantiq,external-clock;
-                       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0xf>;
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                        label = "arv4519pw:red:internet";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
-               usb: usb {
+               led_usb: usb {
                        label = "arv4519pw:green:usb";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
                };
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu cs1";
+                       lantiq,function = "ebu";
+               };
+       };
+};
+
+&gpiomm {
+       status = "okay";
+       lantiq,shadow = <0x400>;
+};
+
+&gsw {
+       phy-mode = "mii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x10000 0x10000>;
+                       };
+
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x20000 0x3d0000>;
+                       };
+
+                       boardconfig: partition@3f0000 {
+                               label = "boardconfig";
+                               reg = <0x3f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pci0  {
+       status = "okay";
+       lantiq,external-clock;
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+       req-mask = <0xf>;
+};
+
+&usb {
+       status = "okay";
+       gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
index 05e0dfe..84d36d7 100644 (file)
@@ -19,7 +19,7 @@
 
                led-dsl = &dsl;
                led-internet = &internet_blue;
-               led-usb = &usb;
+               led-usb = &led_usb;
                led-wifi = &wifi;
        };
 
                reg = <0x0 0x2000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH
-                               &gpiomm 7 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x800000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x20000>;
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               label = "uboot_env";
-                                               reg = <0x20000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@30000 {
-                                               label = "firmware";
-                                               reg = <0x30000 0x3c0000>;
-                                       };
-
-                                       boardconfig: partition@7f0000 {
-                                               label = "boardconfig";
-                                               reg = <0x3f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-
-                       gpiomm: gpiomm@4000000 {
-                               compatible = "lantiq,gpio-mm";
-                               reg = <1 0x0 0x10 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               lantiq,shadow = <0x400>;
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu cs1";
-                                       lantiq,function = "ebu";
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "rmii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
-               };
-
-               pci@E105400 {
-                       status = "okay";
-                       lantiq,external-clock;
-                       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-// gpiomm 10 - switch
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                        label = "arv4520pw:blue:sprache";
                        gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
                };
-               usb: usb {
+               led_usb: usb {
                        label = "arv4520pw:blue:usb";
                        gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
                };
                */
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu cs1";
+                       lantiq,function = "ebu";
+               };
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+       };
+};
+
+&gpiomm {
+       status = "okay";
+       lantiq,shadow = <0x400>;
+};
+
+&gsw {
+       /* gpiomm 10 - switch */
+       phy-mode = "rmii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x800000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x20000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "uboot_env";
+                               reg = <0x20000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "firmware";
+                               reg = <0x30000 0x3c0000>;
+                       };
+
+                       boardconfig: partition@7f0000 {
+                               label = "boardconfig";
+                               reg = <0x3f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pci0 {
+       status = "okay";
+       lantiq,external-clock;
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+&usb {
+       status = "okay";
+       gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH
+               &gpiomm 7 GPIO_ACTIVE_HIGH>;
+};
index 61548c7..b3904d3 100644 (file)
                reg = <0x0 0x2000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-               };
+       ath5k_eep {
+               compatible = "ath5k,eeprom";
+               ath,eep-flash = <&boardconfig 0x400>;
+               ath,mac-offset = <0x0>;
+               ath,eep-swap;
        };
 
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x10000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x20000 0x3d0000>;
-                                       };
-
-                                       boardconfig: partition@400000 {
-                                               label = "boardconfig";
-                                               reg = <0x3f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-
-                       ath5k_eep {
-                               compatible = "ath5k,eeprom";
-                               ath,eep-flash = <&boardconfig 0x400>;
-                               ath,mac-offset = <0x0>;
-                               ath,eep-swap;
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <1>;
-                               };
-                               relay {
-                                       lantiq,pins = "io31";
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-
-               pci@E105400 {
-                       status = "okay";
-                       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-/*
-#define ARV4525PW_PHYRESET     13
-#define ARV4525PW_RELAY                31
-*/
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                };
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,pull = <2>;
+                       lantiq,output = <1>;
+               };
+               relay {
+                       lantiq,pins = "io31";
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+/* #define ARV4525PW_PHYRESET  13 */
+&gsw {
+       phy-mode = "mii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x10000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x20000 0x3d0000>;
+                       };
+
+                       boardconfig: partition@400000 {
+                               label = "boardconfig";
+                               reg = <0x3f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pci0 {
+       status = "okay";
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+/* #define ARV4525PW_RELAY             31 */
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
index d996e8b..7221c11 100644 (file)
@@ -18,7 +18,7 @@
                led-running = &power_blue;
 
                led-dsl = &dsl_blue;
-               led-usb = &usb;
+               led-usb = &led_usb;
                led-wifi = &wifi;
        };
 
                reg = <0x0 0x2000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH
-                               &gpiomm 7 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x400000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x10000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x20000 0x3d0000>;
-                                       };
-
-                                       boardconfig: partition@3f0000 {
-                                               label = "boardconfig";
-                                               reg = <0x3f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-
-                       ath5k_eep {
-                               compatible = "ath5k,eeprom";
-                               ath,eep-flash = <&boardconfig 0x400>;
-                               ath,mac-offset = <0x0>;
-                               ath,eep-swap;
-                       };
-                       gpiomm: gpiomm@4000000 {
-                               compatible = "lantiq,gpio-mm";
-                               reg = <1 0x0 0x10>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               lantiq,shadow = <0x77f>;
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu cs1";
-                                       lantiq,function = "ebu";
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,pull = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               leds {
-                                       lantiq,pins = "io3", "io5", "io6", "io7", "io9";
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
-               };
-
-               etop@E180000 {
-                       phy-mode = "rmii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-
-               pci@E105400 {
-                       status = "okay";
-                       lantiq,external-clock;
-                       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-               };
+       ath5k_eep {
+               compatible = "ath5k,eeprom";
+               ath,eep-flash = <&boardconfig 0x400>;
+               ath,mac-offset = <0x0>;
+               ath,eep-swap;
        };
 
-/*
-#define ARV452CPW_SWITCH_RESET          110
-*/
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                        label = "arv452cqw:blue:sprache";
                        gpios = <&gpiomm 4 1>;
                };
-               usb: usb {
+               led_usb: usb {
                        label = "arv452cqw:blue:usb";
                        gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
                };
                };
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu cs1";
+                       lantiq,function = "ebu";
+               };
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,pull = <0>;
+                       lantiq,output = <1>;
+               };
+               leds {
+                       lantiq,pins = "io3", "io5", "io6", "io7", "io9";
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+&gpiomm {
+       status = "okay";
+       lantiq,shadow = <0x77f>;
+};
+
+/*
+#define ARV452CPW_SWITCH_RESET          110
+*/
+&gsw {
+       phy-mode = "rmii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x400000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x10000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x20000 0x3d0000>;
+                       };
+
+                       boardconfig: partition@3f0000 {
+                               label = "boardconfig";
+                               reg = <0x3f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pci0 {
+       status = "okay";
+       lantiq,external-clock;
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+&usb {
+       status = "okay";
+       gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH
+               &gpiomm 7 GPIO_ACTIVE_HIGH>;
+};
index 3ec4bf4..0c251c6 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x800000>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x40000>;
-                                               read-only;
-                                       };
-
-                                       partition@40000 {
-                                               label = "uboot_env";
-                                               reg = <0x40000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@50000 {
-                                               label = "firmware";
-                                               reg = <0x50000 0x7a0000>;
-                                       };
-
-                                       boardconfig: partition@7f0000 {
-                                               label = "board_config";
-                                               reg = <0x7f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               pci {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               /* GPIO 19: switch reset */
-               etop@E180000 {
-                       phy-mode = "rmii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               pci {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,pull = <2>;
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+/* GPIO 19: switch reset */
+&gsw {
+       phy-mode = "rmii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x800000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x40000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "uboot_env";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               label = "firmware";
+                               reg = <0x50000 0x7a0000>;
+                       };
+
+                       boardconfig: partition@7f0000 {
+                               label = "board_config";
+                               reg = <0x7f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        lantiq,external-clock;
index dc3f614..d99e1e3 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x1000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x40000>;
-                                               read-only;
-                                       };
-
-                                       partition@40000 {
-                                               label = "uboot_env";
-                                               reg = <0x40000 0x20000>;
-                                               read-only;
-                                       };
-
-                                       partition@60000 {
-                                               label = "firmware";
-                                               reg = <0x60000 0xf80000>;
-                                       };
-
-                                       boardconfig: partition@fe0000 {
-                                               label = "board_config";
-                                               reg = <0xfe0000 0x20000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               exin {
-                                       lantiq,groups = "exin1";
-                                       lantiq,function = "exin";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1", "req2";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <1>;
-                               };
-                               pins_out {
-                                       lantiq,pins = "io2", "io4", "io8", "io9", "io10", "io15", "io20";
-                                       lantiq,output = <1>;
-                               };
-                               pins_in {
-                                       lantiq,pins = "io11", "io12", "io28";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                       };
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
-               };
-
-               etop@E180000 {
-                       /* Switch reset 19 */
-                       phy-mode = "mii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               exin {
+                       lantiq,groups = "exin1";
+                       lantiq,function = "exin";
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_in {
+                       lantiq,groups = "req1", "req2";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,pull = <2>;
+                       lantiq,output = <1>;
+               };
+               pins_out {
+                       lantiq,pins = "io2", "io4", "io8", "io9", "io10", "io15", "io20";
+                       lantiq,output = <1>;
+               };
+               pins_in {
+                       lantiq,pins = "io11", "io12", "io28";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+       };
+};
+
+&gsw {
+       /* Switch reset 19 */
+       phy-mode = "mii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x1000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x40000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "uboot_env";
+                               reg = <0x40000 0x20000>;
+                               read-only;
+                       };
+
+                       partition@60000 {
+                               label = "firmware";
+                               reg = <0x60000 0xf80000>;
+                       };
+
+                       boardconfig: partition@fe0000 {
+                               label = "board_config";
+                               reg = <0xfe0000 0x20000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        lantiq,external-clock;
                ralink,mtd-eeprom-swap;
        };
 };
+
+&usb {
+       status = "okay";
+       gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
+};
index 41b1249..a0924f2 100644 (file)
@@ -19,7 +19,7 @@
 
                led-dsl = &dsl;
                led-internet = &online_green;
-               led-usb = &usb;
+               led-usb = &led_usb;
                led-wifi = &wifi;
        };
 
                reg = <0x0 0x4000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x10000 0x10000>;
-                                       };
-
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x20000 0x7d0000>;
-                                       };
-
-                                       boardconfig: partition@400000 {
-                                               label = "boardconfig";
-                                               reg = <0x7f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-
-                       gpiomm: gpiomm@4000000 {
-                               compatible = "lantiq,gpio-mm";
-                               reg = <1 0x0 0x10 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               lantiq,shadow = <0x0>;
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu cs1";
-                                       lantiq,function = "ebu";
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,pull = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <1>;
-                               };
-                               leds {
-                                       lantiq,pins = "io2", "io4", "io5", "io6", "io7", "io8", "io19";
-                                       lantiq,output = <1>;
-                               };
-                               keys {
-                                       lantiq,pins = "io28", "io30";
-                                       lantiq,output = <0>;
-                                       lantiq,pull = <2>;
-                                       lantiq,open-drain = <1>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-/*
-#define SWITCH_RESET          13
-*/
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                        label = "arv7518pw:red:internet";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
-               usb: usb {
+               led_usb: usb {
                        label = "arv7518pw:green:usb";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu cs1";
+                       lantiq,function = "ebu";
+               };
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,pull = <0>;
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,pull = <2>;
+                       lantiq,output = <1>;
+               };
+               leds {
+                       lantiq,pins = "io2", "io4", "io5", "io6", "io7", "io8", "io19";
+                       lantiq,output = <1>;
+               };
+               keys {
+                       lantiq,pins = "io28", "io30";
+                       lantiq,output = <0>;
+                       lantiq,pull = <2>;
+                       lantiq,open-drain = <1>;
+               };
+       };
+};
+
+&gpiomm {
+       status = "okay";
+       lantiq,shadow = <0x0>;
+};
+
+/*
+#define SWITCH_RESET          13
+*/
+&gsw {
+       phy-mode = "mii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x10000 0x10000>;
+                       };
+
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x20000 0x7d0000>;
+                       };
+
+                       boardconfig: partition@400000 {
+                               label = "boardconfig";
+                               reg = <0x7f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                mtd-mac-address-increment = <1>;
        };
 };
+
+&usb {
+       status = "okay";
+       gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+       status = "okay";
+};
index 9983a79..4d0ddfd 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x40000>;
-                                               read-only;
-                                       };
-
-                                       partition@40000 {
-                                               label = "uboot_env";
-                                               reg = <0x40000 0x20000>;
-                                       };
-
-                                       partition@60000 {
-                                               label = "firmware";
-                                               reg = <0x60000 0xf80000>;
-                                       };
-
-                                       boardconfig: partition@fe0000 {
-                                               label = "board_config";
-                                               reg = <0xfe0000 0x20000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu cs1";
-                                       lantiq,function = "ebu";
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,pull = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <1>;
-                               };
-                               switch_rst {
-                                       lantiq,pins = "io19";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-
-               /* warning: passive port
-               only works with active devices */
-               ifxhcd@E101000 {
-                       status = "okay";
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu cs1";
+                       lantiq,function = "ebu";
+               };
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,pull = <0>;
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,pull = <2>;
+                       lantiq,output = <1>;
+               };
+               switch_rst {
+                       lantiq,pins = "io19";
+                       lantiq,pull = <2>;
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+&gsw {
+       phy-mode = "mii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x40000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "uboot_env";
+                               reg = <0x40000 0x20000>;
+                       };
+
+                       partition@60000 {
+                               label = "firmware";
+                               reg = <0x60000 0xf80000>;
+                       };
+
+                       boardconfig: partition@fe0000 {
+                               label = "board_config";
+                               reg = <0xfe0000 0x20000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        lantiq,external-clock;
                ralink,mtd-eeprom-swap;
        };
 };
+
+/* warning: passive port only works with active devices */
+&usb {
+       status = "okay";
+};
+
+&vmmc {
+       status = "okay";
+};
index 0bdc150..d361fde 100644 (file)
                reg = <0x0 0x8000000>;
        };
 
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x0 0x60000>;
-                                               read-only;
-                                       };
-
-                                       partition@60000 {
-                                               label = "uboot-env";
-                                               reg = <0x60000 0x20000>;
-                                               read-only;
-                                       };
-
-                                       partition@80000 {
-                                               label = "firmware";
-                                               reg = <0x80000 0x1f00000>;
-                                       };
-
-                                       boardconfig: partition@1f80000 {
-                                               label = "boardconfig";
-                                               reg = <0x1f80000 0x80000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               mdio {
-                                       lantiq,groups = "mdio";
-                                       lantiq,function = "mdio";
-                               };
-                               pcie-rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,pull = <0>;
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
-               };
-
-               ifxhcd@E106000 {
-                       status = "okay";
-                       gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
-               };
-
-               pcie@d900000 {
-                       status = "okay";
-                       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
                firmware1 = "lantiq/xrx200_phy22f_a14.bin";     /*VR9 1.1*/
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "lantiq,xrx200-mdio";
+               reg = <0>;
+
                phy0: ethernet-phy@0 {
                        reg = <0x0>;
                        compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
                };
        };
 };
+
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               mdio {
+                       lantiq,groups = "mdio";
+                       lantiq,function = "mdio";
+               };
+               pcie-rst {
+                       lantiq,pins = "io21";
+                       lantiq,pull = <0>;
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x0 0x60000>;
+                               read-only;
+                       };
+
+                       partition@60000 {
+                               label = "uboot-env";
+                               reg = <0x60000 0x20000>;
+                               read-only;
+                       };
+
+                       partition@80000 {
+                               label = "firmware";
+                               reg = <0x80000 0x1f00000>;
+                       };
+
+                       boardconfig: partition@1f80000 {
+                               label = "boardconfig";
+                               reg = <0x1f80000 0x80000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pcie0 {
+       status = "okay";
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+&usb0 {
+       status = "okay";
+       gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
+};
+
+&usb1 {
+       status = "okay";
+       gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
+};
index 0007535..4252226 100644 (file)
                reg = <0x0 0x2000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x10000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x20000 0x3d0000>;
-                                       };
-
-                                       boardconfig: partition@400000 {
-                                               label = "board_config";
-                                               reg = <0x3f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               exin {
-                                       lantiq,groups = "exin1";
-                                       lantiq,function = "exin";
-                               };
-                               pci {
-                                       lantiq,groups = "gnt1", "req1";
-                                       lantiq,function = "pci";
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               exin {
+                       lantiq,groups = "exin1";
+                       lantiq,function = "exin";
+               };
+               pci {
+                       lantiq,groups = "gnt1", "req1";
+                       lantiq,function = "pci";
+               };
+       };
+};
+
+&gsw {
+       phy-mode = "mii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x10000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x20000 0x3d0000>;
+                       };
+
+                       boardconfig: partition@400000 {
+                               label = "board_config";
+                               reg = <0x3f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        interrupt-map = <0x7000 0 0 1 &icu0 135 1>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;
        };
 };
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
index 3591b43..bb73a26 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x800000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x10000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x20000 0x7d0000>;
-                                       };
-
-                                       boardconfig: partition@7f0000 {
-                                               label = "board_config";
-                                               reg = <0x7f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-
-                       gpiomm: gpiomm@4000000 {
-                               compatible = "lantiq,gpio-mm";
-                               reg = <1 0x0 0x10 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               lantiq,shadow = <0x3>;
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu cs1";
-                                       lantiq,function = "ebu";
-                               };
-                               exin {
-                                       lantiq,groups = "exin1";
-                                       lantiq,function = "exin";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_in {
-                                       lantiq,groups = "req2", "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <1>;
-                               };
-                               leds {
-                                       lantiq,pins = "io3", "io5", "io6", "io8";
-                                       lantiq,output = <1>;
-                                       lantiq,pull = <0>;
-                               };
-                               keys {
-                                       lantiq,pins = "io11", "io12", "io13", "io28";
-                                       lantiq,output = <0>;
-                                       lantiq,pull = <2>;
-                                       lantiq,open-drain = <1>;
-                               };
-                       };
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
-               };
-
-               etop@E180000 {
-                       phy-mode = "rmii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu cs1";
+                       lantiq,function = "ebu";
+               };
+               exin {
+                       lantiq,groups = "exin1";
+                       lantiq,function = "exin";
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_in {
+                       lantiq,groups = "req2", "req1";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,pull = <2>;
+                       lantiq,output = <1>;
+               };
+               leds {
+                       lantiq,pins = "io3", "io5", "io6", "io8";
+                       lantiq,output = <1>;
+                       lantiq,pull = <0>;
+               };
+               keys {
+                       lantiq,pins = "io11", "io12", "io13", "io28";
+                       lantiq,output = <0>;
+                       lantiq,pull = <2>;
+                       lantiq,open-drain = <1>;
+               };
+       };
+};
+
+&gpiomm {
+       status = "okay";
+       lantiq,shadow = <0x3>;
+};
+
+&gsw {
+       phy-mode = "rmii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x800000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x10000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x20000 0x7d0000>;
+                       };
+
+                       boardconfig: partition@7f0000 {
+                               label = "board_config";
+                               reg = <0x7f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        lantiq,external-clock;
                ralink,mtd-eeprom-swap;
        };
 };
+
+&usb {
+       status = "okay";
+       gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
+};
index 8b5be8b..9dfd515 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x800000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x30000>;
-                                               read-only;
-                                       };
-
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x30000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x40000 0x7b0000>;
-                                       };
-
-                                       boardconfig: partition@7f0000 {
-                                               label = "board_config";
-                                               reg = <0x7f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-
-                       gpiomm: gpiomm@4000000 {
-                               compatible = "lantiq,gpio-mm";
-                               reg = <1 0x0 0x10 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               lantiq,shadow = <3>;
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu cs1";
-                                       lantiq,function = "ebu";
-                               };
-                               exin {
-                                       lantiq,groups = "exin1";
-                                       lantiq,function = "exin";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,output = <1>;
-                               };
-                               leds {
-                                       lantiq,pins = "io3", "io5", "io6", "io8";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,output = <1>;
-                               };
-                               buttons {
-                                       lantiq,pins = "io11", "io12", "io13", "io28";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                       };
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu cs1";
+                       lantiq,function = "ebu";
+               };
+               exin {
+                       lantiq,groups = "exin1";
+                       lantiq,function = "exin";
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,open-drain = <1>;
+                       lantiq,output = <1>;
+               };
+               leds {
+                       lantiq,pins = "io3", "io5", "io6", "io8";
+                       lantiq,open-drain = <1>;
+                       lantiq,output = <1>;
+               };
+               buttons {
+                       lantiq,pins = "io11", "io12", "io13", "io28";
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+       };
+};
+
+
+&gpiomm {
+       status = "okay";
+       lantiq,shadow = <3>;
+};
+
+&gsw {
+       phy-mode = "mii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x800000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x30000>;
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x40000 0x7b0000>;
+                       };
+
+                       boardconfig: partition@7f0000 {
+                               label = "board_config";
+                               reg = <0x7f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        lantiq,external-clock;
                mtd-mac-address = <&boardconfig 0x16>;
        };
 };
+
+&usb {
+       status = "okay";
+       gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
+};
index 4edcde9..adc1dd8 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x800000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x30000>;        /* 192 KiB */
-                                               read-only;
-                                       };
-
-                                       partition@30000 {
-                                               label = "uboot";
-                                               reg = <0x30000 0x10000>;        /* 64 KiB */
-                                               read-only;
-                                       };
-
-                                       partition@40000 {
-                                               label = "firmware";
-                                               reg = <0x40000 0x7B0000>;       /* 7872 KiB */
-                                       };
-
-                                       art: partition@7F0000 {
-                                               label = "art";
-                                               reg = <0x7F0000 0x10000>;       /* 64 KiB*/
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <1>;
-                               };
-                               relay {
-                                       lantiq,pins = "io31";
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-                       mtd-mac-address = <&art 0x16>;
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-                       lantiq,portmask = <0x3>;
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,pull = <2>;
+                       lantiq,output = <1>;
+               };
+               relay {
+                       lantiq,pins = "io31";
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+&gsw {
+       phy-mode = "mii";
+       mtd-mac-address = <&art 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x800000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x30000>;        /* 192 KiB */
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "uboot";
+                               reg = <0x30000 0x10000>;        /* 64 KiB */
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "firmware";
+                               reg = <0x40000 0x7B0000>;       /* 7872 KiB */
+                       };
+
+                       art: partition@7F0000 {
+                               label = "art";
+                               reg = <0x7F0000 0x10000>;       /* 64 KiB*/
+                               read-only;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                mtd-mac-address-increment = <1>;
        };
 };
+
+&usb {
+       status = "okay";
+       gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+       lantiq,portmask = <0x3>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
index 2037f40..3537656 100644 (file)
                reg = <0x0 0x2000000>;
        };
 
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x0800000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x0 0x30000>;
-                                       };
-
-                                       partition@30000 {
-                                               label = "uboot_env";
-                                               reg = <0x30000 0x10000>;
-                                       };
-
-                                       partition@40000 {
-                                               label = "firmware";
-                                               reg = <0x40000 0x750000>;
-                                       };
-
-                                       partition@790000 {
-                                               label = "ddrconfig";
-                                               reg = <0x790000 0x70000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               mdio {
-                                       lantiq,groups = "mdio";
-                                       lantiq,function = "mdio";
-                               };
-                       };
-               };
-       };
-
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
                firmware1 = "lantiq/xrx200_phy22f_a14.bin";     /*VR9 1.1*/
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "lantiq,xrx200-mdio";
+               reg = <0>;
 
                phy11: ethernet-phy@11 {
                        reg = <0x11>;
 
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               mdio {
+                       lantiq,groups = "mdio";
+                       lantiq,function = "mdio";
+               };
+       };
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x0800000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x0 0x30000>;
+                       };
+
+                       partition@30000 {
+                               label = "uboot_env";
+                               reg = <0x30000 0x10000>;
+                       };
+
+                       partition@40000 {
+                               label = "firmware";
+                               reg = <0x40000 0x750000>;
+                       };
+
+                       partition@790000 {
+                               label = "ddrconfig";
+                               reg = <0x790000 0x70000>;
+                               read-only;
+                       };
+               };
+       };
+};
index 961fd9b..d3be43c 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {                            /* NOR Flash: Spansion S29AL004D 512KB */
-                               compatible = "lantiq,nor";      /* "AMD AM29LV400BB" compatible on 3.3.8 */
-                               lantiq,cs = <0>;
-                               bank-width = <2>;
-                               reg = <0 0x0 0x80000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x40000>; /* 256KB */
-                                       };
-
-                                       partition@40000 {
-                                               label = "uboot_env";
-                                               reg = <0x40000 0x10000>; /* 64KB */
-                                       };
-
-                                       partition@50000 {
-                                               label = "rg_conf_1";
-                                               reg = <0x50000 0x10000>;
-                                       };
-
-                                       partition@60000 {
-                                               label = "rg_conf_2";
-                                               reg = <0x60000 0x10000>;
-                                       };
-
-                                       partition@70000 {
-                                               label = "rg_conf_factory";
-                                               reg = <0x70000 0x10000>;
-                                       };
-                               };
-                       };
-
-                       nand-parts@0 {            /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
-                               compatible = "lantiq,nand-xway";
-                               lantiq,cs = <1>;
-                               bank-width = <2>;
-                               reg = <1 0x0 0x2000000 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       ath9k_cal: partition@0 {
-                                               label = "art";     /* Atheros 9160 wifi b/g/n radio EEPROM */
-                                               reg = <0x00000 0x4000>;
-                                               read-only;
-                                       };
-
-                                       partition@4000 {
-                                               label = "kernel";
-                                               reg = <0x4000 0x200000>;
-                                       };
-
-                                       partition@164000 {
-                                               label = "ubi";
-                                               reg = <0x204000 0x1DFC000>;
-                                       };
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               nand_out {
-                                       lantiq,groups = "nand cle", "nand ale";
-                                       lantiq,function = "ebu";
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-                               nand_cs1 {
-                                       lantiq,groups = "nand cs1";
-                                       lantiq,function = "ebu";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-                               exin {
-                                       lantiq,groups = "exin1";
-                                       lantiq,function = "exin";
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <0>;
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain = <0>;
-                               };
-
-                               btn_in {
-                                       lantiq,pins = "io2", "io15", "io22";
-                                       lantiq,output = <0>;
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "rmii";
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-               };
-
-               gpios: stp@E100BB0 {
-                       status = "okay";
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               nand_out {
+                       lantiq,groups = "nand cle", "nand ale";
+                       lantiq,function = "ebu";
+                       lantiq,output = <1>;
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+               nand_cs1 {
+                       lantiq,groups = "nand cs1";
+                       lantiq,function = "ebu";
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+               exin {
+                       lantiq,groups = "exin1";
+                       lantiq,function = "exin";
+               };
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,output = <0>;
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,output = <1>;
+                       lantiq,open-drain = <0>;
+               };
+
+               btn_in {
+                       lantiq,pins = "io2", "io15", "io22";
+                       lantiq,output = <0>;
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+               };
+       };
+};
+
+&gpios {
+       status = "okay";
+};
+
+&gsw {
+       phy-mode = "rmii";
+};
+
+&localbus {
+       nor@0 {                         /* NOR Flash: Spansion S29AL004D 512KB */
+               compatible = "lantiq,nor";      /* "AMD AM29LV400BB" compatible on 3.3.8 */
+               lantiq,cs = <0>;
+               bank-width = <2>;
+               reg = <0 0x0 0x80000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x40000>; /* 256KB */
+                       };
+
+                       partition@40000 {
+                               label = "uboot_env";
+                               reg = <0x40000 0x10000>; /* 64KB */
+                       };
+
+                       partition@50000 {
+                               label = "rg_conf_1";
+                               reg = <0x50000 0x10000>;
+                       };
+
+                       partition@60000 {
+                               label = "rg_conf_2";
+                               reg = <0x60000 0x10000>;
+                       };
+
+                       partition@70000 {
+                               label = "rg_conf_factory";
+                               reg = <0x70000 0x10000>;
+                       };
+               };
+       };
+
+       nand@1 {                  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
+               compatible = "lantiq,nand-xway";
+               lantiq,cs = <1>;
+               bank-width = <2>;
+               reg = <1 0x0 0x2000000 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ath9k_cal: partition@0 {
+                               label = "art";     /* Atheros 9160 wifi b/g/n radio EEPROM */
+                               reg = <0x00000 0x4000>;
+                               read-only;
+                       };
+
+                       partition@4000 {
+                               label = "kernel";
+                               reg = <0x4000 0x200000>;
+                       };
+
+                       partition@164000 {
+                               label = "ubi";
+                               reg = <0x204000 0x1DFC000>;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
        };
 };
+
+&usb {
+       status = "okay";
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
index d37b972..afb1b26 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nand-parts@0 {            /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
-                               compatible = "lantiq,nand-xway";
-                               lantiq,cs = <1>;
-                               bank-width = <2>;
-                               reg = <1 0x0 0x2000000 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "preboot";
-                                               reg = <0x00000 0x8000>;
-                                               read-only;
-                                       };
-                                       partition@8000 {
-                                               label = "u-boot";
-                                               reg = <0x8000 0x05c000>;
-                                               read-only;
-                                       };
-                                       partition@64000 {
-                                               label = "uboot_env";
-                                               reg = <0x64000 0x004000>;
-                                       };
-                                       ath9k_cal: partition@68000 {
-                                               label = "art-copy";
-                                               reg = <0x68000 0x004000>;
-                                       };
-                                       partition@6c000 {
-                                               label = "kernel";
-                                               reg = <0x6c000 0x200000>;
-                                       };
-                                       partition@26c000 {
-                                               label = "ubi";
-                                               reg = <0x26c000 0x1d94000>;
-                                       };
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               nand_out {
-                                       lantiq,groups = "nand cle", "nand ale";
-                                       lantiq,function = "ebu";
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-                               nand_cs1 {
-                                       lantiq,groups = "nand cs1";
-                                       lantiq,function = "ebu";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <0>;
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain = <0>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "rgmii";
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               nand_out {
+                       lantiq,groups = "nand cle", "nand ale";
+                       lantiq,function = "ebu";
+                       lantiq,output = <1>;
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+               nand_cs1 {
+                       lantiq,groups = "nand cs1";
+                       lantiq,function = "ebu";
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,output = <0>;
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,output = <1>;
+                       lantiq,open-drain = <0>;
+               };
+       };
+};
+
+&gsw {
+       phy-mode = "rgmii";
+};
+
+&localbus {
+       nand@1 {                  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
+               compatible = "lantiq,nand-xway";
+               lantiq,cs = <1>;
+               bank-width = <2>;
+               reg = <1 0x0 0x2000000 >;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "preboot";
+                               reg = <0x00000 0x8000>;
+                               read-only;
+                       };
+                       partition@8000 {
+                               label = "u-boot";
+                               reg = <0x8000 0x05c000>;
+                               read-only;
+                       };
+                       partition@64000 {
+                               label = "uboot_env";
+                               reg = <0x64000 0x004000>;
+                       };
+                       ath9k_cal: partition@68000 {
+                               label = "art-copy";
+                               reg = <0x68000 0x004000>;
+                       };
+                       partition@6c000 {
+                               label = "kernel";
+                               reg = <0x6c000 0x200000>;
+                       };
+                       partition@26c000 {
+                               label = "ubi";
+                               reg = <0x26c000 0x1d94000>;
+                       };
+               };
+       };
+};
+
 &pci0 {
        status = "okay";
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
        };
 };
+
+&usb0 {
+       status = "okay";
+       gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+};
index 2f75074..feefc85 100644 (file)
                reg = <0x0 0x8000000>;
        };
 
-       fpi@10000000 {
-               localbus@0 {
-                       nand-parts@0 {
-                               compatible = "lantiq,nand-xway";
-                               lantiq,cs = <1>;
-                               bank-width = <2>;
-                               reg = <0x1 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               nand-on-flash-bbt;
-                               nand-ecc-strength = <3>;
-                               nand-ecc-step-size = <256>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "u-boot";
-                                               reg = <0x0 0xa0000>;
-                                               read-only;
-                                       };
-                                       partition@a0000 {
-                                               label = "uboot-env";
-                                               reg = <0xa0000 0x20000>;
-                                               read-only;
-                                       };
-                                       partition@c0000 {
-                                               label = "unused";
-                                               reg = <0xc0000 0x40000>;
-                                       };
-                                       partition@100000 {
-                                               label = "ubi";
-                                               reg = <0x100000 0x7e80000>;
-                                       };
-                                       /*
-                                        * last 512 KiB are for the bad block table, not writable
-                                        */
-                               };
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               mdio {
-                                       lantiq,groups = "mdio";
-                                       lantiq,function = "mdio";
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain;
-                               };
-                               pcie_rst {
-                                       lantiq,pins = "io38";
-                                       lantiq,pull = <0>;
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain;
-                               };
-                               usb_vbus {
-                                       lantiq,pins = "io33";
-                                       lantiq,pull = <0>;
-                                       lantiq,open-drain = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               nand_out {
-                                       lantiq,groups = "nand cle", "nand ale";
-                                       lantiq,function = "ebu";
-                                       lantiq,output = <1>;
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-                               nand_cs1 {
-                                       lantiq,groups = "nand cs1";
-                                       lantiq,function = "ebu";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-                       };
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
                firmware1 = "lantiq/xrx200_phy11g_a14.bin";     /*VR9 1.1*/
        };
 };
 
-&pci0 {
-       status = "okay";
-       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-
-       wifi@168c,002d {
-               compatible = "pci168c,002d";
-               reg = <0x7000 0 0 0 0>;
-               qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
-               qca,disable-5ghz;
-       };
-};
-
 &eth0 {
        lan: interface@0 {
                compatible = "lantiq,xrx200-pdi";
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "lantiq,xrx200-mdio";
+               reg = <0>;
 
                phy0: ethernet-phy@0 {
                        reg = <0x0>;
                };
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               mdio {
+                       lantiq,groups = "mdio";
+                       lantiq,function = "mdio";
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,output = <1>;
+                       lantiq,open-drain;
+               };
+               pcie_rst {
+                       lantiq,pins = "io38";
+                       lantiq,pull = <0>;
+                       lantiq,output = <1>;
+                       lantiq,open-drain;
+               };
+               usb_vbus {
+                       lantiq,pins = "io33";
+                       lantiq,pull = <0>;
+                       lantiq,open-drain = <0>;
+                       lantiq,output = <1>;
+               };
+               nand_out {
+                       lantiq,groups = "nand cle", "nand ale";
+                       lantiq,function = "ebu";
+                       lantiq,output = <1>;
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+               nand_cs1 {
+                       lantiq,groups = "nand cs1";
+                       lantiq,function = "ebu";
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+       };
+};
+
+&localbus {
+       nand@1 {
+               compatible = "lantiq,nand-xway";
+               lantiq,cs = <1>;
+               bank-width = <2>;
+               reg = <0x1 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               nand-on-flash-bbt;
+               nand-ecc-strength = <3>;
+               nand-ecc-step-size = <256>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0xa0000>;
+                               read-only;
+                       };
+                       partition@a0000 {
+                               label = "uboot-env";
+                               reg = <0xa0000 0x20000>;
+                               read-only;
+                       };
+                       partition@c0000 {
+                               label = "unused";
+                               reg = <0xc0000 0x40000>;
+                       };
+                       partition@100000 {
+                               label = "ubi";
+                               reg = <0x100000 0x7e80000>;
+                       };
+                       /*
+                        * last 512 KiB are for the bad block table, not writable
+                        */
+               };
+       };
+};
+
+&pci0 {
+       status = "okay";
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+
+       wifi@168c,002d {
+               compatible = "pci168c,002d";
+               reg = <0x7000 0 0 0 0>;
+               qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
+               qca,disable-5ghz;
+       };
+};
+
+&usb0 {
+       status = "okay";
+       gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+};
index e5637ef..42fb51f 100644 (file)
                reg = <0x0 0x1000000>;
        };
 
-       fpi@10000000 {
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               asc {
-                                       lantiq,groups = "asc";
-                                       lantiq,function = "asc";
-                               };
-                               keys_in {
-                                       lantiq,pins = "io0",/* "io25", */"io29";
-                                       lantiq,pull = <2>;
-                                       lantiq,open-drain = <1>;
-                               };
-                       };
-                       pins_spi_default: pins_spi_default {
-                               spi_in {
-                                       lantiq,groups = "spi_di";
-                                       lantiq,function = "spi";
-                               };
-                               spi_out {
-                                       lantiq,groups = "spi_do", "spi_clk",
-                                               "spi_cs1";
-                                       lantiq,function = "spi";
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-                       mac-address = [ 00 11 22 33 44 55 ];
-               };
-
-               spi@E100800 {
-                       status = "okay";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pins_spi_default>;
-
-                       m25p80@1 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <1 0>;
-                               spi-max-frequency = <5000000>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               reg = <0x0 0x20000>;
-                                               label = "SPI (RO) U-Boot Image";
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               reg = <0x20000 0x10000>;
-                                               label = "ENV_MAC";
-                                               read-only;
-                                       };
-
-                                       partition@30000 {
-                                               reg = <0x30000 0x10000>;
-                                               label = "DPF";
-                                               read-only;
-                                       };
-
-                                       partition@40000 {
-                                               reg = <0x40000 0x10000>;
-                                               label = "NVRAM";
-                                               read-only;
-                                       };
-
-                                       partition@500000 {
-                                               reg = <0x50000 0x003a0000>;
-                                               label = "kernel";
-                                       };
-                               };
-                       };
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                */
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               asc {
+                       lantiq,groups = "asc";
+                       lantiq,function = "asc";
+               };
+               keys_in {
+                       lantiq,pins = "io0",/* "io25", */"io29";
+                       lantiq,pull = <2>;
+                       lantiq,open-drain = <1>;
+               };
+       };
+       pins_spi_default: pins_spi_default {
+               spi_in {
+                       lantiq,groups = "spi_di";
+                       lantiq,function = "spi";
+               };
+               spi_out {
+                       lantiq,groups = "spi_do", "spi_clk",
+                               "spi_cs1";
+                       lantiq,function = "spi";
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+&gsw {
+       phy-mode = "mii";
+       mac-address = [ 00 11 22 33 44 55 ];
+};
+
+&spi {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pins_spi_default>;
+
+       m25p80@1 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <1 0>;
+               spi-max-frequency = <5000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               reg = <0x0 0x20000>;
+                               label = "SPI (RO) U-Boot Image";
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               reg = <0x20000 0x10000>;
+                               label = "ENV_MAC";
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               reg = <0x30000 0x10000>;
+                               label = "DPF";
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               reg = <0x40000 0x10000>;
+                               label = "NVRAM";
+                               read-only;
+                       };
+
+                       partition@500000 {
+                               reg = <0x50000 0x003a0000>;
+                               label = "kernel";
+                       };
+               };
+       };
+};
+
+&usb {
+       status = "okay";
+};
index d58d717..775f3f2 100644 (file)
@@ -14,7 +14,7 @@
 
                led-dsl = &dsl;
                led-internet = &internet;
-               led-usb = &usb;
+               led-usb = &led_usb;
                led-wifi = &wifi_green;
        };
 
                reg = <0x0 0x4000000>;
        };
 
-       fpi@10000000 {
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               exin {
-                                       lantiq,groups = "exin1";
-                                       lantiq,function = "exin";
-                               };
-                               pci {
-                                       lantiq,groups = "gnt1", "req1";
-                                       lantiq,function = "pci";
-                               };
-                               pci-in {
-                                       lantiq,groups = "req1";
-                                       lantiq,output = <0>;
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                               };
-                               pci-out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,output = <1>;
-                                       lantiq,pull = <0>;
-                               };
-                       };
-                       pins_spi_default: pins_spi_default {
-                               spi_in {
-                                       lantiq,groups = "spi_di";
-                                       lantiq,function = "spi";
-                               };
-                               spi_out {
-                                       lantiq,groups = "spi_do", "spi_clk",
-                                               "spi_cs4";
-                                       lantiq,function = "spi";
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "mii";
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-               };
-       };
-
        rtl8366rb {
                compatible = "realtek,rtl8366rb";
                gpio-sda = <&gpio 35 GPIO_ACTIVE_HIGH>;
@@ -90,8 +41,6 @@
                >;
        };
 
-
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                        label = "dgn3500:green:dsl";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
-               usb: usb {
+               led_usb: usb {
                        label = "dgn3500:green:usb";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
        };
 };
 
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               exin {
+                       lantiq,groups = "exin1";
+                       lantiq,function = "exin";
+               };
+               pci {
+                       lantiq,groups = "gnt1", "req1";
+                       lantiq,function = "pci";
+               };
+               pci-in {
+                       lantiq,groups = "req1";
+                       lantiq,output = <0>;
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+               };
+               pci-out {
+                       lantiq,groups = "gnt1";
+                       lantiq,output = <1>;
+                       lantiq,pull = <0>;
+               };
+       };
+       pins_spi_default: pins_spi_default {
+               spi_in {
+                       lantiq,groups = "spi_di";
+                       lantiq,function = "spi";
+               };
+               spi_out {
+                       lantiq,groups = "spi_do", "spi_clk",
+                               "spi_cs4";
+                       lantiq,function = "spi";
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+&gsw {
+       phy-mode = "mii";
+};
+
 &pci0 {
        status = "okay";
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 };
 
 &spi {
+       status = "okay";
+
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       status = "ok";
-
        m25p80@4 {
                #address-cells = <1>;
                #size-cells = <1>;
                };
        };
 };
+
+&usb0 {
+       status = "okay";
+};
index 3c8a2a1..bd022c5 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       fpi@10000000 {
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               mdio {
-                                       lantiq,groups = "mdio";
-                                       lantiq,function = "mdio";
-                               };
-                       };
-
-                       pins_spi_default: pins_spi_default {
-                               spi_in {
-                                       lantiq,groups = "spi_di";
-                                       lantiq,function = "spi";
-                               };
-                               spi_out {
-                                       lantiq,groups = "spi_do", "spi_clk", "spi_cs4";
-                                       lantiq,function = "spi";
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               pcie@d900000 {
-                       status = "disabled";
-               };
-       };
-
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
                firmware = "lantiq/xrx200_phy22f_a22.bin";
        };
 };
 
+&eth0 {
+       lan: interface@0 {
+               compatible = "lantiq,xrx200-pdi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0>;
+
+               ethernet@4 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <4>;
+                       phy-mode = "mii";
+                       phy-handle = <&phy13>;
+               };
+       };
+
+       mdio@0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "lantiq,xrx200-mdio";
+               reg = <0>;
+
+               phy13: ethernet-phy@13 {
+                       reg = <0x13>;
+                       compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
+               };
+       };
+};
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               mdio {
+                       lantiq,groups = "mdio";
+                       lantiq,function = "mdio";
+               };
+       };
+
+       pins_spi_default: pins_spi_default {
+               spi_in {
+                       lantiq,groups = "spi_di";
+                       lantiq,function = "spi";
+               };
+               spi_out {
+                       lantiq,groups = "spi_do", "spi_clk", "spi_cs4";
+                       lantiq,function = "spi";
+                       lantiq,output = <1>;
+               };
+       };
+};
+
+&pcie0 {
+       status = "disabled";
+};
+
 &spi {
+       status = "okay";
+
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       status = "ok";
-
        m25p80@4 {
                #address-cells = <1>;
                #size-cells = <1>;
                };
        };
 };
-
-&eth0 {
-       lan: interface@0 {
-               compatible = "lantiq,xrx200-pdi";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0>;
-
-               ethernet@4 {
-                       compatible = "lantiq,xrx200-pdi-port";
-                       reg = <4>;
-                       phy-mode = "mii";
-                       phy-handle = <&phy13>;
-               };
-       };
-
-       mdio@0 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "lantiq,xrx200-mdio";
-               phy13: ethernet-phy@13 {
-                       reg = <0x13>;
-                       compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
-               };
-       };
-};
index ebd30a7..ec287ab 100644 (file)
        memory@0 {
                reg = <0x0 0x2000000>;
        };
+};
 
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
 
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
+       state_default: pinmux {
+               stp {
+                       lantiq,groups = "stp";
+                       lantiq,function = "stp";
+               };
+               exin {
+                       lantiq,groups = "exin1";
+                       lantiq,function = "exin";
+               };
+               pci {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+               };
+               conf_out {
+                       lantiq,pins = "io4", "io5", "io6"; /* stp */
+                       lantiq,open-drain;
+                       lantiq,pull = <0>;
+               };
+       };
+};
 
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>; /* 64 KB */
-                                       };
+&gsw {
+       phy-mode = "rmii";
+};
 
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x10000 0x10000>; /* 64 KB */
-                                       };
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x20000 0x3d0000>;
-                                       };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-                                       partition@400000 {
-                                               label = "rootfs";
-                                               reg = <0x400000 0x400000>;
-                                       };
-                               };
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>; /* 64 KB */
                        };
-               };
 
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x10000 0x10000>; /* 64 KB */
+                       };
 
-                       state_default: pinmux {
-                               stp {
-                                       lantiq,groups = "stp";
-                                       lantiq,function = "stp";
-                               };
-                               exin {
-                                       lantiq,groups = "exin1";
-                                       lantiq,function = "exin";
-                               };
-                               pci {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                               };
-                               conf_out {
-                                       lantiq,pins = "io4", "io5", "io6"; /* stp */
-                                       lantiq,open-drain;
-                                       lantiq,pull = <0>;
-                               };
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x20000 0x3d0000>;
                        };
-               };
 
-               etop@E180000 {
-                       phy-mode = "rmii";
+                       partition@400000 {
+                               label = "rootfs";
+                               reg = <0x400000 0x400000>;
+                       };
                };
        };
 };
index 605eb82..21562dc 100644 (file)
        memory@0 {
                reg = <0x0 0x2000000>;
        };
+};
 
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
 
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
+       state_default: pinmux {
+               stp {
+                       lantiq,groups = "stp";
+                       lantiq,function = "stp";
+               };
+               exin {
+                       lantiq,groups = "exin1";
+                       lantiq,function = "exin";
+               };
+               pci {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+               };
+               conf_out {
+                       lantiq,pins = "io4", "io5", "io6"; /* stp */
+                       lantiq,open-drain;
+                       lantiq,pull = <0>;
+               };
+       };
+};
 
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x10000>; /* 64 KB */
-                                       };
+&gsw {
+       phy-mode = "rmii";
+};
 
-                                       partition@10000 {
-                                               label = "uboot_env";
-                                               reg = <0x10000 0x10000>; /* 64 KB */
-                                       };
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x2000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-                                       partition@20000 {
-                                               label = "firmware";
-                                               reg = <0x20000 0x3d0000>;
-                                       };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-                                       partition@400000 {
-                                               label = "rootfs";
-                                               reg = <0x400000 0x400000>;
-                                       };
-                               };
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x10000>; /* 64 KB */
                        };
-               };
 
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               stp {
-                                       lantiq,groups = "stp";
-                                       lantiq,function = "stp";
-                               };
-                               exin {
-                                       lantiq,groups = "exin1";
-                                       lantiq,function = "exin";
-                               };
-                               pci {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                               };
-                               conf_out {
-                                       lantiq,pins = "io4", "io5", "io6"; /* stp */
-                                       lantiq,open-drain;
-                                       lantiq,pull = <0>;
-                               };
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x10000 0x10000>; /* 64 KB */
                        };
-               };
-
-               etop@E180000 {
-                       phy-mode = "rmii";
-               };
 
-               stp0: stp@E100BB0 {
-                       #gpio-cells = <2>;
-                       compatible = "lantiq,gpio-stp-xway";
-                       gpio-controller;
-                       reg = <0xE100BB0 0x40>;
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x20000 0x3d0000>;
+                       };
 
-                       lantiq,shadow = <0xfff>;
-                       lantiq,groups = <0x3>;
+                       partition@400000 {
+                               label = "rootfs";
+                               reg = <0x400000 0x400000>;
+                       };
                };
        };
 };
+
+&stp {
+       status = "okay";
+       lantiq,shadow = <0xfff>;
+       lantiq,groups = <0x3>;
+};
index b19b971..c24c5d9 100644 (file)
                led-failsafe = &power;
                led-running = &power;
 
-               led-usb = &usb1;
-               led-usb2 = &usb2;
+               led-usb = &led_usb1;
+               led-usb2 = &led_usb2;
        };
 
        memory@0 {
                reg = <0x0 0x4000000>;
        };
 
-       fpi@10000000 {
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               exin3 {
-                                       lantiq,groups = "exin3";
-                                       lantiq,function = "exin";
-                               };
-                               stp {
-                                       lantiq,groups = "stp";
-                                       lantiq,function = "stp";
-                               };
-                               nand {
-                                       lantiq,groups = "nand cle", "nand ale",
-                                                       "nand rd", "nand rdy";
-                                       lantiq,function = "ebu";
-                               };
-                               mdio {
-                                       lantiq,groups = "mdio";
-                                       lantiq,function = "mdio";
-                               };
-                               pci {
-                                       lantiq,groups = "gnt1", "req1";
-                                       lantiq,function = "pci";
-                               };
-                               conf_out {
-                                       lantiq,pins = "io24", "io13", "io49", /* nand cle, ale and rd */
-                                                       "io4", "io5", "io6", /* stp */
-                                                       "io21",
-                                                       "io33";
-                                       lantiq,open-drain;
-                                       lantiq,pull = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               pcie-rst {
-                                       lantiq,pins = "io38";
-                                       lantiq,pull = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               conf_in {
-                                       lantiq,pins = "io39", /* exin3 */
-                                                       "io48"; /* nand rdy */
-                                       lantiq,pull = <2>;
-                               };
-                       };
-                       pins_spi_default: pins_spi_default {
-                               spi_in {
-                                       lantiq,groups = "spi_di";
-                                       lantiq,function = "spi";
-                               };
-                               spi_out {
-                                       lantiq,groups = "spi_do", "spi_clk",
-                                               "spi_cs4";
-                                       lantiq,function = "spi";
-                                       lantiq,output = <1>;
-                               };
-                       };
-               };
-
-               stp: stp@E100BB0 {
-                       compatible = "lantiq,gpio-stp-xway";
-                       reg = <0xE100BB0 0x40>;
-                       #gpio-cells = <2>;
-                       gpio-controller;
-
-                       lantiq,shadow = <0xffff>;
-                       lantiq,groups = <0x7>;
-                       lantiq,dsl = <0x3>;
-                       lantiq,phy1 = <0x7>;
-                       lantiq,phy2 = <0x7>;
-                       /* lantiq,rising; */
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-                       lantiq,portmask = <0x3>;
-               };
-       };
-
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
                firmware1 = "lantiq/xrx200_phy11g_a14.bin";
                        label = "easy80920:green:fxo";
                        gpios = <&stp 19 GPIO_ACTIVE_HIGH>;
                };
-               usb1: usb1 {
+               led_usb1: usb1 {
                        label = "easy80920:green:usb1";
                        gpios = <&stp 18 GPIO_ACTIVE_HIGH>;
                };
-               usb2: usb2 {
+               led_usb2: usb2 {
                        label = "easy80920:green:usb2";
                        gpios = <&stp 15 GPIO_ACTIVE_HIGH>;
                };
        };
 };
 
-&spi {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pins_spi_default>;
-
-       status = "ok";
-
-       m25p80@4 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "jedec,spi-nor";
-               reg = <4 0>;
-               spi-max-frequency = <1000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               reg = <0x0 0x20000>;
-                               label = "SPI (RO) U-Boot Image";
-                               read-only;
-                       };
-
-                       partition@20000 {
-                               reg = <0x20000 0x10000>;
-                               label = "ENV_MAC";
-                               read-only;
-                       };
-
-                       partition@30000 {
-                               reg = <0x30000 0x10000>;
-                               label = "DPF";
-                               read-only;
-                       };
-
-                       partition@40000 {
-                               reg = <0x40000 0x10000>;
-                               label = "NVRAM";
-                               read-only;
-                       };
-
-                       partition@500000 {
-                               reg = <0x50000 0x003a0000>;
-                               label = "kernel";
-                       };
-               };
-       };
-};
-
 &eth0 {
        lan: interface@0 {
                compatible = "lantiq,xrx200-pdi";
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "lantiq,xrx200-mdio";
+               reg = <0>;
+
                phy0: ethernet-phy@0 {
                        reg = <0x0>;
                        compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
                };
        };
 };
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               exin3 {
+                       lantiq,groups = "exin3";
+                       lantiq,function = "exin";
+               };
+               stp {
+