hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename reset_buttons to buttons

Browse Source 
SVN-Revision: 21255
master
Raphaël Huck 15 years ago
parent ccfe1f7886
commit f87eac79bb
10 changed files with 36 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch
  2. 4
      target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
  3. 2
      target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch
  4. 4
      target/linux/brcm63xx/patches-2.6.32/200-extended-platform-devices.patch
  5. 14
      target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
  6. 12
      target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch
  7. 4
      target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch
  8. 2
      target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch
  9. 4
      target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch
  10. 14
      target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch

12
target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch
Unescape View File

@ -13,7 +13,7 @@
.active_low = 1,
},
},
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 32,
@ -30,7 +30,7 @@
.active_low = 1,
},
},
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 36,
@ -72,12 +72,12 @@
platform_device_register(&bcm63xx_gpio_leds);
+ /* count number of BUTTONs defined by this device */
+ while (button_count < ARRAY_SIZE(board.reset_buttons) && board.reset_buttons[button_count].desc)
+ 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.reset_buttons;
+ bcm63xx_gpio_buttons_data.buttons = board.buttons;
+
+ platform_device_register(&bcm63xx_gpio_buttons_device);
+ }
@ -92,8 +92,8 @@
/* GPIO LEDs */
struct gpio_led leds[5];
+
+ /* Reset button */
+ struct gpio_button reset_buttons[2];
+ /* Buttons */
+ struct gpio_button buttons[2];
};
#endif /* ! BOARD_BCM963XX_H_ */

4
target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
Unescape View File

@ -78,5 +78,5 @@
- struct gpio_led leds[5];
+ struct gpio_led leds[8];
/* Reset button */
struct gpio_button reset_buttons[1];
/* Buttons */
struct gpio_button buttons[1];

2
target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch
Unescape View File

@ -50,7 +50,7 @@
+ },
+ },
+
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "sw2",
+ .gpio = 37,

4
target/linux/brcm63xx/patches-2.6.32/200-extended-platform-devices.patch
Unescape View File

@ -15,8 +15,8 @@
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -59,6 +59,10 @@ struct board_info {
/* Reset button */
struct gpio_button reset_buttons[2];
/* Buttons */
struct gpio_button buttons[2];
+
+ /* Additional platform devices */
+ struct platform_device **devs;

14
target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
Unescape View File

@ -117,7 +117,7 @@
+ .active_low = 1,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -209,7 +209,7 @@
+ .active_low = 1,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -299,7 +299,7 @@
+ .active_low = 1,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -386,7 +386,7 @@
+ .gpio = 4,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -471,7 +471,7 @@
+ .gpio = 4,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -543,5 +543,5 @@
- struct gpio_led leds[8];
+ struct gpio_led leds[9];
/* Reset button */
struct gpio_button reset_buttons[2];
/* Buttons */
struct gpio_button buttons[2];

12
target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch
Unescape View File

@ -13,7 +13,7 @@
.active_low = 1,
},
},
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 32,
@ -30,7 +30,7 @@
.active_low = 1,
},
},
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 36,
@ -72,12 +72,12 @@
platform_device_register(&bcm63xx_gpio_leds);
+ /* count number of BUTTONs defined by this device */
+ while (button_count < ARRAY_SIZE(board.reset_buttons) && board.reset_buttons[button_count].desc)
+ 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.reset_buttons;
+ bcm63xx_gpio_buttons_data.buttons = board.buttons;
+
+ platform_device_register(&bcm63xx_gpio_buttons_device);
+ }
@ -92,8 +92,8 @@
/* GPIO LEDs */
struct gpio_led leds[5];
+
+ /* Reset button */
+ struct gpio_button reset_buttons[2];
+ /* Buttons */
+ struct gpio_button buttons[2];
};
#endif /* ! BOARD_BCM963XX_H_ */

4
target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch
Unescape View File

@ -78,5 +78,5 @@
- struct gpio_led leds[5];
+ struct gpio_led leds[8];
/* Reset button */
struct gpio_button reset_buttons[1];
/* Buttons */
struct gpio_button buttons[1];

2
target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch
Unescape View File

@ -50,7 +50,7 @@
+ },
+ },
+
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "sw2",
+ .gpio = 37,

4
target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch
Unescape View File

@ -15,8 +15,8 @@
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -59,6 +59,10 @@ struct board_info {
/* Reset button */
struct gpio_button reset_buttons[2];
/* Buttons */
struct gpio_button buttons[2];
+
+ /* Additional platform devices */
+ struct platform_device **devs;

14
target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch
Unescape View File

@ -117,7 +117,7 @@
+ .active_low = 1,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -209,7 +209,7 @@
+ .active_low = 1,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -299,7 +299,7 @@
+ .active_low = 1,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -386,7 +386,7 @@
+ .gpio = 4,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -471,7 +471,7 @@
+ .gpio = 4,
+ },
+ },
+ .reset_buttons = {
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
@ -543,5 +543,5 @@
- struct gpio_led leds[8];
+ struct gpio_led leds[9];
/* Reset button */
struct gpio_button reset_buttons[2];
/* Buttons */
struct gpio_button buttons[2];

Write Preview
Loading…
Cancel
Save