diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-27 16:44:48 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-27 16:44:48 +0000 |
| commit | 8812c9e533b66ccd23755361122c611dc2bf96c0 (patch) | |
| tree | 7226f2eead38129011deb2c30993536ed700f5e0 /target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch | |
| parent | 0d11882ac34f8500774a31fc097c8425d7142075 (diff) | |
[brcm63xx] switch to gpio-keys-polled
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31491 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch b/target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch index ef57ff8bf..9420b8bc0 100644 --- a/target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch +++ b/target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch @@ -4,7 +4,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> #include <linux/ssb/ssb.h> -+#include <linux/gpio_buttons.h> ++#include <linux/gpio_keys.h> +#include <linux/input.h> #include <asm/addrspace.h> #include <bcm63xx_board.h> @@ -20,7 +20,7 @@ + .active_low = 1, + .type = EV_KEY, + .code = KEY_RESTART, -+ .threshold = 3, ++ .debounce_interval = 60, + }, + }, }; @@ -37,7 +37,7 @@ + .active_low = 1, + .type = EV_KEY, + .code = KEY_RESTART, -+ .threshold = 3, ++ .debounce_interval = 60, + }, + }, }; @@ -47,14 +47,14 @@ .dev.platform_data = &bcm63xx_led_data, }; -+static struct gpio_buttons_platform_data bcm63xx_gpio_buttons_data = { ++static struct gpio_keys_platform_data bcm63xx_gpio_keys_data = { + .poll_interval = 20, +}; + -+static struct platform_device bcm63xx_gpio_buttons_device = { -+ .name = "gpio-buttons", ++static struct platform_device bcm63xx_gpio_keys_device = { ++ .name = "gpio-keys-polled", + .id = 0, -+ .dev.platform_data = &bcm63xx_gpio_buttons_data, ++ .dev.platform_data = &bcm63xx_gpio_keys_data, +}; + /* @@ -76,10 +76,10 @@ + button_count++; + + if (button_count) { -+ bcm63xx_gpio_buttons_data.nbuttons = button_count; -+ bcm63xx_gpio_buttons_data.buttons = board.buttons; ++ bcm63xx_gpio_keys_data.nbuttons = button_count; ++ bcm63xx_gpio_keys_data.buttons = board.buttons; + -+ platform_device_register(&bcm63xx_gpio_buttons_device); ++ platform_device_register(&bcm63xx_gpio_keys_device); + } + return 0; @@ -90,7 +90,7 @@ #include <linux/types.h> #include <linux/gpio.h> -+#include <linux/gpio_buttons.h> ++#include <linux/gpio_keys.h> #include <linux/leds.h> #include <bcm63xx_dev_enet.h> #include <bcm63xx_dev_dsp.h> @@ -100,7 +100,7 @@ struct gpio_led leds[5]; + + /* Buttons */ -+ struct gpio_button buttons[4]; ++ struct gpio_keys_button buttons[4]; }; #endif /* ! BOARD_BCM963XX_H_ */ |