projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: fix a compiler warning
[oweals/openwrt.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
ar71xx
/
mach-ap83.c
diff --git
a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
index d2cbc218748d05cab94afa2ae51c1727e2d040df..2eab994555e2a6a76e54aa6e04ab105025ed1bb8 100644
(file)
--- a/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
+++ b/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
@@
-22,7
+22,7
@@
#include "machtype.h"
#include "devices.h"
#include "machtype.h"
#include "devices.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 "dev-usb.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
@@
-38,7
+38,8
@@
#define AP83_050_GPIO_VSC7385_MOSI 16
#define AP83_050_GPIO_VSC7385_SCK 17
#define AP83_050_GPIO_VSC7385_MOSI 16
#define AP83_050_GPIO_VSC7385_SCK 17
-#define AP83_BUTTONS_POLL_INTERVAL 20
+#define AP83_KEYS_POLL_INTERVAL 20 /* msecs */
+#define AP83_KEYS_DEBOUNCE_INTERVAL (3 * AP83_KEYS_POLL_INTERVAL)
#ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition ap83_flash_partitions[] = {
#ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition ap83_flash_partitions[] = {
@@
-47,25
+48,25
@@
static struct mtd_partition ap83_flash_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
- }
, {
+ }, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
- }
, {
+ }, {
.name = "kernel",
.offset = 0x060000,
.size = 0x140000,
.name = "kernel",
.offset = 0x060000,
.size = 0x140000,
- }
, {
+ }, {
.name = "rootfs",
.offset = 0x1a0000,
.size = 0x650000,
.name = "rootfs",
.offset = 0x1a0000,
.size = 0x650000,
- }
, {
+ }, {
.name = "art",
.offset = 0x7f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
.name = "art",
.offset = 0x7f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
- }
, {
+ }, {
.name = "firmware",
.offset = 0x060000,
.size = 0x790000,
.name = "firmware",
.offset = 0x060000,
.size = 0x790000,
@@
-76,8
+77,8
@@
static struct mtd_partition ap83_flash_partitions[] = {
static struct ar91xx_flash_platform_data ap83_flash_data = {
.width = 2,
#ifdef CONFIG_MTD_PARTITIONS
static struct ar91xx_flash_platform_data ap83_flash_data = {
.width = 2,
#ifdef CONFIG_MTD_PARTITIONS
-
.parts = ap83_flash_partitions,
-
.nr_parts = ARRAY_SIZE(ap83_flash_partitions),
+ .parts = ap83_flash_partitions,
+ .nr_parts = ARRAY_SIZE(ap83_flash_partitions),
#endif
};
#endif
};
@@
-115,19
+116,19
@@
static struct gpio_led ap83_leds_gpio[] __initdata = {
},
};
},
};
-static struct gpio_
button ap83_gpio_button
s[] __initdata = {
+static struct gpio_
keys_button ap83_gpio_key
s[] __initdata = {
{
.desc = "soft_reset",
.type = EV_KEY,
{
.desc = "soft_reset",
.type = EV_KEY,
- .code =
BTN_0
,
- .
threshold = 5
,
+ .code =
KEY_RESTART
,
+ .
debounce_interval = AP83_KEYS_DEBOUNCE_INTERVAL
,
.gpio = AP83_GPIO_BTN_RESET,
.active_low = 1,
.gpio = AP83_GPIO_BTN_RESET,
.active_low = 1,
- }
, {
+ }, {
.desc = "jumpstart",
.type = EV_KEY,
.desc = "jumpstart",
.type = EV_KEY,
- .code =
BTN_1
,
- .
threshold = 5
,
+ .code =
KEY_WPS_BUTTON
,
+ .
debounce_interval = AP83_KEYS_DEBOUNCE_INTERVAL
,
.gpio = AP83_GPIO_BTN_JUMPSTART,
.active_low = 1,
}
.gpio = AP83_GPIO_BTN_JUMPSTART,
.active_low = 1,
}
@@
-194,19
+195,18
@@
static struct spi_board_info ap83_spi_info[] = {
static void __init ap83_generic_setup(void)
{
static void __init ap83_generic_setup(void)
{
- u8 *mac = (u8 *) KSEG1ADDR(0x1fff1000);
-
- ar71xx_set_mac_base(mac);
+ u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
- ar71xx_add_device_mdio(0xfffffffe);
+ ar71xx_add_device_mdio(0
, 0
xfffffffe);
+ ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth0_data.phy_mask = 0x1;
ar71xx_add_device_eth(0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth0_data.phy_mask = 0x1;
ar71xx_add_device_eth(0);
+ ar71xx_init_mac(ar71xx_eth1_data.mac_addr, eeprom, 1);
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
- ar71xx_eth1_data.phy_mask = 0x0;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
@@
-217,13
+217,13
@@
static void __init ap83_generic_setup(void)
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ap83_leds_gpio),
ap83_leds_gpio);
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ap83_leds_gpio),
ap83_leds_gpio);
- ar71xx_
add_device_gpio_buttons(-1, AP83_BUTTON
S_POLL_INTERVAL,
-
ARRAY_SIZE(ap83_gpio_button
s),
-
ap83_gpio_button
s);
+ ar71xx_
register_gpio_keys_polled(-1, AP83_KEY
S_POLL_INTERVAL,
+
ARRAY_SIZE(ap83_gpio_key
s),
+
ap83_gpio_key
s);
ar71xx_add_device_usb();
ar71xx_add_device_usb();
- ar9
13x_add_device_wmac(
);
+ ar9
xxx_add_device_wmac(eeprom, NULL
);
platform_device_register(&ap83_flash_device);
platform_device_register(&ap83_flash_device);
@@
-232,7
+232,7
@@
static void __init ap83_generic_setup(void)
static void __init ap83_040_setup(void)
{
static void __init ap83_040_setup(void)
{
- ap83_flash_data.is_shared
=
1;
+ ap83_flash_data.is_shared
=
1;
ap83_generic_setup();
platform_device_register(&ap83_040_spi_device);
}
ap83_generic_setup();
platform_device_register(&ap83_040_spi_device);
}
@@
-264,4
+264,4
@@
static void __init ap83_setup(void)
}
}
}
}
-MIPS_MACHINE(AR71XX_MACH_AP83, "Atheros AP83", ap83_setup);
+MIPS_MACHINE(AR71XX_MACH_AP83, "A
P83", "A
theros AP83", ap83_setup);