lantiq: ARV4518PWR01* move redundant parts to dtsi

Signed-off-by: Mathias Kresin <openwrt@kresin.me>
SVN-Revision: 48033

diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dts b/target/linux/lantiq/dts/ARV4518PWR01.dts
index f2a2e188b9d557ade4d2f4c7bf44adea1a09ef26..7dfdb6fa503f9b1f99b25d13514d1c9d2871d411 100644 (file)
--- a/target/linux/lantiq/dts/ARV4518PWR01.dts
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dts
@@ -1,192 +1,15 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+/include/ "ARV4518PWR01.dtsi"
 
 / {
        model = "ARV4518PWR01 - SMC7908A-ISP";
 
-       chosen {
-               bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
-       };
-
-       memory@0 {
-               reg = <0x0 0x4000000>;
-       };
-
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 0>;
-               };
-       };
-
        fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #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>;
-                               };
-
-                               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>;
-                       };
-
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x3f0016 0x6>;
-                               mac-increment = <2>;
-                       };
-
-                       ath5k_eep {
-                               compatible = "ath5k,eeprom";
-                               reg = <0 0x3f0400 0x1000
-                                       0 0x3f0016 0x6>;
-                               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";
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 14 0>;
-               };
 
                pci@E105400 {
-                       status = "okay";
                        lantiq,internal-clock;
-                       gpio-reset = <&gpio 21 0>;
-                       req-mask = <0xf>;
-               };
-
-       };
-
-/*
-#define ARV4518PW_SWITCH_RESET          13
-*/
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <100>;
-
-               rfkill {
-                       label = "rfkill";
-                       gpios = <&gpio 28 1>;
-                       linux,code = <0xf7>;
-               };
-               reset {
-                       label = "reset";
-                       gpios = <&gpio 30 1>;
-                       linux,code = <0x198>;
                };
-       };
 
-       gpio-leds {
-               compatible = "gpio-leds";
-               power {
-                       label = "power";
-                       gpios = <&gpio 3 0>;
-               };
-               dsl {
-                       label = "dsl";
-                       gpios = <&gpio 4 1>;
-               };
-               online {
-                       label = "online";
-                       gpios = <&gpio 5 1>;
-               };
-               wifi {
-                       label = "wifi";
-                       gpios = <&gpio 6 1>;
-               };
-               wps {
-                       label = "wps";
-                       gpios = <&gpio 7 1>;
-               };
-               dsl2 {
-                       label = "dsl2";
-                       gpios = <&gpio 8 1>;
-               };
-               usb {
-                       label = "usb";
-                       gpios = <&gpio 19 1>;
-               };
-               voice {
-                       label = "voice";
-                       gpios = <&gpiomm 0 1>;
-               };
-               fxs1 {
-                       label = "fxs1";
-                       gpios = <&gpiomm 1 1>;
-               };
-               fxs2 {
-                       label = "fxs2";
-                       gpios = <&gpiomm 2 1>;
-               };
-               fxo {
-                       label = "fxo";
-                       gpios = <&gpiomm 3 1>;
-               };
        };
 };

diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
new file mode 100644 (file)
index 0000000..0699707
--- /dev/null
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
@@ -0,0 +1,184 @@
+/include/ "danube.dtsi"
+
+/ {
+       chosen {
+               bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
+       };
+
+       memory@0 {
+               reg = <0x0 0x4000000>;
+       };
+
+       sram@1F000000 {
+               vmmc@107000 {
+                       status = "okay";
+                       gpios = <&gpio 31 0>;
+               };
+       };
+
+       fpi@10000000 {
+               localbus@0 {
+                       nor-boot@0 {
+                               compatible = "lantiq,nor";
+                               bank-width = <2>;
+                               reg = <0 0x0 0x2000000>;
+                               #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>;
+                               };
+
+                               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>;
+                       };
+
+                       mac_addr {
+                               compatible = "lantiq,eth-mac";
+                               reg = <0 0x3f0016 0x6>;
+                               mac-increment = <2>;
+                       };
+
+                       ath5k_eep {
+                               compatible = "ath5k,eeprom";
+                               reg = <0 0x3f0400 0x1000
+                                       0 0x3f0016 0x6>;
+                               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";
+               };
+
+               ifxhcd@E101000 {
+                       status = "okay";
+                       gpios = <&gpio 14 0>;
+               };
+
+               pci@E105400 {
+                       status = "okay";
+                       gpio-reset = <&gpio 21 0>;
+                       req-mask = <0xf>;
+               };
+
+       };
+
+       gpio-keys-polled {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <100>;
+
+               rfkill {
+                       label = "rfkill";
+                       gpios = <&gpio 28 1>;
+                       linux,code = <0xf7>;
+               };
+               reset {
+                       label = "reset";
+                       gpios = <&gpio 30 1>;
+                       linux,code = <0x198>;
+               };
+       };
+
+       gpio-leds {
+               compatible = "gpio-leds";
+               power {
+                       label = "power";
+                       gpios = <&gpio 3 0>;
+               };
+               dsl {
+                       label = "dsl";
+                       gpios = <&gpio 4 1>;
+               };
+               online {
+                       label = "online";
+                       gpios = <&gpio 5 1>;
+               };
+               wifi {
+                       label = "wifi";
+                       gpios = <&gpio 6 1>;
+               };
+               wps {
+                       label = "wps";
+                       gpios = <&gpio 7 1>;
+               };
+               dsl2 {
+                       label = "dsl2";
+                       gpios = <&gpio 8 1>;
+               };
+               usb {
+                       label = "usb";
+                       gpios = <&gpio 19 1>;
+               };
+               voice {
+                       label = "voice";
+                       gpios = <&gpiomm 0 1>;
+               };
+               fxs1 {
+                       label = "fxs1";
+                       gpios = <&gpiomm 1 1>;
+               };
+               fxs2 {
+                       label = "fxs2";
+                       gpios = <&gpiomm 2 1>;
+               };
+               fxo {
+                       label = "fxo";
+                       gpios = <&gpiomm 3 1>;
+               };
+       };
+};

