projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: use the tp-link parser on the tp-link boards
[openwrt.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
ar71xx
/
mach-tew-632brp.c
diff --git
a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
index bb4cee677e55d82d4ab3bf50c59a777d1b5f4a6f..b7f9cb683d008c53d434ede993b2a8a4412f4315 100644
(file)
--- a/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
+++ b/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
@@
-17,7
+17,7
@@
#include "machtype.h"
#include "devices.h"
#include "dev-m25p80.h"
#include "machtype.h"
#include "devices.h"
#include "dev-m25p80.h"
-#include "dev-ar9
13
x-wmac.h"
+#include "dev-ar9
xx
x-wmac.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "nvram.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "nvram.h"
@@
-28,7
+28,8
@@
#define TEW_632BRP_GPIO_BTN_WPS 12
#define TEW_632BRP_GPIO_BTN_RESET 21
#define TEW_632BRP_GPIO_BTN_WPS 12
#define TEW_632BRP_GPIO_BTN_RESET 21
-#define TEW_632BRP_BUTTONS_POLL_INTERVAL 20
+#define TEW_632BRP_KEYS_POLL_INTERVAL 20 /* msecs */
+#define TEW_632BRP_KEYS_DEBOUNCE_INTERVAL (3 * TEW_632BRP_KEYS_POLL_INTERVAL)
#define TEW_632BRP_CONFIG_ADDR 0x1f020000
#define TEW_632BRP_CONFIG_SIZE 0x10000
#define TEW_632BRP_CONFIG_ADDR 0x1f020000
#define TEW_632BRP_CONFIG_SIZE 0x10000
@@
-40,24
+41,24
@@
static struct mtd_partition tew_632brp_partitions[] = {
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
- }
, {
+ }, {
.name = "config",
.offset = 0x020000,
.size = 0x010000,
.name = "config",
.offset = 0x020000,
.size = 0x010000,
- }
, {
+ }, {
.name = "kernel",
.offset = 0x030000,
.name = "kernel",
.offset = 0x030000,
- .size = 0x0
d
0000,
- }
, {
+ .size = 0x0
e
0000,
+ }, {
.name = "rootfs",
.name = "rootfs",
- .offset = 0x1
0
0000,
- .size = 0x2
f
0000,
- }
, {
+ .offset = 0x1
1
0000,
+ .size = 0x2
e
0000,
+ }, {
.name = "art",
.offset = 0x3f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
.name = "art",
.offset = 0x3f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
- }
, {
+ }, {
.name = "firmware",
.offset = 0x030000,
.size = 0x3c0000,
.name = "firmware",
.offset = 0x030000,
.size = 0x3c0000,
@@
-67,8
+68,8
@@
static struct mtd_partition tew_632brp_partitions[] = {
static struct flash_platform_data tew_632brp_flash_data = {
#ifdef CONFIG_MTD_PARTITIONS
static struct flash_platform_data tew_632brp_flash_data = {
#ifdef CONFIG_MTD_PARTITIONS
-
.parts = tew_632brp_partitions,
-
.nr_parts = ARRAY_SIZE(tew_632brp_partitions),
+ .parts = tew_632brp_partitions,
+ .nr_parts = ARRAY_SIZE(tew_632brp_partitions),
#endif
};
#endif
};
@@
-88,22
+89,27
@@
static struct gpio_led tew_632brp_leds_gpio[] __initdata = {
}
};
}
};
-static struct gpio_
button tew_632brp_gpio_button
s[] __initdata = {
+static struct gpio_
keys_button tew_632brp_gpio_key
s[] __initdata = {
{
.desc = "reset",
.type = EV_KEY,
{
.desc = "reset",
.type = EV_KEY,
- .code =
BTN_0
,
- .
threshold = 5
,
+ .code =
KEY_RESTART
,
+ .
debounce_interval = TEW_632BRP_KEYS_DEBOUNCE_INTERVAL
,
.gpio = TEW_632BRP_GPIO_BTN_RESET,
}, {
.desc = "wps",
.type = EV_KEY,
.gpio = TEW_632BRP_GPIO_BTN_RESET,
}, {
.desc = "wps",
.type = EV_KEY,
- .code =
BTN_1
,
- .
threshold = 5
,
+ .code =
KEY_WPS_BUTTON
,
+ .
debounce_interval = TEW_632BRP_KEYS_DEBOUNCE_INTERVAL
,
.gpio = TEW_632BRP_GPIO_BTN_WPS,
}
};
.gpio = TEW_632BRP_GPIO_BTN_WPS,
}
};
+#define TEW_632BRP_LAN_PHYMASK BIT(0)
+#define TEW_632BRP_WAN_PHYMASK BIT(4)
+#define TEW_632BRP_MDIO_MASK (~(TEW_632BRP_LAN_PHYMASK | \
+ TEW_632BRP_WAN_PHYMASK))
+
static void __init tew_632brp_setup(void)
{
const char *config = (char *) KSEG1ADDR(TEW_632BRP_CONFIG_ADDR);
static void __init tew_632brp_setup(void)
{
const char *config = (char *) KSEG1ADDR(TEW_632BRP_CONFIG_ADDR);
@@
-112,20
+118,19
@@
static void __init tew_632brp_setup(void)
u8 *wlan_mac = NULL;
if (nvram_parse_mac_addr(config, TEW_632BRP_CONFIG_SIZE,
u8 *wlan_mac = NULL;
if (nvram_parse_mac_addr(config, TEW_632BRP_CONFIG_SIZE,
- "lan_mac=", mac) == 0) {
- ar71xx_set_mac_base(mac);
+ "lan_mac=", mac) == 0) {
+ ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
+ ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
wlan_mac = mac;
}
wlan_mac = mac;
}
- ar71xx_add_device_mdio(0
x0
);
+ ar71xx_add_device_mdio(0
, TEW_632BRP_MDIO_MASK
);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
- ar71xx_eth0_data.phy_mask = 0xf;
- ar71xx_eth0_data.speed = SPEED_100;
- ar71xx_eth0_data.duplex = DUPLEX_FULL;
+ ar71xx_eth0_data.phy_mask = TEW_632BRP_LAN_PHYMASK;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
- ar71xx_eth1_data.phy_mask =
0x10
;
+ ar71xx_eth1_data.phy_mask =
TEW_632BRP_WAN_PHYMASK
;
ar71xx_add_device_eth(0);
ar71xx_add_device_eth(1);
ar71xx_add_device_eth(0);
ar71xx_add_device_eth(1);
@@
-135,11
+140,12
@@
static void __init tew_632brp_setup(void)
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tew_632brp_leds_gpio),
tew_632brp_leds_gpio);
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tew_632brp_leds_gpio),
tew_632brp_leds_gpio);
- ar71xx_
add_device_gpio_buttons(-1, TEW_632BRP_BUTTON
S_POLL_INTERVAL,
-
ARRAY_SIZE(tew_632brp_gpio_button
s),
-
tew_632brp_gpio_button
s);
+ ar71xx_
register_gpio_keys_polled(-1, TEW_632BRP_KEY
S_POLL_INTERVAL,
+
ARRAY_SIZE(tew_632brp_gpio_key
s),
+
tew_632brp_gpio_key
s);
- ar9
13
x_add_device_wmac(eeprom, wlan_mac);
+ ar9
xx
x_add_device_wmac(eeprom, wlan_mac);
}
}
-MIPS_MACHINE(AR71XX_MACH_TEW_632BRP, "TRENDnet TEW-632BRP", tew_632brp_setup);
+MIPS_MACHINE(AR71XX_MACH_TEW_632BRP, "TEW-632BRP", "TRENDnet TEW-632BRP",
+ tew_632brp_setup);