ath79: improve support for GL.iNet GL-XE300

- fix eth0 eth1 sharing same mac so it conforms to the behavior stated
  in the original commit and the way it is in vendor firmware :
  WAN is label, LAN is label +1 and WLAN is label +2
- add default leds config
- add default network config

Signed-off-by: Pascal Coudurier <coudu@wanadoo.fr>

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts b/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
index 391d76c5dd8c908faa7a299b195b7bd976546f8b..9c2760398bd802b04381c9854f0eacd37b15cfa4 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
@@ -143,12 +143,12 @@
 
        nvmem-cells = <&macaddr_art_0>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        nvmem-cells = <&macaddr_art_0>;
        nvmem-cell-names = "mac-address";
+       mac-address-increment = <1>;
 };
 
 &wmac {

diff --git a/target/linux/ath79/nand/base-files/etc/board.d/01_leds b/target/linux/ath79/nand/base-files/etc/board.d/01_leds
index dc7d84df95792dd2dcd929c1575cd4a4bacad09b..e4932984577507f50aa7dc3c21d4d616c45c0e55 100644 (file)
--- a/target/linux/ath79/nand/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/nand/base-files/etc/board.d/01_leds
@@ -14,6 +14,10 @@ glinet,gl-ar300m-nand|\
 glinet,gl-ar300m-nor)
        ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ;;
+glinet,gl-xe300)
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
+       ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x10"
+       ;;
 netgear,r6100)
        ucidef_set_led_netdev "wan-green" "WAN (green)" "green:wan" "eth1"
        ;;

diff --git a/target/linux/ath79/nand/base-files/etc/board.d/02_network b/target/linux/ath79/nand/base-files/etc/board.d/02_network
index 417a881e5b6363cbc1ef463e45012c658fabef13..bda4eeb917dadbcffe36e000fba4008d90233d12 100644 (file)
--- a/target/linux/ath79/nand/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/nand/base-files/etc/board.d/02_network
@@ -25,6 +25,11 @@ ath79_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "0@eth0" "2:lan:2" "3:lan:1" "1:wan"
                ;;
+       glinet,gl-xe300)
+               ucidef_set_interface_wan "eth1"
+               ucidef_add_switch "switch0" \
+                       "0@eth0" "4:lan"
+               ;;
        netgear,r6100)
                ucidef_set_interface_wan "eth1"
                ucidef_add_switch "switch0" \