Changeset 42549

Timestamp:

2014-09-15T12:19:14+02:00 (3 years ago)

Author:

blogic

Message:

ar71xx: add board support for ubnt loco m xw

Signed-off-by: Alexander Couzens <lynxis@…>

Location:

trunk/target/linux/ar71xx

Files:

• base-files/etc/diag.sh (modified) (1 diff)
• base-files/etc/uci-defaults/01_leds (modified) (1 diff)
• base-files/etc/uci-defaults/02_network (modified) (1 diff)
• base-files/lib/ar71xx.sh (modified) (1 diff)
• base-files/lib/upgrade/platform.sh (modified) (1 diff)
• image/Makefile (modified) (2 diffs)
• patches-3.10/616-MIPS-ath79-ubnt-xw.patch (modified) (2 diffs)
• patches-3.10/722-MIPS-ath79-add-airGateway-support.patch (modified) (2 diffs)

trunk/target/linux/ar71xx/base-files/etc/diag.sh

@@ -35 +35 @@
                 status_led="aw-nr580:green:ready"
                 ;;
-        bullet-m | rocket-m | nano-m | nanostation-m | nanostation-m-xw)
+        bullet-m | rocket-m | nano-m | nanostation-m | nanostation-m-xw | loco-m-xw)
                 status_led="ubnt:green:link4"
                 ;;

trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds

@@ -39 +39 @@
 nanostation-m | \
 rocket-m | \
-nanostation-m-xw)
+nanostation-m-xw | \
+loco-m-xw)
         ucidef_set_led_rssi "rssilow" "RSSILOW" "ubnt:red:link1" "wlan0" "1" "100" "0" "13"
         ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "ubnt:orange:link2" "wlan0" "26" "100" "-25" "13"

trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network

@@ -287 +287 @@
 eap300v2 |\
 eap7660d |\
+loco-m-xw |\
 mr600 |\
 mr600v2 |\

trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh

@@ -353 +353 @@
                 name="bullet-m"
                 ;;
+        *"Loco M XW")
+                name="loco-m-xw"
+                ;;
         *"Nanostation M")
                 name="nanostation-m"

trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh

@@ -191 +191 @@
         airrouter | \
         bullet-m | \
+        loco-m-xw | \
         nanostation-m | \
         rocket-m | \

trunk/target/linux/ar71xx/image/Makefile

@@ -1247 +1247 @@
 $(eval $(call SingleProfile,UBNTXM,64kraw,UBNTUNIFIOUTDOOR,ubnt-unifi-outdoor,UBNT-U20,ttyS0,115200,XM,BZ,ar7240))
 $(eval $(call SingleProfile,UBNTXM,64kraw,UBNTNANOMXW,ubnt-nano-m-xw,UBNT-NM-XW,ttyS0,115200,XM,XW,ar934x))
+$(eval $(call SingleProfile,UBNTXM,64kraw,UBNTLOCOXW,ubnt-loco-m-xw,UBNT-LOCO-XW,ttyS0,115200,XM,XW,ar934x))
 $(eval $(call SingleProfile,UBNTXM,64kraw,UBNTAIRGW,ubnt-air-gateway,UBNT-AGW,ttyATH0,115200,XM,AirGW,ar933x))
 
@@ -1292 +1293 @@
 $(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 TLWDR4300V1IL TLWDR4310V1 MW4530RV1))
 $(eval $(call MultiProfile,TUBE2H,TUBE2H8M TUBE2H16M))
-$(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTNANOMXW UBNTUNIFI UBNTUNIFIOUTDOOR UAPPRO UBNTAIRGW))
+$(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTNANOMXW UBNTLOCOXW UBNTUNIFI UBNTUNIFIOUTDOOR UAPPRO UBNTAIRGW))
 $(eval $(call MultiProfile,WNDR3700,WNDR3700V1 WNDR3700V2 WNDR3800 WNDR3800CH WNDRMAC WNDRMACV2))
 $(eval $(call MultiProfile,WNR612V2,REALWNR612V2 N150R))

