X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4d9258acb3abc998fc14ca792ee460052aacd642..347c600521d2864d728e192cff1c1124d54b23ea:/target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch?ds=sidebyside diff --git a/target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch b/target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch index e1faeeeda..6b72ca22a 100644 --- a/target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch +++ b/target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch @@ -13,13 +13,13 @@ .active_low = 1, }, }, -+ .reset_buttons = { ++ .buttons = { + { + .desc = "reset", + .gpio = 32, + .active_low = 1, + .type = EV_KEY, -+ .code = BTN_0, ++ .code = KEY_RESTART, + .threshold = 3, + }, + }, @@ -30,20 +30,20 @@ .active_low = 1, }, }, -+ .reset_buttons = { ++ .buttons = { + { + .desc = "reset", + .gpio = 36, + .active_low = 1, + .type = EV_KEY, -+ .code = BTN_0, ++ .code = KEY_RESTART, + .threshold = 3, + }, + }, }; static struct board_info __initdata board_FAST2404 = { -@@ -770,6 +792,16 @@ static struct platform_device bcm63xx_gp +@@ -770,12 +792,23 @@ static struct platform_device bcm63xx_gp .dev.platform_data = &bcm63xx_led_data, }; @@ -60,13 +60,24 @@ /* * third stage init callback, register all board devices. */ -@@ -825,6 +857,13 @@ int __init board_register_devices(void) + int __init board_register_devices(void) + { + u32 val; ++ int button_count = 0; + + if (board.has_pccard) + bcm63xx_pcmcia_register(); +@@ -825,6 +858,17 @@ int __init board_register_devices(void) platform_device_register(&bcm63xx_gpio_leds); -+ if (board.reset_buttons) { -+ bcm63xx_gpio_buttons_data.nbuttons = ARRAY_SIZE(board.reset_buttons); -+ bcm63xx_gpio_buttons_data.buttons = board.reset_buttons; ++ /* count number of BUTTONs defined by this device */ ++ while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc) ++ button_count++; ++ ++ if (button_count) { ++ bcm63xx_gpio_buttons_data.nbuttons = button_count; ++ bcm63xx_gpio_buttons_data.buttons = board.buttons; + + platform_device_register(&bcm63xx_gpio_buttons_device); + } @@ -81,8 +92,8 @@ /* GPIO LEDs */ struct gpio_led leds[5]; + -+ /* Reset button */ -+ struct gpio_button reset_buttons[1]; ++ /* Buttons */ ++ struct gpio_button buttons[2]; }; #endif /* ! BOARD_BCM963XX_H_ */