[brcm63xx] board definition: Fixed CPVA642 LED definitions

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24275 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch b/target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch
index 27049ee..0b4f791 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c

-@@ -677,6 +677,103 @@ static struct board_info __initdata boar
+@@ -677,6 +677,98 @@ static struct board_info __initdata boar

        },
  };
  
        },
  };
  


@@ -40,8 +40,8 @@
 +              },
 +              {
 +                      .name           = "wifi:green",
 +              },
 +              {
 +                      .name           = "wifi:green",

-+                      .gpio           = 8,
-+                      .active_low     = 1,
++                      .gpio           = 28,
++                      .active_low     = 0,

 +              },
 +              {
 +                      .name           = "link:red",
 +              },
 +              {
 +                      .name           = "link:red",


@@ -70,11 +70,6 @@
 +                      .active_low     = 1,
 +              },
 +              {
 +                      .active_low     = 1,
 +              },
 +              {

-+                      .name           = "phone2",
-+                      .gpio           = 2,
-+                      .active_low     = 1,
-+              },
-+              {

 +                      .name           = "usb",
 +                      .gpio           = 3,
 +                      .active_low     = 1,
 +                      .name           = "usb",
 +                      .gpio           = 3,
 +                      .active_low     = 1,


@@ -104,7 +99,7 @@
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,

-@@ -1339,6 +1436,7 @@ static const struct board_info __initdat
+@@ -1339,6 +1431,7 @@ static const struct board_info __initdat

        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,

diff --git a/target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch b/target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch
index f012cb2..1fdede9 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch
@@ -60,7 +60,7 @@
  static struct board_info __initdata board_96358vw = {
        .name                           = "96358VW",
        .expected_cpu_id                = 0x6358,
  static struct board_info __initdata board_96358vw = {
        .name                           = "96358VW",
        .expected_cpu_id                = 0x6358,

-@@ -1433,6 +1486,7 @@ static const struct board_info __initdat
+@@ -1428,6 +1481,7 @@ static const struct board_info __initdat

  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358

diff --git a/target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch b/target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch
index 61a95af..db3ebf9 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch
@@ -18,7 +18,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;

-@@ -1586,6 +1590,29 @@ static int board_get_mac_address(u8 *mac
+@@ -1581,6 +1585,29 @@ static int board_get_mac_address(u8 *mac

        return 0;
  }
  
        return 0;
  }
  


@@ -48,7 +48,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
  /*
   * early init callback, read nvram data from flash and checksum it
   */

-@@ -1637,6 +1664,11 @@ void __init board_prom_init(void)
+@@ -1632,6 +1659,11 @@ void __init board_prom_init(void)

        /* Fixup broken nb4 board name */
        nb4_nvram_fixup();
  
        /* Fixup broken nb4 board name */
        nb4_nvram_fixup();
  

diff --git a/target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch b/target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch
index c6f7ca6..34785e2 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch
@@ -68,7 +68,7 @@
  #endif
  
  /*
  #endif
  
  /*

-@@ -1487,6 +1548,7 @@ static const struct board_info __initdat
+@@ -1482,6 +1543,7 @@ static const struct board_info __initdat

        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,