X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a1bd9bdd429c9139a9e4bfd76adb2e491391dc7e..347c600521d2864d728e192cff1c1124d54b23ea:/target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch?ds=sidebyside diff --git a/target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch b/target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch index ba6518611..d96ab7a03 100644 --- a/target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch +++ b/target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c -=================================================================== ---- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:37:27.000000000 +0100 -+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:41:36.000000000 +0100 +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -15,6 +15,8 @@ #include #include @@ -11,41 +9,41 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c #include #include #include -@@ -288,6 +290,16 @@ +@@ -288,6 +290,16 @@ static struct board_info __initdata boar .active_low = 1, }, }, -+ .reset_buttons = { ++ .buttons = { + { + .desc = "reset", + .gpio = 32, + .active_low = 1, + .type = EV_KEY, -+ .code = BTN_0, ++ .code = KEY_RESTART, + .threshold = 3, + }, + }, }; static struct board_info __initdata board_96348gw = { -@@ -345,6 +357,16 @@ +@@ -345,6 +357,16 @@ static struct board_info __initdata boar .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 = { -@@ -771,6 +793,16 @@ +@@ -771,12 +793,23 @@ static struct platform_device bcm63xx_gp .dev.platform_data = &bcm63xx_led_data, }; @@ -62,13 +60,24 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c /* * third stage init callback, register all board devices. */ -@@ -826,6 +858,13 @@ + int __init board_register_devices(void) + { + u32 val; ++ int button_count = 0; + + if (board.has_pccard) + bcm63xx_pcmcia_register(); +@@ -826,6 +859,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); + } @@ -76,17 +85,15 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c return 0; } -Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -=================================================================== ---- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 18:36:33.000000000 +0100 -+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 18:36:58.000000000 +0100 -@@ -55,6 +55,9 @@ +--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h ++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +@@ -55,6 +55,9 @@ struct board_info { /* 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_ */