projects / 15.05 / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bcca379)
[brcm63xx] rename reset_buttons to buttons
authorRaphaël HUCK <rhk@cksum.org>
Thu, 29 Apr 2010 12:54:24 +0000 (12:54 +0000)
committerRaphaël HUCK <rhk@cksum.org>
Thu, 29 Apr 2010 12:54:24 +0000 (12:54 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21255 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch patch | blob | history
target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch patch | blob | history
target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch patch | blob | history
target/linux/brcm63xx/patches-2.6.32/200-extended-platform-devices.patch patch | blob | history
target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch patch | blob | history
target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch patch | blob | history
target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch patch | blob | history
target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch patch | blob | history
target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch patch | blob | history
target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch patch | blob | history

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 45f506b..d96ab7a 100644 (file)
--- 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 d9dba14..b4d948a 100644 (file)
--- 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 7b3f9ff..e464384 100644 (file)
--- 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 aec85a3..c642509 100644 (file)
--- 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 bbd0c62..7c17b88 100644 (file)
--- 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 aa5264d..6b72ca2 100644 (file)
--- 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 292f196..edf00b9 100644 (file)
--- 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 8e53a60..1eb5d2b 100644 (file)
--- 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 aec85a3..c642509 100644 (file)
--- 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 bbd0c62..7c17b88 100644 (file)
--- 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];
OpenWrt 15.05 release branch