[brcm63xx] Remove patch 140-new_bcm96348gw_leds because it is really the GW6200 leds...
authorDaniel Dickinson <crazycshore@gmail.com>
Tue, 7 Dec 2010 15:15:41 +0000 (15:15 +0000)
committerDaniel Dickinson <crazycshore@gmail.com>
Tue, 7 Dec 2010 15:15:41 +0000 (15:15 +0000)
SVN-Revision: 24302

16 files changed:
target/linux/brcm63xx/base-files/lib/brcm63xx.sh
target/linux/brcm63xx/patches-2.6.35/140-new_bcm96348gw_leds.patch [deleted file]
target/linux/brcm63xx/patches-2.6.35/150-alice_gate2_leds.patch
target/linux/brcm63xx/patches-2.6.35/180-udc_preliminary_support.patch
target/linux/brcm63xx/patches-2.6.35/200-extended-platform-devices.patch
target/linux/brcm63xx/patches-2.6.35/200-spi-board-info.patch
target/linux/brcm63xx/patches-2.6.35/220-board-D4PW.patch
target/linux/brcm63xx/patches-2.6.35/221-board-NB4.patch
target/linux/brcm63xx/patches-2.6.35/240-spi.patch
target/linux/brcm63xx/patches-2.6.35/250-6358-enet1-external-mii-clk.patch
target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch
target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch
target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch
target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch
target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch
target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch

index 6f00282..25f2ab4 100755 (executable)
@@ -15,8 +15,7 @@ brcm63xx_detect() {
 
        case "$board_name" in
        "bcm63xx/96348GW "*)
-               status_led="tel"
-               status_led2="line1"
+               status_led="power"
                brcm63xx_has_reset_button="true"
                ifname=eth1
                ;;
diff --git a/target/linux/brcm63xx/patches-2.6.35/140-new_bcm96348gw_leds.patch b/target/linux/brcm63xx/patches-2.6.35/140-new_bcm96348gw_leds.patch
deleted file mode 100644 (file)
index 5d3fcfd..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -345,24 +345,39 @@ static struct board_info __initdata boar
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp",
--                      .gpio           = 3,
-+                      .name           = "power",
-+                      .gpio           = 0,
-                       .active_low     = 1,
-+                      .default_trigger = "default-on",
-               },
-               {
--                      .name           = "ppp-fail",
-+                      .name           = "stop",
-+                      .gpio           = 1,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "line1",
-                       .gpio           = 4,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "power",
--                      .gpio           = 0,
-+                      .name           = "line2",
-+                      .gpio           = 5,
-                       .active_low     = 1,
--                      .default_trigger = "default-on",
-               },
-               {
--                      .name           = "stop",
--                      .gpio           = 1,
-+                      .name           = "line3",
-+                      .gpio           = 6,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "tel",
-+                      .gpio           = 7,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "eth",
-+                      .gpio           = 35,
-                       .active_low     = 1,
-               },
-       },
-@@ -880,6 +895,7 @@ static struct platform_device bcm63xx_gp
- int __init board_register_devices(void)
- {
-       u32 val;
-+      int led_count = 0;
-       int button_count = 0;
-       if (board.has_uart0)
-@@ -922,7 +938,11 @@ int __init board_register_devices(void)
-       platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
--      bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
-+      /* count number of LEDs defined by this device */
-+      while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
-+              led_count++;
-+
-+      bcm63xx_led_data.num_leds = led_count;
-       bcm63xx_led_data.leds = board.leds;
-       platform_device_register(&bcm63xx_gpio_leds);
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -56,7 +56,7 @@ struct board_info {
-       struct bcm63xx_dsp_platform_data dsp;
-       /* GPIO LEDs */
--      struct gpio_led leds[5];
-+      struct gpio_led leds[8];
-       /* Buttons */
-       struct gpio_button buttons[2];
index 24adac4..fa5ca81 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -603,6 +603,99 @@ static struct board_info __initdata boar
+@@ -588,6 +588,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
        struct bcm63xx_dsp_platform_data dsp;
  
        /* GPIO LEDs */
--      struct gpio_led leds[8];
+-      struct gpio_led leds[5];
 +      struct gpio_led leds[14];
  
        /* Buttons */
index 195185d..84534e6 100644 (file)
@@ -8,7 +8,7 @@
  #include <board_bcm963xx.h>
  
  #define PFX   "board_bcm963xx: "
-@@ -415,6 +416,8 @@ static struct board_info __initdata boar
+@@ -400,6 +401,8 @@ static struct board_info __initdata boar
        .has_ohci0                      = 1,
        .has_pccard                     = 1,
        .has_ehci0                      = 1,
@@ -17,7 +17,7 @@
  };
  
  static struct board_info __initdata board_rta1025w_16 = {
-@@ -1011,6 +1014,9 @@ int __init board_register_devices(void)
+@@ -1001,6 +1004,9 @@ int __init board_register_devices(void)
        if (board.has_dsp)
                bcm63xx_dsp_register(&board.dsp);
  
index 388e571..70637e5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1017,6 +1017,9 @@ int __init board_register_devices(void)
+@@ -1007,6 +1007,9 @@ int __init board_register_devices(void)
        if (board.has_udc0)
                bcm63xx_udc_register();
  
index 612fbc5..d73d6f0 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1020,6 +1020,9 @@ int __init board_register_devices(void)
+@@ -1010,6 +1010,9 @@ int __init board_register_devices(void)
        if (board.num_devs)
                platform_add_devices(board.devs, board.num_devs);
  
index b1d022c..1e630d1 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -479,6 +479,49 @@ static struct board_info __initdata boar
+@@ -464,6 +464,49 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
  };
@@ -50,7 +50,7 @@
  #endif
  
  /*
-@@ -737,6 +780,7 @@ static const struct board_info __initdat
+@@ -728,6 +771,7 @@ static const struct board_info __initdat
        &board_DV201AMR,
        &board_96348gw_a,
        &board_rta1025w_16,
index f3a8386..c2d1056 100644 (file)
@@ -23,7 +23,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -758,6 +767,502 @@ static struct board_info __initdata boar
+@@ -749,6 +758,502 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
  };
  #endif
  
  /*
-@@ -788,9 +1293,30 @@ static const struct board_info __initdat
+@@ -779,9 +1284,30 @@ static const struct board_info __initdat
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
  /*
   * Register a sane SPROMv2 to make the on-board
   * bcm4318 WLAN work
-@@ -908,6 +1434,9 @@ void __init board_prom_init(void)
+@@ -899,6 +1425,9 @@ void __init board_prom_init(void)
                return;
        }
  
index ed35e36..b324a0f 100644 (file)
  #include <board_bcm963xx.h>
  
  #define PFX   "board_bcm963xx: "
-@@ -1596,6 +1597,9 @@ int __init board_register_devices(void)
+@@ -1586,6 +1587,9 @@ int __init board_register_devices(void)
        if (board.num_spis)
                spi_register_board_info(board.spis, board.num_spis);
  
index bf07d35..3e033fb 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1486,6 +1486,8 @@ void __init board_prom_init(void)
+@@ -1477,6 +1477,8 @@ void __init board_prom_init(void)
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G3_EXT_MII |
                                GPIO_MODE_6348_G0_EXT_MII;
index 166123f..c6bd1c8 100644 (file)
@@ -39,7 +39,7 @@
  #endif
  
  /*
-@@ -1273,6 +1305,7 @@ static const struct board_info __initdat
+@@ -1264,6 +1296,7 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
        &board_96338w,
index d88239c..aa7322d 100644 (file)
@@ -14,7 +14,7 @@
   * known 6338 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1453,6 +1460,7 @@ void __init board_prom_init(void)
+@@ -1444,6 +1451,7 @@ void __init board_prom_init(void)
  
        /* extract nvram data */
        memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));