diff --git a/target/linux/lantiq/dts/ARV4518PWR01A.dts b/target/linux/lantiq/dts/ARV4518PWR01A.dts
index 221e5a0c25b5305112a7d7fdf31550611ac0afc2..39ef71b9dda49f8fecf48679621df619a8ef7c8a 100644 (file)
--- a/target/linux/lantiq/dts/ARV4518PWR01A.dts
+++ b/target/linux/lantiq/dts/ARV4518PWR01A.dts
@@ -1,192 +1,15 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+/include/ "ARV4518PWR01.dtsi"
 
 / {
        model = "ARV4518PWR01A - SMC7908A-ISP, Airties WAV-221";
 
-       chosen {
-               bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
-       };
-
-       memory@0 {
-               reg = <0x0 0x4000000>;
-       };
-
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 0>;
-               };
-       };
-
        fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x2000000>;
-                               #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>;
-                               };
-
-                               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>;
-                       };
-
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x3f0016 0x6>;
-                               mac-increment = <2>;
-                       };
-
-                       ath5k_eep {
-                               compatible = "ath5k,eeprom";
-                               reg = <0 0x3f0400 0x1000
-                                       0 0x3f0016 0x6>;
-                               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";
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 14 0>;
-               };
 
                pci@E105400 {
-                       status = "okay";
                        lantiq,external-clock;
-                       gpio-reset = <&gpio 21 0>;
-                       req-mask = <0xf>;
-               };
-
-       };
-
-/*
-#define ARV4518PW_SWITCH_RESET          13
-*/
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <100>;
-
-               rfkill {
-                       label = "rfkill";
-                       gpios = <&gpio 28 1>;
-                       linux,code = <0xf7>;
-               };
-               reset {
-                       label = "reset";
-                       gpios = <&gpio 30 1>;
-                       linux,code = <0x198>;
                };
-       };
 
-       gpio-leds {
-               compatible = "gpio-leds";
-               power {
-                       label = "power";
-                       gpios = <&gpio 3 0>;
-               };
-               dsl {
-                       label = "dsl";
-                       gpios = <&gpio 4 1>;
-               };
-               online {
-                       label = "online";
-                       gpios = <&gpio 5 1>;
-               };
-               wifi {
-                       label = "wifi";
-                       gpios = <&gpio 6 1>;
-               };
-               wps {
-                       label = "wps";
-                       gpios = <&gpio 7 1>;
-               };
-               dsl2 {
-                       label = "dsl2";
-                       gpios = <&gpio 8 1>;
-               };
-               usb {
-                       label = "usb";
-                       gpios = <&gpio 19 1>;
-               };
-               voice {
-                       label = "voice";
-                       gpios = <&gpiomm 0 1>;
-               };
-               fxs1 {
-                       label = "fxs1";
-                       gpios = <&gpiomm 1 1>;
-               };
-               fxs2 {
-                       label = "fxs2";
-                       gpios = <&gpiomm 2 1>;
-               };
-               fxo {
-                       label = "fxo";
-                       gpios = <&gpiomm 3 1>;
-               };
        };
 };