mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ar71xx: Add support for ZyXEL NBG6616.

Browse Source 
Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>

SVN-Revision: 47405
This commit is contained in:
Felix Fietkau 2015-11-07 12:51:39 +00:00
parent 46f6626052
commit ae7e7239b8
10 changed files with 194 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/ar71xx/base-files/etc/diag.sh
View File

@ -173,8 +173,11 @@ get_status_led() {
nbg460n_550n_550nh)
status_led="nbg460n:green:power"
;;
nbg6616)
status_led="nbg6616:green:power"
;;
nbg6716)
status_led="zyxel:white:power"
status_led="nbg6716:white:power"
;;
om2p | \
om2pv2 | \

2
target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View File

@ -84,8 +84,10 @@ case "$FIRMWARE" in
ath10kcal_extract "art" 20480 2116
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
;;
nbg6616 | \
nbg6716)
ath10kcal_extract "RFdata" 20480 2116
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
;;
rb-911g-5hpacd)
ath10kcal_from_file "/sys/firmware/routerboot/ext_wlan_data" 20480 2116

17
target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
View File

@ -306,12 +306,19 @@ nbg460n_550n_550nh)
ucidef_set_led_wlan "wlan" "WLAN" "nbg460n:green:wlan" "phy0tpt"
;;
nbg6616)
ucidef_set_led_wlan "wlan" "WLAN" "nbg6616:green:wifi2g" "phy1tpt"
ucidef_set_led_wlan "wlan5" "WLAN5" "nbg6616:green:wifi5g" "phy0tpt"
ucidef_set_led_usbdev "usb1" "USB1" "nbg6616:green:usb1" "1-1"
ucidef_set_led_usbdev "usb2" "USB2" "nbg6616:green:usb2" "2-1"
;;
nbg6716)
ucidef_set_led_netdev "wan" "WAN" "zyxel:white:internet" "eth1"
ucidef_set_led_wlan "wlan" "WLAN" "zyxel:white:wifi2g" "phy1tpt"
ucidef_set_led_wlan "wlan5" "WLAN5" "zyxel:white:wifi5g" "phy0tpt"
ucidef_set_led_usbdev "usb1" "USB1" "zyxel:white:usb1" "2-1"
ucidef_set_led_usbdev "usb2" "USB2" "zyxel:white:usb2" "1-1"
ucidef_set_led_netdev "wan" "WAN" "nbg6716:white:internet" "eth1"
ucidef_set_led_wlan "wlan" "WLAN" "nbg6716:white:wifi2g" "phy1tpt"
ucidef_set_led_wlan "wlan5" "WLAN5" "nbg6716:white:wifi5g" "phy0tpt"
ucidef_set_led_usbdev "usb1" "USB1" "nbg6716:white:usb1" "1-1"
ucidef_set_led_usbdev "usb2" "USB2" "nbg6716:white:usb2" "2-1"
;;
om2p | \

1
target/linux/ar71xx/base-files/etc/uci-defaults/02_network
View File

@ -134,6 +134,7 @@ nbg460n_550n_550nh)
ucidef_add_switch_vlan "switch0" "0" "0 1 2 3 5"
;;
nbg6616 |\
nbg6716)
ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
ucidef_add_switch "switch0" "1" "1"

3
target/linux/ar71xx/base-files/lib/ar71xx.sh
View File

@ -565,6 +565,9 @@ ar71xx_board_detect() {
*"NBG460N/550N/550NH")
name="nbg460n_550n_550nh"
;;
*"Zyxel NBG6616")
name="nbg6616"
;;
*"Zyxel NBG6716")
name="nbg6716"
;;

1
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
View File

