projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: use the gpio_keys_polled driver instead of gpio_buttons
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
ar71xx
/
mach-wp543.c
diff --git
a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
index 9fd02d48b1601213f57e7435638858f9c113abff..d85f13e55f6869de6397394615b6f73c766de0df 100644
(file)
--- a/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
+++ b/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
@@
-9,19
+9,18
@@
* by the Free Software Foundation.
*/
* by the Free Software Foundation.
*/
-#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-#include <asm/mips_machine.h>
#include <asm/mach-ar71xx/ar71xx.h>
#include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/pci.h>
+#include "machtype.h"
#include "devices.h"
#include "dev-m25p80.h"
#include "dev-pb42-pci.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "devices.h"
#include "dev-m25p80.h"
#include "dev-pb42-pci.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
+#include "dev-usb.h"
#define WP543_GPIO_SW6 2
#define WP543_GPIO_LED_1 3
#define WP543_GPIO_SW6 2
#define WP543_GPIO_LED_1 3
@@
-31,7
+30,8
@@
#define WP543_GPIO_LED_DIAG 7
#define WP543_GPIO_SW4 8
#define WP543_GPIO_LED_DIAG 7
#define WP543_GPIO_SW4 8
-#define WP543_BUTTONS_POLL_INTERVAL 20
+#define WP543_KEYS_POLL_INTERVAL 20 /* msecs */
+#define WP543_KEYS_DEBOUNCE_INTERVAL (3 * WP543_KEYS_POLL_INTERVAL)
static struct gpio_led wp543_leds_gpio[] __initdata = {
{
static struct gpio_led wp543_leds_gpio[] __initdata = {
{
@@
-57,18
+57,18
@@
static struct gpio_led wp543_leds_gpio[] __initdata = {
}
};
}
};
-static struct gpio_
button wp543_gpio_button
s[] __initdata = {
+static struct gpio_
keys_button wp543_gpio_key
s[] __initdata = {
{
.desc = "sw6",
.type = EV_KEY,
.code = BTN_0,
{
.desc = "sw6",
.type = EV_KEY,
.code = BTN_0,
- .
threshold = 5
,
+ .
debounce_interval = WP543_KEYS_DEBOUNCE_INTERVAL
,
.gpio = WP543_GPIO_SW6,
}, {
.desc = "sw4",
.type = EV_KEY,
.code = BTN_1,
.gpio = WP543_GPIO_SW6,
}, {
.desc = "sw4",
.type = EV_KEY,
.code = BTN_1,
- .
threshold = 5
,
+ .
debounce_interval = WP543_KEYS_DEBOUNCE_INTERVAL
,
.gpio = WP543_GPIO_SW4,
}
};
.gpio = WP543_GPIO_SW4,
}
};
@@
-79,8
+79,9
@@
static void __init wp543_setup(void)
ar71xx_add_device_mdio(0xfffffff7);
ar71xx_add_device_mdio(0xfffffff7);
+ ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
- ar71xx_eth0_data.phy_mask = 0x0
000000
8;
+ ar71xx_eth0_data.phy_mask = 0x08;
ar71xx_eth0_data.reset_bit = RESET_MODULE_GE0_MAC |
RESET_MODULE_GE0_PHY;
ar71xx_add_device_eth(0);
ar71xx_eth0_data.reset_bit = RESET_MODULE_GE0_MAC |
RESET_MODULE_GE0_PHY;
ar71xx_add_device_eth(0);
@@
-92,9
+93,9
@@
static void __init wp543_setup(void)
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wp543_leds_gpio),
wp543_leds_gpio);
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wp543_leds_gpio),
wp543_leds_gpio);
- ar71xx_
add_device_gpio_buttons(-1, WP543_BUTTON
S_POLL_INTERVAL,
-
ARRAY_SIZE(wp543_gpio_button
s),
-
wp543_gpio_button
s);
+ ar71xx_
register_gpio_keys_polled(-1, WP543_KEY
S_POLL_INTERVAL,
+
ARRAY_SIZE(wp543_gpio_key
s),
+
wp543_gpio_key
s);
}
}
-MIPS_MACHINE(AR71XX_MACH_WP543, "Compex WP543", wp543_setup);
+MIPS_MACHINE(AR71XX_MACH_WP543, "
WP543", "
Compex WP543", wp543_setup);