diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-09-24 18:45:56 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-09-24 18:45:56 +0000 |
| commit | e70ad61e4451ec23e843ba00365ac7e928392adf (patch) | |
| tree | 44b74b048516d2df72246d669dc259f2b5bf044b /target/linux/ar71xx/files/arch | |
| parent | 1cd6237979dafaa5d1e7ec9502dc022015bbc795 (diff) | |
| download | upstream-e70ad61e4451ec23e843ba00365ac7e928392adf.tar.gz upstream-e70ad61e4451ec23e843ba00365ac7e928392adf.tar.bz2 upstream-e70ad61e4451ec23e843ba00365ac7e928392adf.zip | |
ar71xx: use different machtype and setup for the TL-MR3040
Should fix #12211. Compile tested only.
SVN-Revision: 33535
Diffstat (limited to 'target/linux/ar71xx/files/arch')
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c index 87facff7f7..6b28207115 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c @@ -1,5 +1,5 @@ /* - * TP-LINK TL-MR11U board support + * TP-LINK TL-MR11U/TL-MR3040 board support * * Copyright (C) 2011 dongyuqi <729650915@qq.com> * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org> @@ -29,6 +29,7 @@ #define TL_MR11U_GPIO_BTN_RESET 11 #define TL_MR11U_GPIO_USB_POWER 8 +#define TL_MR3040_GPIO_USB_POWER 18 #define TL_MR11U_KEYS_POLL_INTERVAL 20 /* msecs */ #define TL_MR11U_KEYS_DEBOUNCE_INTERVAL (3 * TL_MR11U_KEYS_POLL_INTERVAL) @@ -62,24 +63,24 @@ static struct gpio_led tl_mr11u_leds_gpio[] __initdata = { static struct gpio_keys_button tl_mr11u_gpio_keys[] __initdata = { { - .desc = "wps", + .desc = "reset", .type = EV_KEY, - .code = KEY_WPS_BUTTON, + .code = KEY_RESTART, .debounce_interval = TL_MR11U_KEYS_DEBOUNCE_INTERVAL, - .gpio = TL_MR11U_GPIO_BTN_WPS, + .gpio = TL_MR11U_GPIO_BTN_RESET, .active_low = 0, }, { - .desc = "reset", + .desc = "wps", .type = EV_KEY, - .code = KEY_RESTART, + .code = KEY_WPS_BUTTON, .debounce_interval = TL_MR11U_KEYS_DEBOUNCE_INTERVAL, - .gpio = TL_MR11U_GPIO_BTN_RESET, + .gpio = TL_MR11U_GPIO_BTN_WPS, .active_low = 0, - } + }, }; -static void __init tl_mr11u_setup(void) +static void __init common_setup(void) { u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); @@ -89,12 +90,7 @@ static void __init tl_mr11u_setup(void) ath79_register_m25p80(&tl_mr11u_flash_data); ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr11u_leds_gpio), tl_mr11u_leds_gpio); - ath79_register_gpio_keys_polled(-1, TL_MR11U_KEYS_POLL_INTERVAL, - ARRAY_SIZE(tl_mr11u_gpio_keys), - tl_mr11u_gpio_keys); - ath79_set_usb_power_gpio(TL_MR11U_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH, - "USB power"); ath79_register_usb(); ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0); @@ -106,5 +102,29 @@ static void __init tl_mr11u_setup(void) ath79_register_wmac(ee, mac); } +static void __init tl_mr11u_setup(void) +{ + common_setup(); + + ath79_register_gpio_keys_polled(-1, TL_MR11U_KEYS_POLL_INTERVAL, + ARRAY_SIZE(tl_mr11u_gpio_keys), + tl_mr11u_gpio_keys); + ath79_set_usb_power_gpio(TL_MR11U_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH, + "USB power"); +} + MIPS_MACHINE(ATH79_MACH_TL_MR11U, "TL-MR11U", "TP-LINK TL-MR11U", tl_mr11u_setup); + +static void __init tl_mr3040_setup(void) +{ + common_setup(); + + ath79_register_gpio_keys_polled(-1, TL_MR11U_KEYS_POLL_INTERVAL, + 1, tl_mr11u_gpio_keys); + ath79_set_usb_power_gpio(TL_MR3040_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH, + "USB power"); +} + +MIPS_MACHINE(ATH79_MACH_TL_MR3040, "TL-MR3040", "TP-LINK TL-MR3040", + tl_mr3040_setup); |