@ -405,6 +405,7 @@ platform_check_image() {
return 1
;;
nbg6616 | \
unifi-outdoor-plus | \
uap-pro)
[ "$magic_long" != "19852003" ] && {

141
target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
View File

@ -1,5 +1,5 @@
/*
* ZyXEL NBG6716 board support
* ZyXEL NBG6716/NBG6616 board support
*
* Based on the Qualcomm Atheros AP135/AP136 reference board support code
* Copyright (c) 2012 Qualcomm Atheros
@ -66,39 +66,44 @@
#define NBG6716_WMAC_CALDATA_OFFSET 0x1000
#define NBG6716_PCIE_CALDATA_OFFSET 0x5000
/* NBG6616 has a different GPIO usage as it does not have USB Buttons */
#define NBG6616_GPIO_LED_USB0 14
#define NBG6616_GPIO_LED_USB1 21
#define NBG6616_GPIO_LED_WPS 0
static struct gpio_led nbg6716_leds_gpio[] __initdata = {
{
.name = "zyxel:white:internet",
.name = "nbg6716:white:internet",
.gpio = NBG6716_GPIO_LED_INTERNET,
.active_low = 1,
},
{
.name = "zyxel:white:power",
.name = "nbg6716:white:power",
.gpio = NBG6716_GPIO_LED_POWER,
.active_low = 1,
},
{
.name = "zyxel:white:usb1",
.name = "nbg6716:white:usb1",
.gpio = NBG6716_GPIO_LED_USB1,
.active_low = 1,
},
{
.name = "zyxel:white:usb2",
.name = "nbg6716:white:usb2",
.gpio = NBG6716_GPIO_LED_USB2,
.active_low = 1,
},
{
.name = "zyxel:white:wifi2g",
.name = "nbg6716:white:wifi2g",
.gpio = NBG6716_GPIO_LED_WIFI2G,
.active_low = 1,
},
{
.name = "zyxel:white:wifi5g",
.name = "nbg6716:white:wifi5g",
.gpio = NBG6716_GPIO_LED_WIFI5G,
.active_low = 1,
},
{
.name = "zyxel:white:wps",
.name = "nbg6716:white:wps",
.gpio = NBG6716_GPIO_LED_WPS,
.active_low = 1,
}
@ -147,6 +152,69 @@ static struct gpio_keys_button nbg6716_gpio_keys[] __initdata = {
},
};
static struct gpio_led nbg6616_leds_gpio[] __initdata = {
{
.name = "nbg6616:green:power",
.gpio = NBG6716_GPIO_LED_POWER,
.active_low = 1,
},
{
.name = "nbg6616:green:usb2",
.gpio = NBG6616_GPIO_LED_USB0,
.active_low = 1,
},
{
.name = "nbg6616:green:usb1",
.gpio = NBG6616_GPIO_LED_USB1,
.active_low = 1,
},
{
.name = "nbg6616:green:wifi2g",
.gpio = NBG6716_GPIO_LED_WIFI2G,
.active_low = 1,
},
{
.name = "nbg6616:green:wifi5g",
.gpio = NBG6716_GPIO_LED_WIFI5G,
.active_low = 1,
},
{
.name = "nbg6616:green:wps",
.gpio = NBG6616_GPIO_LED_WPS,
.active_low = 1,
}
};
static struct gpio_keys_button nbg6616_gpio_keys[] __initdata = {
{
.desc = "RESET button",
.type = EV_KEY,
.code = KEY_RESTART,
.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
.gpio = NBG6716_GPIO_BTN_RESET,
.active_low = 1,
},
{
.desc = "RFKILL button",
.type = EV_KEY,
.code = KEY_RFKILL,
.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
.gpio = NBG6716_GPIO_BTN_RFKILL,
.active_low = 1,
},
{
.desc = "WPS button",
.type = EV_KEY,
.code = KEY_WPS_BUTTON,
.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
.gpio = NBG6716_GPIO_BTN_WPS,
.active_low = 1,
},
};
static struct ar8327_pad_cfg nbg6716_ar8327_pad0_cfg;
static struct ar8327_pad_cfg nbg6716_ar8327_pad6_cfg;
static struct ar8327_led_cfg nbg6716_ar8327_led_cfg;
@ -179,9 +247,9 @@ static struct mdio_board_info nbg6716_mdio0_info[] = {
},
};
static void nbg6716_get_mac(const char *name, char *mac)
static void nbg6716_get_mac(void* nvram_addr, const char *name, char *mac)
{
u8 *nvram = (u8 *) KSEG1ADDR(0x1f040000);
u8 *nvram = (u8 *) KSEG1ADDR(nvram_addr);
int err;
err = ath79_nvram_parse_mac_addr(nvram, 0x10000,
@ -190,18 +258,19 @@ static void nbg6716_get_mac(const char *name, char *mac)
pr_err("no MAC address found for %s\n", name);
}
static void __init nbg6716_common_setup(void)
static void __init nbg6716_common_setup(u32 leds_num, struct gpio_led* leds,
u32 keys_num,
struct gpio_keys_button* keys,
void* art_addr, void* nvram)
{
u8 *art = (u8 *) KSEG1ADDR(0x1f050000);
u8 *art = (u8 *) KSEG1ADDR(art_addr);
u8 tmpmac[ETH_ALEN];
ath79_register_m25p80(NULL);
ath79_register_leds_gpio(-1, ARRAY_SIZE(nbg6716_leds_gpio),
nbg6716_leds_gpio);
ath79_register_leds_gpio(-1, leds_num, leds);
ath79_register_gpio_keys_polled(-1, NBG6716_KEYS_POLL_INTERVAL,
ARRAY_SIZE(nbg6716_gpio_keys),
nbg6716_gpio_keys);
keys_num, keys);
ath79_nfc_set_ecc_mode(AR934X_NFC_ECC_HW);
ath79_register_nfc();
@ -212,7 +281,7 @@ static void __init nbg6716_common_setup(void)
ath79_register_usb();
nbg6716_get_mac("ethaddr=", tmpmac);
nbg6716_get_mac(nvram, "ethaddr=", tmpmac);
ath79_register_pci();
@ -267,10 +336,46 @@ static void __init nbg6716_010_setup(void)
nbg6716_ar8327_led_cfg.led_ctrl2 = 0xffb7ffb7;
nbg6716_ar8327_led_cfg.led_ctrl3 = 0x03ffff00;
nbg6716_common_setup();
nbg6716_common_setup(ARRAY_SIZE(nbg6716_leds_gpio), nbg6716_leds_gpio,
ARRAY_SIZE(nbg6716_gpio_keys), nbg6716_gpio_keys,
(void*) 0x1f050000, (void*) 0x1f040000);
}
static void __init nbg6616_010_setup(void)
{
/* GMAC0 of the AR8337 switch is connected to GMAC0 via RGMII */
nbg6716_ar8327_pad0_cfg.mode = AR8327_PAD_MAC_RGMII;
nbg6716_ar8327_pad0_cfg.txclk_delay_en = true;
nbg6716_ar8327_pad0_cfg.rxclk_delay_en = true;
nbg6716_ar8327_pad0_cfg.txclk_delay_sel = AR8327_CLK_DELAY_SEL1;
nbg6716_ar8327_pad0_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2;
/* GMAC6 of the AR8337 switch is connected to GMAC1 via SGMII */
nbg6716_ar8327_pad6_cfg.mode = AR8327_PAD_MAC_SGMII;
nbg6716_ar8327_pad6_cfg.rxclk_delay_en = true;
nbg6716_ar8327_pad6_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL0;
ath79_eth0_pll_data.pll_1000 = 0xa6000000;
ath79_eth1_pll_data.pll_1000 = 0x03000101;
nbg6716_ar8327_led_cfg.open_drain = 0;
nbg6716_ar8327_led_cfg.led_ctrl0 = 0xffb7ffb7;
nbg6716_ar8327_led_cfg.led_ctrl1 = 0xffb7ffb7;
nbg6716_ar8327_led_cfg.led_ctrl2 = 0xffb7ffb7;
nbg6716_ar8327_led_cfg.led_ctrl3 = 0x03ffff00;
nbg6716_common_setup(ARRAY_SIZE(nbg6616_leds_gpio), nbg6616_leds_gpio,
ARRAY_SIZE(nbg6616_gpio_keys), nbg6616_gpio_keys,
(void*) 0x1f040000, (void*) 0x1f030000);
}
MIPS_MACHINE(ATH79_MACH_NBG6716, "NBG6716",
"Zyxel NBG6716",
nbg6716_010_setup);
MIPS_MACHINE(ATH79_MACH_NBG6616, "NBG6616",
"Zyxel NBG6616",
nbg6616_010_setup);

