Skip to content
Snippets Groups Projects
0016-ar71xx-add-support-for-the-UniFi-AP-Outdoor-Plus.patch 6.89 KiB
Newer Older
  • Learn to ignore specific revisions
  • From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
    Date: Thu, 22 Jan 2015 09:35:46 +0000
    Subject: ar71xx: add support for the UniFi AP Outdoor Plus
    
    Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
    
    diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
    index f0d5d70..6aac86a 100755
    --- a/target/linux/ar71xx/base-files/etc/diag.sh
    +++ b/target/linux/ar71xx/base-files/etc/diag.sh
    @@ -244,6 +244,9 @@ get_status_led() {
     	uap-pro)
     		status_led="ubnt:white:dome"
     		;;
    +	unifi-outdoor-plus)
    +		status_led="ubnt:white:front"
    +		;;
     	airgateway)
     		status_led="ubnt:white:status"
     		;;
    diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
    index c03fe72..9e70397 100755
    --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
    +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
    @@ -723,6 +723,9 @@ ar71xx_board_detect() {
     	*"UniFiAP Outdoor")
     		name="unifi-outdoor"
     		;;
    +	*"UniFiAP Outdoor+")
    +		name="unifi-outdoor-plus"
    +		;;
     	*WP543)
     		name="wp543"
     		;;
    diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
    index e512f41..49746c4 100755
    --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
    +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
    @@ -363,6 +363,7 @@ platform_check_image() {
     		return 1
     		;;
     
    +	unifi-outdoor-plus | \
     	uap-pro)
     		[ "$magic_long" != "19852003" ] && {
     			echo "Invalid image type."
    @@ -467,6 +468,7 @@ platform_do_upgrade() {
     	om5p)
     		platform_do_upgrade_openmesh "$ARGV"
     		;;
    +	unifi-outdoor-plus | \
     	uap-pro)
     		MTD_CONFIG_ARGS="-s 0x180000"
     		default_do_upgrade "$ARGV"
    diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
    index ba16c7b..8505ac4 100644
    --- a/target/linux/ar71xx/image/Makefile
    +++ b/target/linux/ar71xx/image/Makefile
    @@ -1262,6 +1262,7 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,SMART-300,smart-300,SMART-300,tty
     $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,OOLITE,oolite,GS-OOLITE,ttyATH0,115200,0x3C000101,1,16Mlzma))
     
     $(eval $(call SingleProfile,UAPPRO,64k,UAPPRO,ubnt-uap-pro,UAP-PRO,ttyS0,115200,BZ,BZ,ar934x))
    +$(eval $(call SingleProfile,UAPPRO,64k,UBNTUNIFIOUTDOORPLUS,ubnt-unifi-outdoor-plus,UBNT-UOP,ttyS0,115200,BZ,BZ,ar7240))
     
     $(eval $(call SingleProfile,UBDEV,64kraw,UBDEV01,ubdev01,UBNT-UF,ttyS0,115200,XM,XM,ar7240))
     
    @@ -1324,7 +1325,7 @@ $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4 TLWR941NV5 T
     $(eval $(call MultiProfile,TLWR1043,TLWR1043V1 TLWR1043V2))
     $(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 UBNTLOCOXW UBNTUNIFI UBNTUNIFIOUTDOOR UAPPRO UBNTAIRGW))
    +$(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTNANOMXW UBNTLOCOXW UBNTUNIFI UBNTUNIFIOUTDOOR UBNTUNIFIOUTDOORPLUS UAPPRO UBNTAIRGW))
     $(eval $(call MultiProfile,WNDR3700,WNDR3700V1 WNDR3700V2 WNDR3800 WNDR3800CH WNDRMAC WNDRMACV2))
     $(eval $(call MultiProfile,WNR612V2,REALWNR612V2 N150R))
     $(eval $(call MultiProfile,WP543,WP543_2M WP543_4M WP543_8M WP543_16M))
    diff --git a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
    index 3722519..6bb8884 100644
    --- a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
    +++ b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
    @@ -1,6 +1,6 @@
     --- a/arch/mips/ath79/machtypes.h
     +++ b/arch/mips/ath79/machtypes.h
    -@@ -16,22 +16,146 @@
    +@@ -16,22 +16,147 @@
      
      enum ath79_mach_type {
      	ATH79_MACH_GENERIC = 0,
    @@ -120,6 +120,7 @@
      	ATH79_MACH_UBNT_UAP_PRO,	/* Ubiquiti UniFi AP Pro */
      	ATH79_MACH_UBNT_UNIFI, 		/* Ubiquiti Unifi */
      	ATH79_MACH_UBNT_UNIFI_OUTDOOR,	/* Ubiquiti UnifiAP Outdoor */
    ++	ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */
      	ATH79_MACH_UBNT_XM,		/* Ubiquiti Networks XM board rev 1.0 */
     +	ATH79_MACH_WHR_G301N,		/* Buffalo WHR-G301N */
     +	ATH79_MACH_WHR_HP_G300N,	/* Buffalo WHR-HP-G300N */
    diff --git a/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch b/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch
    index 5e3d4d4..3c3c273 100644
    --- a/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch
    +++ b/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch
    @@ -1,6 +1,65 @@
     --- 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
    +@@ -186,6 +186,19 @@ static struct gpio_led ubnt_unifi_outdoo
    + 	}
    + };
    + 
    ++static struct gpio_led ubnt_unifi_outdoor_plus_leds_gpio[] __initdata = {
    ++	{
    ++		.name		= "ubnt:white:front",
    ++		.gpio		= 1,
    ++		.active_low	= 0,
    ++	}, {
    ++		.name		= "ubnt:blue:front",
    ++		.gpio		= 0,
    ++		.active_low	= 0,
    ++	}
    ++};
    ++
    ++
    + static void __init ubnt_unifi_setup(void)
    + {
    + 	u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
    +@@ -245,6 +258,38 @@ MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI_OUTDO
    + 	     "Ubiquiti UniFiAP Outdoor",
    + 	     ubnt_unifi_outdoor_setup);
    + 
    ++
    ++static void __init ubnt_unifi_outdoor_plus_setup(void)
    ++{
    ++	u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
    ++	u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
    ++	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
    ++
    ++	ath79_register_m25p80(NULL);
    ++
    ++	ath79_register_mdio(0, ~(UBNT_UNIFIOD_PRI_PHYMASK |
    ++				 UBNT_UNIFIOD_2ND_PHYMASK));
    ++
    ++	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
    ++	ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
    ++	ath79_register_eth(0);
    ++	ath79_register_eth(1);
    ++
    ++	ap91_pci_init(ee, NULL);
    ++
    ++	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_plus_leds_gpio),
    ++				 ubnt_unifi_outdoor_plus_leds_gpio);
    ++
    ++	ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
    ++					ARRAY_SIZE(ubnt_xm_gpio_keys),
    ++					ubnt_xm_gpio_keys);
    ++}
    ++
    ++MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, "UBNT-UOP",
    ++	     "Ubiquiti UniFiAP Outdoor+",
    ++	     ubnt_unifi_outdoor_plus_setup);
    ++
    ++
    + static struct gpio_led ubnt_uap_pro_gpio_leds[] __initdata = {
    + 	{
    + 		.name		= "ubnt:white:dome",
    +@@ -332,3 +377,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);
      
    @@ -81,8 +140,8 @@
     +	     ubnt_loco_m_xw_setup);
     --- a/arch/mips/ath79/machtypes.h
     +++ b/arch/mips/ath79/machtypes.h
    -@@ -121,9 +121,11 @@ enum ath79_mach_type {
    - 	ATH79_MACH_TL_WR941ND,		/* TP-LINK TL-WR941ND */
    +@@ -123,9 +123,11 @@ enum ath79_mach_type {
    + 	ATH79_MACH_TL_WR941ND_V5,	/* TP-LINK TL-WR941ND v5 */
      	ATH79_MACH_UBNT_AIRROUTER,	/* Ubiquiti AirRouter */
      	ATH79_MACH_UBNT_BULLET_M,	/* Ubiquiti Bullet M */
     +	ATH79_MACH_UBNT_LOCO_M_XW, 	/* Ubiquiti Loco M XW */