[OpenWrt-Devel] [PATCH] ar71xx: Add support for ZyXEL NBG6616.
Benjamin Berg
benjamin at sipsolutions.net
Thu Oct 29 08:15:53 EDT 2015
Signed-off-by: Benjamin Berg <benjamin at sipsolutions.net>
---
target/linux/ar71xx/base-files/etc/diag.sh | 3 +
.../etc/hotplug.d/firmware/11-ath10k-caldata | 2 +
.../ar71xx/base-files/etc/uci-defaults/01_leds | 7 ++
.../ar71xx/base-files/etc/uci-defaults/02_network | 2 +-
target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +
.../ar71xx/base-files/lib/upgrade/platform.sh | 1 +
.../ar71xx/files/arch/mips/ath79/mach-nbg6716.c | 127 +++++++++++++++++++--
target/linux/ar71xx/generic/profiles/zyxel.mk | 12 ++
target/linux/ar71xx/image/Makefile | 29 +++++
.../700-MIPS-ath79-openwrt-machines.patch | 5 +-
10 files changed, 177 insertions(+), 14 deletions(-)
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 1375f38..548c223 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -173,6 +173,9 @@ get_status_led() {
nbg460n_550n_550nh)
status_led="nbg460n:green:power"
;;
+ nbg6616)
+ status_led="zyxel:green:power"
+ ;;
nbg6716)
status_led="zyxel:white:power"
;;
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 f53c853..74c3417 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
@@ -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
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index abed456..b25ac34 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -306,6 +306,13 @@ nbg460n_550n_550nh)
ucidef_set_led_wlan "wlan" "WLAN" "nbg460n:green:wlan" "phy0tpt"
;;
+nbg6616)
+ ucidef_set_led_wlan "wlan" "WLAN" "zyxel:green:wifi2g" "phy1tpt"
+ ucidef_set_led_wlan "wlan5" "WLAN5" "zyxel:green:wifi5g" "phy0tpt"
+ ucidef_set_led_usbdev "usb1" "USB1" "zyxel:green:usb1" "1-1"
+ ucidef_set_led_usbdev "usb2" "USB2" "zyxel: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"
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index f6ac891..d8c575d 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -134,7 +134,7 @@ nbg460n_550n_550nh)
ucidef_add_switch_vlan "switch0" "0" "0 1 2 3 5"
;;
-nbg6716)
+nbg6716|nbg6616)
ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 5f02e4e..d39e179 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -568,6 +568,9 @@ ar71xx_board_detect() {
*"Zyxel NBG6716")
name="nbg6716"
;;
+ *"Zyxel NBG6616")
+ name="nbg6616"
+ ;;
*OM2P)
name="om2p"
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index a464fee..ae498b9 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -405,6 +405,7 @@ platform_check_image() {
return 1
;;
+ nbg6616 | \
unifi-outdoor-plus | \
uap-pro)
[ "$magic_long" != "19852003" ] && {
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
index 69a73cc..ecb1799 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
@@ -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,6 +66,11 @@
#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",
@@ -147,6 +152,69 @@ static struct gpio_keys_button nbg6716_gpio_keys[] __initdata = {
},
};
+
+
+static struct gpio_led nbg6616_leds_gpio[] __initdata = {
+ {
+ .name = "zyxel:green:power",
+ .gpio = NBG6716_GPIO_LED_POWER,
+ .active_low = 1,
+ },
+ {
+ .name = "zyxel:green:usb2",
+ .gpio = NBG6616_GPIO_LED_USB0,
+ .active_low = 1,
+ },
+ {
+ .name = "zyxel:green:usb1",
+ .gpio = NBG6616_GPIO_LED_USB1,
+ .active_low = 1,
+ },
+ {
+ .name = "zyxel:green:wifi2g",
+ .gpio = NBG6716_GPIO_LED_WIFI2G,
+ .active_low = 1,
+ },
+ {
+ .name = "zyxel:green:wifi5g",
+ .gpio = NBG6716_GPIO_LED_WIFI5G,
+ .active_low = 1,
+ },
+ {
+ .name = "zyxel: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);
+
diff --git a/target/linux/ar71xx/generic/profiles/zyxel.mk b/target/linux/ar71xx/generic/profiles/zyxel.mk
index 66258bd..202c237 100644
--- a/target/linux/ar71xx/generic/profiles/zyxel.mk
+++ b/target/linux/ar71xx/generic/profiles/zyxel.mk
@@ -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-usb-storage kmod-rtc-pcf8563 kmod-ath10k
+endef
+
+define Profile/NBG6616/Description
+ Package set optimized for the ZyXEL NBG6616
+endef
+
+$(eval $(call Profile,NBG6616))
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index a659af9..eb2097c 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -1469,6 +1469,7 @@ zcn1523h_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6208k(rootfs
mynet_n600_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(devdata)ro,64k(devconf)ro,15872k(firmware),64k(radiocfg)ro
mynet_rext_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,7808k(firmware),64k(nvram)ro,64k(ART)ro
zyx_nbg6716_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(env)ro,64k(RFdata)ro,-(nbu);ar934x-nfc:2048k(zyxel_rfsd),2048k(romd),1024k(header),2048k(kernel),-(ubi)
+zyx_nbg6616_mtdlayout=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 at 0x120000(firmware)
qihoo_c301_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(devdata),64k(devconf),15744k(firmware),64k(warm_start),64k(action_image_config),64k(radiocfg)ro;spi0.1:15360k(upgrade2),1024k(privatedata)
@@ -2181,6 +2182,33 @@ define Image/Build/ZyXELNAND
$(call Image/Build/SysupgradeNAND,$(2),squashfs,$(KDIR_TMP)/$(2)-kernel.jffs2)
endef
+define Image/Build/ZyXELjffs/buildkernel
+ $(eval kernelsize=$(call mtdpartsize,kernel,$(5)))
+ $(call MkuImageLzma,$(2),$(3) $(5) $(6))
+ mkdir -p $(KDIR_TMP)/$(2)/image/boot
+ cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR_TMP)/$(2)/image/boot/vmlinux.lzma.uImage
+ $(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
+ --pad=$(kernelsize) --big-endian --squash-uids -v -e 64KiB \
+ -o $(KDIR_TMP)/$(2)-kernel.jffs2 \
+ -d $(KDIR_TMP)/$(2)/image \
+ 2>&1 1>/dev/null | awk '/^.+$$$$/'
+ -rm -rf $(KDIR_TMP)/$(2)
+endef
+
+define Image/Build/ZyXELjffs
+ # 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 64kB and is filled with 0xff. The format seems to be:
+ # 2 bytes: 0x0000
+ # 2 bytes: a 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)
+ # 32 bytes: Model (e.g. "NBG6616", NUL termiated, 0xff padded)
+ # rest: 0xff padding
+ $(eval fwsize=$(call mtdpartsize,firmware,$(4)))
+ $(call CatFiles,$(KDIR_TMP)/$(2)-kernel.jffs2,0,$(KDIR)/root.$(1),$(fwsize),$(call sysupname,$(1),$(2)),64)
+endef
+
Image/Build/OpenMesh/buildkernel=$(call MkuImageLzma,$(2))
@@ -2407,6 +2435,7 @@ $(eval $(call SingleProfile,Zcomax,64k,ZCN1523H28,zcn-1523h-2-8,ZCN-1523H-2,ttyS
$(eval $(call SingleProfile,Zcomax,64k,ZCN1523H516,zcn-1523h-5-16,ZCN-1523H-5,ttyS0,115200,$$(zcn1523h_mtdlayout)))
$(eval $(call SingleProfile,ZyXEL,64k,NBG_460N_550N_550NH,nbg460n_550n_550nh,NBG460N,ttyS0,115200,NBG-460N))
+$(eval $(call SingleProfile,ZyXELjffs,64k,NBG6616,nbg6616,NBG6616,ttyS0,115200,NBG6616,$$(zyx_nbg6616_mtdlayout),mem=128M))
$(eval $(call MultiProfile,AP121,AP121_2M AP121_4M AP121_8M))
$(eval $(call MultiProfile,AP136,AP136_010 AP136_020))
diff --git a/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch
index 17cabe1..a82e6b5 100644
--- a/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch
@@ -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,
@@ -76,6 +76,7 @@
+ ATH79_MACH_MZK_W300NH, /* Planex MZK-W300NH */
+ ATH79_MACH_NBG460N, /* Zyxel NBG460N/550N/550NH */
+ ATH79_MACH_NBG6716, /* Zyxel NBG6716 */
++ ATH79_MACH_NBG6616, /* Zyxel NBG6616 */
+ ATH79_MACH_OM2P_HSv2, /* OpenMesh OM2P-HSv2 */
+ ATH79_MACH_OM2P_HS, /* OpenMesh OM2P-HS */
+ ATH79_MACH_OM2P_LC, /* OpenMesh OM2P-LC */
@@ -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
--
2.6.2
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list