12
target/linux/ar71xx/generic/profiles/zyxel.mk
View File

@ -15,3 +15,15 @@ define Profile/NBG_460N_550N_550NH/Description
endef
$(eval $(call Profile,NBG_460N_550N_550NH))
define Profile/NBG6616
NAME:=ZyXEL NBG6616
PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-usb-storage kmod-rtc-pcf8563 kmod-ath10k
endef
define Profile/NBG6616/Description
Package set optimized for the ZyXEL NBG6616
endef
$(eval $(call Profile,NBG6616))

33
target/linux/ar71xx/image/Makefile
View File

@ -2055,6 +2055,39 @@ ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
endef
endif
define Device/NBG6616
BOARDNAME = NBG6616
KERNEL_SIZE = 2048k
IMAGE_SIZE = 15323k
MTDPARTS = spi0.0:192k(u-boot)ro,64k(env)ro,64k(RFdata)ro,384k(zyxel_rfsd),384k(romd),64k(header),2048k(kernel),13184k(rootfs),15232k@0x120000(firmware)
CMDLINE += mem=128M
IMAGES := sysupgrade.bin
KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | jffs2 boot/vmlinux.lzma.uImage
IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
# We cannot currently build a factory image. It is the sysupgrade image
# prefixed with a header (which is actually written into the MTD device).
# The header is 2kiB and is filled with 0xff. The format seems to be:
# 2 bytes: 0x0000
# 2 bytes: checksum of the data partition (big endian)
# 4 bytes: length of the contained image file (big endian)
# 32 bytes: Firmware Version string (NUL terminated, 0xff padded)
# 2 bytes: 0x0000
# 2 bytes: checksum over the header partition (big endian)
# 32 bytes: Model (e.g. "NBG6616", NUL termiated, 0xff padded)
# rest: 0xff padding
#
# The checksums are calculated by adding up all bytes and if a 16bit
# overflow occurs, one is added and the sum is masked to 16 bit:
# csum = csum + databyte; if (csum > 0xffff) { csum += 1; csum &= 0xffff };
# Should the file have an odd number of bytes then the byte len-0x800 is
# used additionally.
# The checksum for the header is calcualted over the first 2048 bytes with
# the firmware checksum as the placeholder during calculation.
#
# The header is padded with 0xff to the erase block size of the device.
endef
TARGET_DEVICES += NBG6616
define Image/Build/ZyXELNAND/buildkernel
$(eval kernelsize=$(call mtdpartsize,kernel,$(5)))

5
target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch
View File

@ -1,6 +1,6 @@
--- a/arch/mips/ath79/machtypes.h
+++ b/arch/mips/ath79/machtypes.h
@@ -16,24 +16,210 @@
@@ -16,24 +16,211 @@
enum ath79_mach_type {
ATH79_MACH_GENERIC = 0,
@ -75,6 +75,7 @@
+ ATH79_MACH_MZK_W04NU, /* Planex MZK-W04NU */
+ ATH79_MACH_MZK_W300NH, /* Planex MZK-W300NH */
+ ATH79_MACH_NBG460N, /* Zyxel NBG460N/550N/550NH */
+ ATH79_MACH_NBG6616, /* Zyxel NBG6616 */
+ ATH79_MACH_NBG6716, /* Zyxel NBG6716 */
+ ATH79_MACH_OM2P_HSv2, /* OpenMesh OM2P-HSv2 */
+ ATH79_MACH_OM2P_HS, /* OpenMesh OM2P-HS */
@ -1503,7 +1504,7 @@
+ select ATH79_DEV_WMAC
+
+config ATH79_MACH_NBG6716
+ bool "Zyxel NBG6716 board support"
+ bool "Zyxel NBG6616/NBG6716 board support"
+ select SOC_QCA955X
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS