From f2f933235039d37fb360b77b9e73c5975c65e328 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 6 Jan 2013 11:11:42 +0000 Subject: [PATCH] adds support for Edimax BR-6524N fixes #12754 Signed-off-by: SVN-Revision: 35020 --- target/linux/ramips/base-files/etc/diag.sh | 3 + .../etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + .../ramips/base-files/etc/uci-defaults/leds | 3 + .../base-files/etc/uci-defaults/network | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 + .../mips/include/asm/mach-ralink/machine.h | 1 + .../files/arch/mips/ralink/rt288x/Kconfig | 5 ++ .../files/arch/mips/ralink/rt288x/Makefile | 1 + .../arch/mips/ralink/rt288x/mach-br6524n.c | 74 +++++++++++++++++++ target/linux/ramips/image/Makefile | 10 +++ target/linux/ramips/rt288x/config-3.6 | 1 + target/linux/ramips/rt288x/profiles/edimax.mk | 18 +++++ 12 files changed, 121 insertions(+) create mode 100644 target/linux/ramips/files/arch/mips/ralink/rt288x/mach-br6524n.c create mode 100644 target/linux/ramips/rt288x/profiles/edimax.mk diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index af05aceded..d8b913fca3 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -36,6 +36,9 @@ get_status_led() { argus-atp52b) status_led="argus-atp52b:green:run" ;; + br6524n) + status_led="edimax:blue:power" + ;; dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-615-h1 | dir-615-d | dir-620-a1) status_led="d-link:green:status" ;; diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index be6975c809..6bd2c922c8 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -59,6 +59,7 @@ case "$FIRMWARE" in argus-atp52b | \ bc2 | \ broadway | \ + br6524n | \ carambola | \ dir-615-h1 | \ dir-620-a1 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds b/target/linux/ramips/base-files/etc/uci-defaults/leds index b4dcdd1947..fa9c4f0ab4 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/leds @@ -36,6 +36,9 @@ case $board in set_usb_led "red:diskmounted" set_wifi_led "red:wps_active" ;; + br6524n) + set_wifi_led "edimax:blue:wlan" + ;; dir-300-b1|\ dir-600-b1|\ dir-600-b2|\ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network index 598074bb19..bbcdf6fde7 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ b/target/linux/ramips/base-files/etc/uci-defaults/network @@ -84,6 +84,7 @@ ramips_setup_interfaces() ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ;; + br6524n | \ v11st-fe) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 0128717e35..03b49e8f31 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -71,6 +71,9 @@ ramips_board_name() { *"Argus ATP-52B") name="argus-atp52b" ;; + *"BR6524N") + name="br6524n" + ;; *"Asus WL-330N") name="wl-330n" ;; diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h index 3a750df01d..bc183ab6ab 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h @@ -15,6 +15,7 @@ enum ramips_mach_type { RAMIPS_MACH_GENERIC, /* RT2880 based machines */ RAMIPS_MACH_F5D8235_V1, /* Belkin F5D8235 v1 */ + RAMIPS_MACH_BR6524N, /* Edimax BR6524N */ RAMIPS_MACH_RT_N15, /* Asus RT-N15 */ RAMIPS_MACH_V11ST_FE, /* Ralink V11ST-FE */ RAMIPS_MACH_WLI_TX4_AG300N, /* Buffalo WLI-TX4-AG300N */ diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/Kconfig b/target/linux/ramips/files/arch/mips/ralink/rt288x/Kconfig index 31dcc8132b..739561c640 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/Kconfig +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/Kconfig @@ -6,6 +6,11 @@ config RT288X_MACH_F5D8235_V1 bool "Belkin F5D8235 V1 board support" select RALINK_DEV_GPIO_LEDS +config RT288X_MACH_BR6524N + bool "Edimax BR6524N support" + select RALINK_DEV_GPIO_BUTTONS + select RALINK_DEV_GPIO_LEDS + config RT288X_MACH_RT_N15 bool "Asus RT-N15 board support" select RALINK_DEV_GPIO_BUTTONS diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile b/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile index 473f855998..eb60c5d10d 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile @@ -14,6 +14,7 @@ obj-y := irq.o setup.o rt288x.o devices.o clock.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_RT288X_MACH_F5D8235_V1) += mach-f5d8235-v1.o +obj-$(CONFIG_RT288X_MACH_BR6524N) += mach-br6524n.o obj-$(CONFIG_RT288X_MACH_RT_N15) += mach-rt-n15.o obj-$(CONFIG_RT288X_MACH_V11ST_FE) += mach-v11st-fe.o obj-$(CONFIG_RT288X_MACH_WLI_TX4_AG300N) += mach-wli-tx4-ag300n.o diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-br6524n.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-br6524n.c new file mode 100644 index 0000000000..ff4746cda5 --- /dev/null +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-br6524n.c @@ -0,0 +1,74 @@ +/* + * Edimax BR6524N board support + * + * Copyright (C) 2012 Florian Fainelli + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "devices.h" + +#define BR6524N_GPIO_STATUS_LED 12 +#define BR6524N_GPIO_BUTTON_WPS 0 + +#define BR6524N_KEYS_POLL_INTERVAL 20 +#define BR6524N_KEYS_DEBOUNCE_INTERVAL (3 * BR6524N_KEYS_POLL_INTERVAL) + +static struct gpio_led br6524n_leds_gpio[] __initdata = { + { + .name = "br6524n:green:status", + .gpio = BR6524N_GPIO_STATUS_LED, + .active_low = 1, + } +}; + +static struct gpio_keys_button br6524n_gpio_buttons[] __initdata = { + { + .desc = "wps", + .type = EV_KEY, + .code = KEY_WPS_BUTTON, + .debounce_interval = BR6524N_KEYS_DEBOUNCE_INTERVAL, + .gpio = BR6524N_GPIO_BUTTON_WPS, + } +}; + +static void __init br6524n_fe_init(void) +{ + rt288x_gpio_init(RT2880_GPIO_MODE_UART0); + + rt288x_register_flash(0); + + ramips_register_gpio_leds(-1, ARRAY_SIZE(br6524n_leds_gpio), + br6524n_leds_gpio); + + ramips_register_gpio_buttons(-1, BR6524N_KEYS_POLL_INTERVAL, + ARRAY_SIZE(br6524n_gpio_buttons), + br6524n_gpio_buttons); + + rt288x_register_wifi(); + + /* Board is connected to an IC+ IP175C Fast Ethernet switch */ + rt288x_eth_data.speed = SPEED_100; + rt288x_eth_data.duplex = DUPLEX_FULL; + rt288x_eth_data.tx_fc = 1; + rt288x_eth_data.rx_fc = 1; + rt288x_eth_data.phy_mask = BIT(0); + rt288x_register_ethernet(); + + rt288x_register_wdt(); +} + +MIPS_MACHINE(RAMIPS_MACH_BR6524N, "BR6524N", "Edimax BR6524N", br6524n_fe_init); diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 631be1d1a6..27ac10b981 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -259,6 +259,11 @@ define BuildFirmware/Edimax fi endef +define BuildFirmware/BR6524N + $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)) $(call mkmtd/$(6),$(mtdlayout_4M)),917484,2949120) + $(call BuildFirmware/Edimax,$(1),br6524n,CSYS,WNRA,0x50000,0xc00000) +endef + mtdlayout_f5d8235=320k(u-boot)ro,1536k(kernel),6208k(rootfs),64k(nvram),64k(factory),7744k@0x50000(firmware) mtd_f5d8235_kernel_part_size=1572864 mtd_f5d8235_rootfs_part_size=6356992 @@ -443,6 +448,10 @@ define Image/Build/Profile/F5D8235V1 $(call Image/Build/Template/$(fs_squash)/$(1),F5D8235,f5d8235v1,F5D8235_V1) endef +define Image/Build/Profile/BR6524N + $(call Image/Build/Template/$(fs_squash)/$(1),BR6524N,br6524n,BR6524N,ttyS1,57600,phys) +endef + define Image/Build/Profile/RTN15 $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,rt-n15,RT-N15,ttyS1,57600,phys) endef @@ -458,6 +467,7 @@ endef ifeq ($(CONFIG_RALINK_RT288X),y) define Image/Build/Profile/Default $(call Image/Build/Profile/F5D8235V1,$(1)) + $(call Image/Build/Profile/BR6524N,$(1)) $(call Image/Build/Profile/RTN15,$(1)) $(call Image/Build/Profile/V11STFE,$(1)) $(call Image/Build/Profile/WLITX4AG300N,$(1)) diff --git a/target/linux/ramips/rt288x/config-3.6 b/target/linux/ramips/rt288x/config-3.6 index eefe11eb12..e2a7c3c3a3 100644 --- a/target/linux/ramips/rt288x/config-3.6 +++ b/target/linux/ramips/rt288x/config-3.6 @@ -97,6 +97,7 @@ CONFIG_RALINK_RT288X=y CONFIG_RAMIPS_WDT=y CONFIG_RT288X_MACH_F5D8235_V1=y CONFIG_RT288X_MACH_RT_N15=y +CONFIG_RT288X_MACH_BR6524N=y CONFIG_RT288X_MACH_V11ST_FE=y CONFIG_RT288X_MACH_WLI_TX4_AG300N=y CONFIG_RT288X_MACH_WZR_AGL300NH=y diff --git a/target/linux/ramips/rt288x/profiles/edimax.mk b/target/linux/ramips/rt288x/profiles/edimax.mk new file mode 100644 index 0000000000..43ac818370 --- /dev/null +++ b/target/linux/ramips/rt288x/profiles/edimax.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/BR6524N + NAME:=Edimax BR6524N + PACKAGES:=kmod-switch-ip17xx kmod-swconfig swconfig +endef + +define Profile/BR6524N/Description + Package set for Edimax BR6524N +endef + +$(eval $(call Profile,BR6524N)) + -- 2.30.2