lantiq: improve ARV7519RW22 support

- use full board name
- rename uboot-env partition
- add dsl_fw partition
- remove unneeded pinmux groups
- move gigabit ethernet to LAN
- load mac address from mtd

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Backport of r42180

SVN-Revision: 42359

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index 22dea2a321b0b65dab67a614eb172b1f48120139..2dee0c174f9c75ed7c2ca082dac0f6e9bd089d07 100644 (file)
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -156,7 +156,7 @@ TDW8970)
        wan_mac=$(macaddr_add "$lan_mac" 1)
        ;;
 
-ARV7519*)
+ARV7519RW22)
        lan_mac=$(mtd_get_mac_binary boardconfig 22)
        wan_mac=$(macaddr_add "$lan_mac" 1)
        ;;

diff --git a/target/linux/lantiq/dts/ARV7519RW.dtsi b/target/linux/lantiq/dts/ARV7519RW.dtsi
index eff337e2a6da8b9e7bc24f4eb161cc0a556d94ea..d2d083f8709a905d9ea4933317c4a4686fa4346c 100644 (file)
--- a/target/linux/lantiq/dts/ARV7519RW.dtsi
+++ b/target/linux/lantiq/dts/ARV7519RW.dtsi
@@ -1,7 +1,7 @@
 /include/ "vr9.dtsi"
 
 / {
-       model = "ARV7519 - Astoria Networks ARV7519RW22-A-LT";
+       model = "ARV7519RW22 - Astoria Networks ARV7519RW22-A-LT";
 
        chosen {
                bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
@@ -27,17 +27,22 @@
                                };
 
                                partition@60000 {
-                                       label = "uboot_cfg";
+                                       label = "uboot-env";
                                        reg = <0x60000 0x20000>;
                                        read-only;
                                };
 
                                partition@80000 {
                                        label = "firmware";
-                                       reg = <0x80000 0x1f00000>;
+                                       reg = <0x80000 0x1e00000>;
                                };
 
-                               partition@1f80000 {
+                               partition@1e80000 {
+                                       label = "dsl_fw";
+                                       reg = <0x1e80000 0x100000>;
+                               };
+
+                               boardconfig: partition@1f80000 {
                                        label = "boardconfig";
                                        reg = <0x1f80000 0x80000>;
                                        read-only;
@@ -54,19 +59,6 @@
                                        lantiq,groups = "mdio";
                                        lantiq,function = "mdio";
                                };
-                               gphy-leds {
-                                       lantiq,groups = "gphy0 led1", "gphy1 led1";
-                                       lantiq,function = "gphy";
-                                       lantiq,pull = <2>;
-                                       lantiq,open-drain = <0>;
-                                       lantiq,output = <1>;
-                               };
-                               phy-rst {
-                                       lantiq,pins = "io42";
-                                       lantiq,pull = <0>;
-                                       lantiq,open-drain = <0>;
-                                       lantiq,output = <1>;
-                               };
                                pcie-rst {
                                        lantiq,pins = "io21";
                                        lantiq,pull = <0>;
@@ -92,8 +84,15 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
                                reg = <0>;
-                               mac-address = [ 00 11 22 33 44 55 ];
+                               mtd-mac-address = <&boardconfig 0x16>;
+                               lantiq,switch;
 
+                               ethernet@0 {
+                                       compatible = "lantiq,xrx200-pdi-port";
+                                       reg = <0>;
+                                       phy-mode = "rgmii";
+                                       phy-handle = <&phy0>;
+                               };
                                ethernet@1 {
                                        compatible = "lantiq,xrx200-pdi-port";
                                        reg = <4>;
@@ -120,21 +119,6 @@
                                };
                        };
 
-                       wan: interface@1 {
-                               compatible = "lantiq,xrx200-pdi";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               reg = <1>;
-                               mac-address = [ 00 11 22 33 44 56 ];
-                               lantiq,wan;
-                               ethernet@0 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <0>;
-                                       phy-mode = "rgmii";
-                                       phy-handle = <&phy0>;
-                               };
-                       };
-
                        mdio@0 {
                                #address-cells = <1>;
                                #size-cells = <0>;