diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-04-27 16:44:48 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-04-27 16:44:48 +0000 |
| commit | e047cf1899f30cbccf632cb6ee37cad0cea495ae (patch) | |
| tree | a766ec427e9c94b2a7182a55dc5992832122550d /target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch | |
| parent | 1c2905751924f7354f8e895cd22326cdbdebd7df (diff) | |
| download | upstream-e047cf1899f30cbccf632cb6ee37cad0cea495ae.tar.gz upstream-e047cf1899f30cbccf632cb6ee37cad0cea495ae.tar.bz2 upstream-e047cf1899f30cbccf632cb6ee37cad0cea495ae.zip | |
switch to gpio-keys-polled
SVN-Revision: 31491
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 ef57ff8bfa..9420b8bc0c 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_ */ |