brcm63xx: fix number of usb ports for HW556 variants
authorJonas Gorski <jogo@openwrt.org>
Sat, 22 Feb 2014 11:16:50 +0000 (11:16 +0000)
committerJonas Gorski <jogo@openwrt.org>
Sat, 22 Feb 2014 11:16:50 +0000 (11:16 +0000)
Don't only fix up the fallback board, but also all three variants.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39680

target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch
target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch
target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch
target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch
target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch

index 4eb6d55d335439870a8691298d5515c9f67de8bf..63eb226ec109f31c1c40b4661019f6a1e6065d9b 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2900,6 +2900,489 @@ static struct board_info __initdata boar
+@@ -2900,6 +2900,492 @@ static struct board_info __initdata boar
        },
  };
  
 +      .has_pci                                = 1,
 +      .has_ohci0                              = 1,
 +      .has_ehci0                              = 1,
++      .num_usbh_ports                         = 2,
 +
 +      .has_caldata                            = 1,
 +      .caldata = {
 +      .has_pci                                = 1,
 +      .has_ohci0                              = 1,
 +      .has_ehci0                              = 1,
++      .num_usbh_ports                         = 2,
 +
 +      .has_caldata                            = 1,
 +      .caldata = {
 +      .has_pci                                = 1,
 +      .has_ohci0                              = 1,
 +      .has_ehci0                              = 1,
++      .num_usbh_ports                         = 2,
 +
 +      .has_caldata                            = 1,
 +      .caldata = {
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -3339,6 +3822,10 @@ static const struct board_info __initcon
+@@ -3339,6 +3825,10 @@ static const struct board_info __initcon
        &board_nb4_fxc_r2,
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -3404,13 +3891,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3404,13 +3894,37 @@ static void __init boardid_fixup(u8 *boo
        struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
        char *board_name = (char *)bcm63xx_nvram_get_name();
  
index 521c093d1179c5ac8cae9770e9e0e9f233c733e8..83e0ae1d7dd19e9f733a6e534494a8860ebaaae5 100644 (file)
@@ -61,7 +61,7 @@
  #endif
  
  /*
-@@ -3784,6 +3838,7 @@ static const struct board_info __initcon
+@@ -3787,6 +3841,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,
index f3d700a4d62e298b967358f991f20cd029ea5fc9..482b2028231aba3b84873b0d2b396bde1dffeccd 100644 (file)
@@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
-@@ -3828,6 +3944,7 @@ static const struct board_info __initcon
+@@ -3831,6 +3947,7 @@ static const struct board_info __initcon
        &board_963281TAN,
        &board_963281T_TEF,
        &board_dsl_274xb_f1,
index bfb2e6608e5f770def2554c20eaf64245d692b1a..05ef04da79e0b1cff1561a5319bcab09f6c57ee2 100644 (file)
@@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3783,6 +3783,96 @@ static struct board_info __initdata boar
+@@ -3786,6 +3786,96 @@ static struct board_info __initdata boar
        .devs = nb6_devices,
        .num_devs = ARRAY_SIZE(nb6_devices),
  };
@@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif
  
  /*
-@@ -4004,6 +4094,7 @@ static const struct board_info __initcon
+@@ -4007,6 +4097,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
        &board_nb6,
index 83ea8933a4eab38983be072c62829bacb7b98f35..91bd39a770e835353be63faa4f525bf8dd9b0191 100644 (file)
@@ -94,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4258,6 +4345,9 @@ static const struct board_info __initcon
+@@ -4261,6 +4348,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif
index e33b44810e3963686eabb7f7f31a6b40a07644da..e61fc4d9246335d4ee98a525932f0bf31acc3193 100644 (file)
@@ -95,7 +95,7 @@
  #endif
  
  /*
-@@ -4347,6 +4435,7 @@ static const struct board_info __initcon
+@@ -4350,6 +4438,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
index 251d1387f1e7932afacdf9ad8d9c8471a92690c6..ab5554d29d37d7a5689c91bb3993500c2fc685f7 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4427,6 +4427,75 @@ static struct board_info __initdata boar
+@@ -4430,6 +4430,75 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4511,6 +4580,9 @@ static const struct board_info __initcon
+@@ -4514,6 +4583,9 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
  #endif
index 5bef81064e19ecb7a7eeac78db05fdbf9512d4f9..c5810d343d89c888f152a2417a3188b13434bfbc 100644 (file)
@@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  #endif
  
  /*
-@@ -4547,6 +4592,7 @@ static const struct board_info __initcon
+@@ -4550,6 +4595,7 @@ static const struct board_info __initcon
        &board_96348A_122,
        &board_CPVA502plus,
        &board_96348W3,
index 08e404601e9a2d52ab66de65459758994412632c..131b1f095d0a69b4a37c4a60721b2513ac514e82 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4538,6 +4538,108 @@ static struct board_info __initdata boar
+@@ -4541,6 +4541,108 @@ static struct board_info __initdata boar
                },
        },
  };
  #endif
  
  /*
-@@ -4628,6 +4730,7 @@ static const struct board_info __initcon
+@@ -4631,6 +4733,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963269bhr,
index b9b4a843e27cde5f2da2376c2f78a6bd79714d9a..a34be1b4bf1ed96be295842a71c9a783cc96ddb3 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4475,6 +4475,131 @@ static struct board_info __initdata boar
+@@ -4478,6 +4478,131 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
  static struct board_info __initdata board_963269bhr = {
        .name                           = "963269BHR",
        .expected_cpu_id                = 0x63268,
-@@ -4729,6 +4854,7 @@ static const struct board_info __initcon
+@@ -4732,6 +4857,7 @@ static const struct board_info __initcon
        &board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
index abbacf4d2f2616cd454dda9e8a34f5259ef45b70..be8a5fa03525c72944e46328922fc1ad6095eb3d 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
  #include <linux/spi/74x164.h>
-@@ -4865,7 +4866,7 @@ static const struct board_info __initcon
+@@ -4868,7 +4869,7 @@ static const struct board_info __initcon
   * bcm4318 WLAN work
   */
  #ifdef CONFIG_SSB_PCIHOST
@@ -17,7 +17,7 @@
        .revision               = 0x02,
        .board_rev              = 0x17,
        .country_code           = 0x0,
-@@ -4885,6 +4886,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -4888,6 +4889,7 @@ static struct ssb_sprom bcm63xx_sprom =
        .boardflags_lo          = 0x2848,
        .boardflags_hi          = 0x0000,
  };