projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: add AR934x specific UART clock initialization
[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
5eb594c
..
e98ccac
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
@@
-47,24
+47,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,
.size = 0x0d0000,
.name = "kernel",
.offset = 0x030000,
.size = 0x0d0000,
- }
, {
+ }, {
.name = "rootfs",
.offset = 0x100000,
.size = 0x2f0000,
.name = "rootfs",
.offset = 0x100000,
.size = 0x2f0000,
- }
, {
+ }, {
.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
+74,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
+96,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",
@@
-116,18
+116,23
@@
static struct gpio_button dir_615c1_gpio_buttons[] __initdata = {
{
.desc = "reset",
.type = EV_KEY,
{
.desc = "reset",
.type = EV_KEY,
- .code =
BTN_0
,
+ .code =
KEY_RESTART
,
.threshold = 3,
.gpio = DIR_615C1_GPIO_BTN_RESET,
}, {
.desc = "wps",
.type = EV_KEY,
.threshold = 3,
.gpio = DIR_615C1_GPIO_BTN_RESET,
}, {
.desc = "wps",
.type = EV_KEY,
- .code =
BTN_1
,
+ .code =
KEY_WPS_BUTTON
,
.threshold = 3,
.gpio = DIR_615C1_GPIO_BTN_WPS,
}
};
.threshold = 3,
.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
+141,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(
0x0
);
+ ar71xx_add_device_mdio(
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);
This page took
0.023621 seconds
and
4
git commands to generate.