trunk/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch

@@ -1 @@
-Index: linux-3.10.49/arch/mips/ath79/mach-ubnt-xm.c
-===================================================================
---- linux-3.10.49.orig/arch/mips/ath79/mach-ubnt-xm.c   2014-08-15 22:55:37.890080659 +0200
-+++ linux-3.10.49/arch/mips/ath79/mach-ubnt-xm.c        2014-08-15 22:58:31.061570912 +0200
-@@ -332,3 +332,67 @@
+--- a/arch/mips/ath79/mach-ubnt-xm.c
++++ b/arch/mips/ath79/mach-ubnt-xm.c
+@@ -332,3 +332,78 @@ static void __init ubnt_uap_pro_setup(vo
  MIPS_MACHINE(ATH79_MACH_UBNT_UAP_PRO, "UAP-PRO", "Ubiquiti UniFi AP Pro",
              ubnt_uap_pro_setup);
@@ -68 +66 @@
 +}
 +
++static void __init ubnt_loco_m_xw_setup(void)
++{
++       ubnt_xw_init();
++
++       ath79_register_mdio(0, ~BIT(1));
++       ath79_eth0_data.phy_mask = BIT(1);
++       ath79_register_eth(0);
++}
++
 +MIPS_MACHINE(ATH79_MACH_UBNT_NANO_M_XW, "UBNT-NM-XW", "Ubiquiti Nanostation M XW",
 +            ubnt_nano_m_xw_setup);
 +
++MIPS_MACHINE(ATH79_MACH_UBNT_LOCO_M_XW, "UBNT-LOCO-XW", "Ubiquiti Loco M XW",
++            ubnt_loco_m_xw_setup);
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -121,9 +121,10 @@ enum ath79_mach_type {
+@@ -121,9 +121,11 @@ enum ath79_mach_type {
         ATH79_MACH_TL_WR941ND,          /* TP-LINK TL-WR941ND */
         ATH79_MACH_UBNT_AIRROUTER,      /* Ubiquiti AirRouter */
         ATH79_MACH_UBNT_BULLET_M,       /* Ubiquiti Bullet M */
++       ATH79_MACH_UBNT_LOCO_M_XW,      /* Ubiquiti Loco M XW */
         ATH79_MACH_UBNT_LSSR71,         /* Ubiquiti LS-SR71 */
         ATH79_MACH_UBNT_LSX,            /* Ubiquiti LSX */

trunk/target/linux/ar71xx/patches-3.10/722-MIPS-ath79-add-airGateway-support.patch

@@ -13 +13 @@
  #include "dev-eth.h"
  #include "dev-gpio-buttons.h"
-@@ -389,3 +391,65 @@ static void __init ubnt_nano_m_xw_setup(
+@@ -406,3 +408,65 @@ MIPS_MACHINE(ATH79_MACH_UBNT_NANO_M_XW,
  
- MIPS_MACHINE(ATH79_MACH_UBNT_NANO_M_XW, "UBNT-NM-XW", "Ubiquiti Nanostation M XW",
-             ubnt_nano_m_xw_setup);
+ MIPS_MACHINE(ATH79_MACH_UBNT_LOCO_M_XW, "UBNT-LOCO-XW", "Ubiquiti Loco M XW",
+             ubnt_loco_m_xw_setup);
 +
 +static struct gpio_led ubnt_airgateway_gpio_leds[] __initdata = {
@@ -88 +88 @@
         ATH79_MACH_UBNT_AIRROUTER,      /* Ubiquiti AirRouter */
         ATH79_MACH_UBNT_BULLET_M,       /* Ubiquiti Bullet M */
-        ATH79_MACH_UBNT_LSSR71,         /* Ubiquiti LS-SR71 */
+        ATH79_MACH_UBNT_LOCO_M_XW,      /* Ubiquiti Loco M XW */