index 0b4f791..480e190 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -677,6 +677,98 @@ static struct board_info __initdata boar
+@@ -662,6 +662,98 @@ static struct board_info __initdata boar
        },
  };
  
@@ -99,7 +99,7 @@
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,
-@@ -1339,6 +1431,7 @@ static const struct board_info __initdat
+@@ -1324,6 +1416,7 @@ static const struct board_info __initdat
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,
index 1fdede9..d008e1d 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -577,6 +577,59 @@ static struct board_info __initdata boar
+@@ -562,6 +562,59 @@ static struct board_info __initdata boar
   * known 6358 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6358
@@ -60,7 +60,7 @@
  static struct board_info __initdata board_96358vw = {
        .name                           = "96358VW",
        .expected_cpu_id                = 0x6358,
-@@ -1428,6 +1481,7 @@ static const struct board_info __initdat
+@@ -1413,6 +1466,7 @@ static const struct board_info __initdat
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
index db3ebf9..286d9ac 100644 (file)
@@ -18,7 +18,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -1581,6 +1585,29 @@ static int board_get_mac_address(u8 *mac
+@@ -1566,6 +1570,29 @@ static int board_get_mac_address(u8 *mac
        return 0;
  }
  
@@ -48,7 +48,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -1632,6 +1659,11 @@ void __init board_prom_init(void)
+@@ -1617,6 +1644,11 @@ void __init board_prom_init(void)
        /* Fixup broken nb4 board name */
        nb4_nvram_fixup();
  
index 34785e2..4f02951 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -575,6 +575,67 @@ static struct board_info __initdata boar
+@@ -560,6 +560,67 @@ static struct board_info __initdata boar
  
  };
  
@@ -68,7 +68,7 @@
  #endif
  
  /*
-@@ -1482,6 +1543,7 @@ static const struct board_info __initdat
+@@ -1467,6 +1528,7 @@ static const struct board_info __initdat
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,