diff options
Diffstat (limited to 'target/linux')
10 files changed, 103 insertions, 4 deletions
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index 4cf7434b06..449af63ac0 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -418,6 +418,11 @@ wpj344) "0@eth0" "3:lan" "2:wan" ;; +unifiac-pro) + ucidef_add_switch "switch0" \ + "0@eth0" "2:lan" "3:wan" + ;; + wpj531) ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 71f5ebc643..3b5e299333 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -355,7 +355,8 @@ get_status_led() { status_led="ubnt:green:dome" ;; uap-pro | \ - unifiac-lite) + unifiac-lite | \ + unifiac-pro) status_led="ubnt:white:dome" ;; unifi-outdoor-plus) diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 3490129e25..d925a852d6 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -76,7 +76,8 @@ case "$FIRMWARE" in ath10kcal_extract "ART" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) ;; - unifiac-lite) + unifiac-lite | \ + unifiac-pro) ath10kcal_extract "EEPROM" 20480 2116 ;; esac diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index d05ef54954..6c2b51ae2b 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -952,6 +952,9 @@ ar71xx_board_detect() { *"UniFi-AC-LITE") name="unifiac-lite" ;; + *"UniFi-AC-PRO") + name="unifiac-pro" + ;; *"UniFi AP Pro") name="uap-pro" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 18d923767e..9b771b73ba 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -269,6 +269,7 @@ platform_check_image() { nbg460n_550n_550nh | \ unifi | \ unifiac-lite | \ + unifiac-pro | \ unifi-outdoor | \ carambola2 | \ weio ) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 622d9a72a3..79d2d9d452 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -1442,7 +1442,7 @@ config ATH79_MACH_UBNT select ATH79_DEV_USB config ATH79_MACH_UBNT_UNIFIAC - bool "Ubiquiti UniFi AC (LITE/LR) support" + bool "Ubiquiti UniFi AC (LITE/LR/PRO) support" select SOC_QCA956X select ATH79_DEV_AP9X_PCI if PCI select ATH79_DEV_ETH @@ -1450,6 +1450,7 @@ config ATH79_MACH_UBNT_UNIFIAC select ATH79_DEV_LEDS_GPIO select ATH79_DEV_M25P80 select ATH79_DEV_WMAC + select ATH79_DEV_USB config ATH79_MACH_WEIO bool "WeIO board" diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c index 31cbe30d3f..9194bc1c07 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c @@ -21,6 +21,7 @@ #include <asm/mach-ath79/ar71xx_regs.h> #include <linux/platform_data/phy-at803x.h> +#include <linux/ar8216_platform.h> #include "common.h" #include "dev-ap9x-pci.h" @@ -29,6 +30,7 @@ #include "dev-leds-gpio.h" #include "dev-m25p80.h" #include "dev-wmac.h" +#include "dev-usb.h" #include "machtypes.h" @@ -108,3 +110,70 @@ static void __init ubnt_unifiac_lite_setup(void) MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC_LITE, "UBNT-UF-AC-LITE", "Ubiquiti UniFi-AC-LITE", ubnt_unifiac_lite_setup); + +static struct ar8327_pad_cfg ubnt_unifiac_pro_ar8327_pad0_cfg = { + .mode = AR8327_PAD_MAC_SGMII, + .sgmii_delay_en = true, +}; + +static struct ar8327_platform_data ubnt_unifiac_pro_ar8327_data = { + .pad0_cfg = &ubnt_unifiac_pro_ar8327_pad0_cfg, + .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, + .txpause = 1, + .rxpause = 1, + }, +}; + + +static struct mdio_board_info ubnt_unifiac_pro_mdio0_info[] = { + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 0, + .platform_data = &ubnt_unifiac_pro_ar8327_data, + }, +}; + +static void __init ubnt_unifiac_pro_setup(void) +{ + u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000); + + ath79_register_m25p80(&ubnt_unifiac_flash_data); + + + ath79_init_mac(ath79_eth0_data.mac_addr, + eeprom + UNIFIAC_MAC0_OFFSET, 0); + + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + ath79_eth0_data.phy_mask = BIT(0); + + mdiobus_register_board_info(ubnt_unifiac_pro_mdio0_info, + ARRAY_SIZE(ubnt_unifiac_pro_mdio0_info)); + + ath79_register_mdio(0, 0x00); + ath79_register_eth(0); + + + ath79_register_usb(); + + + ath79_register_wmac(eeprom + UNIFIAC_WMAC_CALDATA_OFFSET, NULL); + + + ap91_pci_init(eeprom + UNIFIAC_PCI_CALDATA_OFFSET, NULL); + + + ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifiac_leds_gpio), + ubnt_unifiac_leds_gpio); + + ath79_register_gpio_keys_polled(-1, UNIFIAC_KEYS_POLL_INTERVAL, + ARRAY_SIZE(ubnt_unifiac_gpio_keys), + ubnt_unifiac_gpio_keys); +} + + +MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC_PRO, "UBNT-UF-AC-PRO", "Ubiquiti UniFi-AC-PRO", + ubnt_unifiac_pro_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index d83045cf29..7b4f67f5c4 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -220,6 +220,7 @@ enum ath79_mach_type { ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */ ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */ ATH79_MACH_UBNT_UNIFIAC_LITE, /* Ubiquiti Unifi AC LITE/LR */ + ATH79_MACH_UBNT_UNIFIAC_PRO, /* Ubiquiti Unifi AC PRO */ 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 */ diff --git a/target/linux/ar71xx/generic/profiles/ubnt.mk b/target/linux/ar71xx/generic/profiles/ubnt.mk index eac02406bb..69b83985bd 100644 --- a/target/linux/ar71xx/generic/profiles/ubnt.mk +++ b/target/linux/ar71xx/generic/profiles/ubnt.mk @@ -49,6 +49,17 @@ endef $(eval $(call Profile,UBNTUNIFIACLITE)) +define Profile/UBNTUNIFIACPRO + NAME:=Ubiquiti UniFi AP AC PRO + PACKAGES:=kmod-ath10k ath10k-firmware-qca988x kmod-usb-core kmod-usb-ohci kmod-usb2 +endef + +define Profile/UBNTUNIFIACPRO/Description + Package set optimized for the Ubiquiti UniFi AP AC PRO. +endef + +$(eval $(call Profile,UBNTUNIFIACPRO)) + define Profile/UBNTUNIFIOUTDOOR NAME:=Ubiquiti UniFiAP Outdoor PACKAGES:= diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index dba26672ab..4a9378cae3 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -1241,12 +1241,18 @@ define Device/ubnt-unifiac-lite BOARDNAME := UBNT-UF-AC-LITE endef +define Device/ubnt-unifiac-pro + $(Device/ubnt-unifiac) + DEVICE_PROFILE := UBNT UBNTUNIFIACPRO + BOARDNAME := UBNT-UF-AC-PRO +endef + define Device/ubnt-unifi-outdoor $(Device/ubnt-bz) BOARDNAME := UBNT-U20 DEVICE_PROFILE := UBNT UBNTUNIFIOUTDOOR endef -TARGET_DEVICES += ubnt-unifi ubnt-unifiac-lite ubnt-unifi-outdoor +TARGET_DEVICES += ubnt-unifi ubnt-unifiac-lite ubnt-unifiac-pro ubnt-unifi-outdoor define Device/ubnt-nano-m-xw $(Device/ubnt-xw) |