aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorRaphaël Huck <rhk@cksum.org>2010-04-29 12:54:24 +0000
committerRaphaël Huck <rhk@cksum.org>2010-04-29 12:54:24 +0000
commitf87eac79bb74bf56748b6c3bcfbb4671ac732113 (patch)
tree9003728e69eec4a497fdda377ef8addfce2cc309 /target/linux/brcm63xx
parentccfe1f7886159660b0f015f904f152e70121f8fb (diff)
downloadupstream-f87eac79bb74bf56748b6c3bcfbb4671ac732113.tar.gz
upstream-f87eac79bb74bf56748b6c3bcfbb4671ac732113.tar.bz2
upstream-f87eac79bb74bf56748b6c3bcfbb4671ac732113.zip
rename reset_buttons to buttons
SVN-Revision: 21255
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch12
-rw-r--r--target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.32/200-extended-platform-devices.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch14
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch12
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch14
10 files changed, 36 insertions, 36 deletions
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 45f506bb75..d96ab7a03b 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
@@ -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_ */
diff --git a/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch b/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
index d9dba14932..b4d948afb7 100644
--- a/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
@@ -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];
diff --git a/target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch
index 7b3f9ff5a9..e464384d51 100644
--- a/target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch
@@ -50,7 +50,7 @@
+ },
+ },
+
-+ .reset_buttons = {
++ .buttons = {
+ {
+ .desc = "sw2",
+ .gpio = 37,
diff --git a/target/linux/brcm63xx/patches-2.6.32/200-extended-platform-devices.patch b/target/linux/brcm63xx/patches-2.6.32/200-extended-platform-devices.patch
index aec85a3d17..c6425091ca 100644
--- a/target/linux/brcm63xx/patches-2.6.32/200-extended-platform-devices.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/200-extended-platform-devices.patch
@@ -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;
diff --git a/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch b/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
index bbd0c62e70..7c17b887d2 100644
--- a/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
@@ -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];
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 aa5264d845..6b72ca22a3 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,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_ */
diff --git a/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch b/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch
index 292f196ac6..edf00b90bb 100644
--- a/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch
@@ -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];
diff --git a/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch
index 8e53a60e4b..1eb5d2b301 100644
--- a/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch
@@ -50,7 +50,7 @@
+ },
+ },
+
-+ .reset_buttons = {
++ .buttons = {
+ {
+ .desc = "sw2",
+ .gpio = 37,
diff --git a/target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch b/target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch
index aec85a3d17..c6425091ca 100644
--- a/target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch
@@ -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;
diff --git a/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch b/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch
index bbd0c62e70..7c17b887d2 100644
--- a/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch
@@ -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];
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 19:45:41 +0000