projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: add an id argument to ar71xx_add_device_mdio
[oweals/openwrt.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
ar71xx
/
mach-dir-615-c1.c
diff --git
a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
index d6f1fa75dae860396c722a79f0bd9262999ac2fc..fcadc6f06799f7eaf55fc40a01cde62741e2d94c 100644
(file)
--- a/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
+++ b/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.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"
@@
-35,7
+35,8
@@
#define DIR_615C1_GPIO_BTN_WPS 12
#define DIR_615C1_GPIO_BTN_RESET 21
#define DIR_615C1_GPIO_BTN_WPS 12
#define DIR_615C1_GPIO_BTN_RESET 21
-#define DIR_615C1_BUTTONS_POLL_INTERVAL 20
+#define DIR_615C1_KEYS_POLL_INTERVAL 20 /* msecs */
+#define DIR_615C1_KEYS_DEBOUNCE_INTERVAL (3 * DIR_615C1_KEYS_POLL_INTERVAL)
#define DIR_615C1_CONFIG_ADDR 0x1f020000
#define DIR_615C1_CONFIG_SIZE 0x10000
#define DIR_615C1_CONFIG_ADDR 0x1f020000
#define DIR_615C1_CONFIG_SIZE 0x10000
@@
-47,24
+48,24
@@
static struct mtd_partition dir_615c1_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,
@@
-74,8
+75,8
@@
static struct mtd_partition dir_615c1_partitions[] = {
static struct flash_platform_data dir_615c1_flash_data = {
#ifdef CONFIG_MTD_PARTITIONS
static struct flash_platform_data dir_615c1_flash_data = {
#ifdef CONFIG_MTD_PARTITIONS
-
.parts = dir_615c1_partitions,
-
.nr_parts = ARRAY_SIZE(dir_615c1_partitions),
+ .parts = dir_615c1_partitions,
+ .nr_parts = ARRAY_SIZE(dir_615c1_partitions),
#endif
};
#endif
};
@@
-96,13
+97,13
@@
static struct gpio_led dir_615c1_leds_gpio[] __initdata = {
.name = "dir-615c1:green:wancpu",
.gpio = DIR_615C1_GPIO_LED_GREEN_WANCPU,
.active_low = 1,
.name = "dir-615c1:green:wancpu",
.gpio = DIR_615C1_GPIO_LED_GREEN_WANCPU,
.active_low = 1,
-
}, {
+ }, {
.name = "dir-615c1:green:wlan",
.gpio = DIR_615C1_GPIO_LED_GREEN_WLAN,
.active_low = 1,
.name = "dir-615c1:green:wlan",
.gpio = DIR_615C1_GPIO_LED_GREEN_WLAN,
.active_low = 1,
-
}, {
- .name = "dir-615c1:green:status",
- .gpio = DIR_615C1_GPIO_LED_GREEN_STATUS,
+ }, {
+ .name = "dir-615c1:green:status",
+ .gpio = DIR_615C1_GPIO_LED_GREEN_STATUS,
.active_low = 1,
}, {
.name = "dir-615c1:orange:wan",
.active_low = 1,
}, {
.name = "dir-615c1:orange:wan",
@@
-112,22
+113,27
@@
static struct gpio_led dir_615c1_leds_gpio[] __initdata = {
};
};
-static struct gpio_
button dir_615c1_gpio_button
s[] __initdata = {
+static struct gpio_
keys_button dir_615c1_gpio_key
s[] __initdata = {
{
.desc = "reset",
.type = EV_KEY,
{
.desc = "reset",
.type = EV_KEY,
- .code =
BTN_0
,
- .
threshold = 5
,
+ .code =
KEY_RESTART
,
+ .
debounce_interval = DIR_615C1_KEYS_DEBOUNCE_INTERVAL
,
.gpio = DIR_615C1_GPIO_BTN_RESET,
}, {
.desc = "wps",
.type = EV_KEY,
.gpio = DIR_615C1_GPIO_BTN_RESET,
}, {
.desc = "wps",
.type = EV_KEY,
- .code =
BTN_1
,
- .
threshold = 5
,
+ .code =
KEY_WPS_BUTTON
,
+ .
debounce_interval = DIR_615C1_KEYS_DEBOUNCE_INTERVAL
,
.gpio = DIR_615C1_GPIO_BTN_WPS,
}
};
.gpio = DIR_615C1_GPIO_BTN_WPS,
}
};
+#define DIR_615C1_LAN_PHYMASK BIT(0)
+#define DIR_615C1_WAN_PHYMASK BIT(4)
+#define DIR_615C1_MDIO_MASK (~(DIR_615C1_LAN_PHYMASK | \
+ DIR_615C1_WAN_PHYMASK))
+
static void __init dir_615c1_setup(void)
{
const char *config = (char *) KSEG1ADDR(DIR_615C1_CONFIG_ADDR);
static void __init dir_615c1_setup(void)
{
const char *config = (char *) KSEG1ADDR(DIR_615C1_CONFIG_ADDR);
@@
-136,20
+142,19
@@
static void __init dir_615c1_setup(void)
u8 *wlan_mac = NULL;
if (nvram_parse_mac_addr(config, DIR_615C1_CONFIG_SIZE,
u8 *wlan_mac = NULL;
if (nvram_parse_mac_addr(config, DIR_615C1_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
, DIR_615C1_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 = DIR_615C1_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 =
DIR_615C1_WAN_PHYMASK
;
ar71xx_add_device_eth(0);
ar71xx_add_device_eth(1);
ar71xx_add_device_eth(0);
ar71xx_add_device_eth(1);
@@
-159,11
+164,11
@@
static void __init dir_615c1_setup(void)
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(dir_615c1_leds_gpio),
dir_615c1_leds_gpio);
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(dir_615c1_leds_gpio),
dir_615c1_leds_gpio);
- ar71xx_
add_device_gpio_buttons(-1, DIR_615C1_BUTTON
S_POLL_INTERVAL,
-
ARRAY_SIZE(dir_615c1_gpio_button
s),
-
dir_615c1_gpio_button
s);
+ ar71xx_
register_gpio_keys_polled(-1, DIR_615C1_KEY
S_POLL_INTERVAL,
+
ARRAY_SIZE(dir_615c1_gpio_key
s),
+
dir_615c1_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_DIR_615_C1, "DIR-615-C1", "D-Link DIR-615 rev. C1",
}
MIPS_MACHINE(AR71XX_MACH_DIR_615_C1, "DIR-615-C1", "D-Link DIR-615 rev. C1",