brcm63xx: set usb host port number for some devices

Update a few devices with their actual port numbers, especially those
with two ports.

Should allow properly using the second port on the Neufboxen and HW553
and HW556.

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

diff --git a/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
index 94da7ba149e18e23466fd0f2552c7ed3a1649bb7..76b339c419cd8d44215237822be008eb4208d186 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
@@ -22,7 +22,7 @@
  static struct board_info board;
  
  /*
-@@ -754,6 +762,596 @@ static struct board_info __initdata boar
+@@ -754,6 +762,601 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
  };
@@ -87,6 +87,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -200,6 +201,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -313,6 +315,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -426,6 +429,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -534,6 +538,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -619,7 +624,7 @@
  #endif
  
  /*
-@@ -790,6 +1388,11 @@ static const struct board_info __initcon
+@@ -790,6 +1393,11 @@ static const struct board_info __initcon
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
@@ -631,7 +636,7 @@
  #endif
  };
  
-@@ -844,6 +1447,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -844,6 +1452,16 @@ 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();
  

diff --git a/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
index 5baa1d391de82f9c76987d6ca07ae6745fe3db81..3af2da8807874dbb2fc25202e93b39bb42abb903 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
@@ -41,7 +41,7 @@
  #endif
  
  /*
-@@ -1367,6 +1401,7 @@ static const struct board_info __initcon
+@@ -1372,6 +1406,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
        &board_96338w,

diff --git a/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
index 810aca096267c07141d58337566934cf30a4f66c..64057fa42779c1b3d1c862116c1ddac47f1d73cb 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
@@ -99,7 +99,7 @@
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,
-@@ -1422,6 +1514,7 @@ static const struct board_info __initcon
+@@ -1427,6 +1519,7 @@ static const struct board_info __initcon
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,

diff --git a/target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch
index 29bbde3f015695cd997895ee2bc58b42dbcd9419..ed67a35f7b534282048507915fa95bdbed7ddac8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch
@@ -62,7 +62,7 @@
  struct spi_gpio_platform_data nb4_spi_gpio_data = {
        .sck            = NB4_SPI_GPIO_CLK,
        .mosi           = NB4_SPI_GPIO_MOSI,
-@@ -1516,6 +1571,7 @@ static const struct board_info __initcon
+@@ -1521,6 +1576,7 @@ static const struct board_info __initcon
        &board_AGPFS0,
        &board_CPVA642,
        &board_DWVS0,

diff --git a/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
index 4270f7ff6cac24da747e9dccadadcaf8000ef9ab..5ff3c14887ed64052d81ac01e597b4dc562b2802 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
@@ -68,7 +68,7 @@
  #endif
  
  /*
-@@ -1563,6 +1624,7 @@ static const struct board_info __initcon
+@@ -1568,6 +1629,7 @@ static const struct board_info __initcon
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,

diff --git a/target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch
index 658f7f1d4fb458417bcd65b535ff96332f131f75..1371b5969a8d9686793a0109fe7a3226780637b9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch
@@ -113,7 +113,7 @@
  static struct board_info __initdata board_FAST2404 = {
        .name                           = "F@ST2404",
        .expected_cpu_id                = 0x6348,
-@@ -1617,6 +1723,8 @@ static const struct board_info __initcon
+@@ -1622,6 +1728,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
        &board_96348gw,

diff --git a/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
index 19403d8b07001e272638ef24264e28879fc7a933..80e27f96ce950cb1983db5e6b924126096b36aca 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
@@ -79,7 +79,7 @@
  #endif
  
  /*
-@@ -1733,6 +1805,7 @@ static const struct board_info __initcon
+@@ -1738,6 +1810,7 @@ static const struct board_info __initcon
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,

diff --git a/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
index 1370c6c19eef97fe25543cab8d1c1b88667cf1a2..5f3a795de7e575042c856ba401f8e59bad419174 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1772,6 +1772,82 @@ static struct board_info __initdata boar
+@@ -1777,6 +1777,83 @@ static struct board_info __initdata boar
        .spis = nb4_spi_devices,
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
@@ -29,6 +29,7 @@
 +
 +      .has_ohci0 = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -83,7 +84,7 @@
  #endif
  
  /*
-@@ -1820,6 +1896,7 @@ static const struct board_info __initcon
+@@ -1825,6 +1902,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,

diff --git a/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
index a84c89755f60704ea83863c399f4434bdd6bd617..9df16aec26727b6676d871be3281a89bd6b9d6d1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
@@ -46,7 +46,7 @@
  #endif
  
  /*
-@@ -1864,6 +1903,7 @@ static const struct board_info __initcon
+@@ -1870,6 +1909,7 @@ static const struct board_info __initcon
        &board_96338gw,
        &board_96338w,
        &board_96338w2_e7t,

diff --git a/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
index 328233b564faf1e0faaa2cca42d146a6ed2b6a60..d9d737a874495bf9164ef82b8178b7f7cd04f2e6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1887,6 +1887,72 @@ static struct board_info __initdata boar
+@@ -1893,6 +1893,72 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -73,7 +73,7 @@
  #endif
  
  /*
-@@ -1937,6 +2003,7 @@ static const struct board_info __initcon
+@@ -1943,6 +2009,7 @@ static const struct board_info __initcon
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
        &board_HW553,

diff --git a/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
index 901b5acca7028edd14338bc03abc98046107ff1f..ea9a0c227ca40a01b470617f1c66573b98852080 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
@@ -66,7 +66,7 @@
  #endif
  
  /*
-@@ -1988,6 +2047,7 @@ static const struct board_info __initcon
+@@ -1994,6 +2053,7 @@ static const struct board_info __initcon
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -74,7 +74,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2109,6 +2169,22 @@ void __init board_prom_init(void)
+@@ -2115,6 +2175,22 @@ void __init board_prom_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);

diff --git a/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
index d4fe2fa8f3141807393c237252df46b12a270b96..39e63093e7030a711b84c5ce5ac699ea31d89d86 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
@@ -65,7 +65,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2048,6 +2106,7 @@ static const struct board_info __initcon
+@@ -2054,6 +2112,7 @@ static const struct board_info __initcon
        &board_spw500v,
        &board_96348sv,
        &board_V2500V_BB,

diff --git a/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
index 6f2e25a6603c02b3693f11a733c560f4b11ec27c..e6a811b3dc5a6f6c6806586aaaf3b73b23e5a742 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
@@ -52,7 +52,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2107,6 +2152,7 @@ static const struct board_info __initcon
+@@ -2113,6 +2158,7 @@ static const struct board_info __initcon
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,

diff --git a/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
index 6541419050d8548caeebc7850662b2b3cc3b153e..7bd29f32f7c950bbc31a5e2724fa8e4b9d96064d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
@@ -70,7 +70,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2156,6 +2219,7 @@ static const struct board_info __initcon
+@@ -2162,6 +2225,7 @@ static const struct board_info __initcon
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,

diff --git a/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
index ba1a39fc18c53b51ed3424c5e2aeaa5aa1997b1a..a7e72f3b792fa92033d616fdee5cd13f6be71ada 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
@@ -47,7 +47,7 @@
  #endif
  
  /*
-@@ -2221,6 +2261,7 @@ static const struct board_info __initcon
+@@ -2227,6 +2267,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,

diff --git a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 067ab3b792bc8e7a08998c97bccb5f6c8421ad3a..833cf97b05d7f55a28db41282d716da5f403aaf4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2225,6 +2225,85 @@ static struct board_info __initdata boar
+@@ -2231,6 +2231,85 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -96,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2279,6 +2358,10 @@ static const struct board_info __initcon
+@@ -2285,6 +2364,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
@@ -107,7 +107,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  /*
-@@ -2460,12 +2543,25 @@ void __init board_prom_init(void)
+@@ -2466,12 +2549,25 @@ void __init board_prom_init(void)
                bcm63xx_pci_enabled = 1;
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;

diff --git a/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index f42f2c9a31577034a6bca551f489a26573de4a99..d67fe7994f00fc5aa7ed3ec40a9f7d590239466a 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2301,6 +2301,72 @@ static struct board_info __initdata boar
+@@ -2307,6 +2307,72 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
@@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif
  
  /*
-@@ -2361,6 +2427,7 @@ static const struct board_info __initcon
+@@ -2367,6 +2433,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,

diff --git a/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 30229d41f25983801ddd96de0fc4e3d83b06f315..6d477576f7ab4e830bad6bda3d50004f4112d448 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  
  /*
-@@ -2410,6 +2480,7 @@ static const struct board_info __initcon
+@@ -2416,6 +2486,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
index fc7176bab97e66a01f58134b782c32b38c6f1311..26725ca51dd0fc27cb0407a5053be3c499a018ae 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  
  /*
-@@ -2481,6 +2586,7 @@ static const struct board_info __initcon
+@@ -2487,6 +2592,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,

diff --git a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
index 9d8d965ecb9a6b7526724f461e8ee9f2856b0ec0..76632265066b3c0502111ac7529af2ce7cb702d9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
@@ -60,7 +60,7 @@
  #endif
  
  /*
-@@ -2616,6 +2669,7 @@ static const struct board_info __initcon
+@@ -2622,6 +2675,7 @@ static const struct board_info __initcon
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,

diff --git a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
index 607e9c0b609a7b2c73fd0460437c6139a3832b79..82e899acf6036277acfaa4cd1e49fc4914c5182c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
@@ -14,7 +14,7 @@
  static struct board_info board;
  
  /*
-@@ -2341,6 +2348,113 @@ static struct board_info __initdata boar
+@@ -2346,6 +2353,113 @@ static struct board_info __initdata boar
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
  
@@ -128,7 +128,7 @@
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -2684,6 +2798,7 @@ static const struct board_info __initcon
+@@ -2690,6 +2804,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,

diff --git a/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
index 9c4a9a5c839fa78925a35c4e2df211fe80249f34..16c328a8331185e027c1a4a6a008deecff98eea3 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2596,6 +2596,73 @@ static struct board_info __initdata boar
+@@ -2602,6 +2602,73 @@ static struct board_info __initdata boar
                },
        }
  };
@@ -74,7 +74,7 @@
  #endif
  
  /*
-@@ -2801,6 +2868,7 @@ static const struct board_info __initcon
+@@ -2807,6 +2874,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,

diff --git a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
index 6b6d00de88ee51b4e1cb3272327e2046c325d45c..ca3d6ed2dde10343182c6f49d5a76725feb8c227 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2665,6 +2668,103 @@ static struct board_info __initdata boar
+@@ -2671,6 +2674,104 @@ static struct board_info __initdata boar
  };
  #endif
  
@@ -62,6 +62,7 @@
 +
 +      .has_ohci0                      = 1,
 +      .has_ehci0                      = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .has_enetsw                     = 1,
 +
@@ -121,7 +122,7 @@
  /*
   * known 6368 boards
   */
-@@ -2871,6 +2971,10 @@ static const struct board_info __initcon
+@@ -2877,6 +2978,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
@@ -132,7 +133,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2938,6 +3042,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2944,6 +3049,11 @@ static void __init boardid_fixup(u8 *boo
                }
        }
  

diff --git a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
index ab79266276d5346a567ed6cd8d7fac4b874f3aa0..b05ceacc20140a21a5b7259e00c62ce23c7c41f7 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
@@ -58,7 +58,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
-@@ -2939,6 +2990,7 @@ static const struct board_info __initcon
+@@ -2946,6 +2997,7 @@ static const struct board_info __initcon
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,

diff --git a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch b/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
index c894eb266c4f874be0d422017675dbb207cbf85d..099359ffbef1d22dbe1d9bf1b0b3747ef4618763 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
+++ b/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -250,6 +250,125 @@ static struct board_info __initdata boar
+@@ -250,6 +250,126 @@ static struct board_info __initdata boar
        },
  };
  
@@ -12,6 +12,7 @@
 +      .has_pci                                = 1,
 +      .has_ohci0                              = 1,
 +      .has_ehci0                              = 1,
++      .num_usbh_ports                         = 1,
 +      .has_enetsw                             = 1,
 +
 +      .enetsw = {
@@ -126,7 +127,7 @@
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -2971,6 +3090,7 @@ static const struct board_info __initcon
+@@ -2978,6 +3098,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,

diff --git a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
index 9ec63200e12d26d9e24269ecbe33e7c2523b3cd0..8a2df749315d0065f2bb106742be68ea95f3419f 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
+++ b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -180,6 +180,78 @@ static struct board_info __initdata boar
+@@ -180,6 +180,79 @@ static struct board_info __initdata boar
        },
  };
  
@@ -12,6 +12,7 @@
 +      .has_pci                                = 1,
 +      .has_ohci0                              = 1,
 +      .has_ehci0                              = 1,
++      .num_usbd_ports                         = 1,
 +      .has_enetsw                             = 1,
 +
 +      .enetsw = {
@@ -79,7 +80,7 @@
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -3089,6 +3161,7 @@ static const struct board_info __initcon
+@@ -3097,6 +3170,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
index f887a3c9a4b70121c465ed74075ae314c37ebbef..b675106065bcbb37a9cb9397c42ec8bfd1d397ec 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
+++ b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -180,6 +180,72 @@ static struct board_info __initdata boar
+@@ -180,6 +180,73 @@ static struct board_info __initdata boar
        },
  };
  
@@ -12,6 +12,7 @@
 +      .has_pci                                = 1,
 +      .has_ohci0                              = 1,
 +      .has_ehci0                              = 1,
++      .num_usbh_ports                         = 1,
 +      .has_enetsw                             = 1,
 +
 +      .enetsw = {
@@ -73,7 +74,7 @@
  static struct board_info __initdata board_96328A_1441N1 = {
        .name                                   = "96328A-1441N1",
        .expected_cpu_id                        = 0x6328,
-@@ -3161,6 +3227,7 @@ static const struct board_info __initcon
+@@ -3170,6 +3237,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
index 7ffc1ec7597005989cc03cd798ac6444de906fe0..85c867d3dfb4c42e140cb59200856b43b5e9a235 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -785,6 +785,55 @@ static struct board_info __initdata boar
+@@ -788,6 +788,55 @@ static struct board_info __initdata boar
  
        .has_uart0                      = 1,
  };
@@ -56,7 +56,7 @@
  #endif
  
  /*
-@@ -3241,6 +3290,7 @@ static const struct board_info __initcon
+@@ -3251,6 +3300,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,

diff --git a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
index cb15163fe0ba11b26b8e16d0cb44e59617529463..4eb6d55d335439870a8691298d5515c9f67de8bf 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2891,6 +2891,488 @@ static struct board_info __initdata boar
+@@ -2900,6 +2900,489 @@ static struct board_info __initdata boar
        },
  };
  
@@ -12,6 +12,7 @@
 +      .has_pci                                = 1,
 +      .has_ohci0                              = 1,
 +      .has_ehci0                              = 1,
++      .num_usbh_ports                         = 2,
 +
 +      .has_caldata                            = 1,
 +      .caldata = {
@@ -489,7 +490,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -3329,6 +3811,10 @@ static const struct board_info __initcon
+@@ -3339,6 +3822,10 @@ static const struct board_info __initcon
        &board_nb4_fxc_r2,
        &board_ct6373_1,
        &board_HW553,
@@ -500,7 +501,7 @@
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -3394,13 +3880,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3404,13 +3891,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();
  

diff --git a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
index 2bf5ca458256a7a8223e6c93e618cbe4ba638ffb..521c093d1179c5ac8cae9770e9e0e9f233c733e8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -773,6 +773,60 @@ static struct board_info __initdata boar
+@@ -776,6 +776,60 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -61,7 +61,7 @@
  #endif
  
  /*
-@@ -3773,6 +3827,7 @@ static const struct board_info __initcon
+@@ -3784,6 +3838,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,

diff --git a/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch
index 4578a1d514c1d0f34252a767d0cd57aed6e2344b..0d65f3ed3701487a1004d502c66f826721dffb24 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2091,6 +2091,99 @@ static struct board_info __initdata boar
+@@ -2094,6 +2094,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,

diff --git a/target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch
index 67246d2d6006299affac748eafd51b8737bc0567..2a04ad1583175f5eff73680788194b045b5a2662 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch
+++ b/target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1536,6 +1536,19 @@ static struct board_info __initdata boar
+@@ -1539,6 +1539,19 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0 = 1,

diff --git a/target/linux/brcm63xx/patches-3.10/552-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.10/552-board_96348gw-10_reset_button.patch
index 1562631b2bccfcee47a165364d7fbac8ed981649..7a310390e2f6d022d71fcac78c1a66f1d87f70a4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/552-board_96348gw-10_reset_button.patch
+++ b/target/linux/brcm63xx/patches-3.10/552-board_96348gw-10_reset_button.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -996,6 +996,17 @@ static struct board_info __initdata boar
+@@ -999,6 +999,17 @@ static struct board_info __initdata boar
                        .active_low     = 1,
                },
        },

diff --git a/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
index b7943f776a3c2edabf5e49e90e9b9450bb8f1404..882b141794d6f1b37aca84e4b70229b9ef74debe 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -624,6 +624,8 @@ static struct board_info __initdata boar
+@@ -627,6 +627,8 @@ static struct board_info __initdata boar
        .has_uart0                      = 1,
        .has_enet0                      = 1,
        .enet0 = {
@@ -9,7 +9,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -667,6 +669,8 @@ static struct board_info __initdata boar
+@@ -670,6 +672,8 @@ static struct board_info __initdata boar
        .has_uart0                      = 1,
        .has_enet0                      = 1,
        .enet0 = {
@@ -18,7 +18,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -952,6 +956,8 @@ static struct board_info __initdata boar
+@@ -955,6 +959,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -27,7 +27,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1024,6 +1030,8 @@ static struct board_info __initdata boar
+@@ -1027,6 +1033,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -36,7 +36,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1253,6 +1261,8 @@ static struct board_info __initdata boar
+@@ -1256,6 +1264,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -45,7 +45,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1428,6 +1438,8 @@ static struct board_info __initdata boar
+@@ -1431,6 +1441,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -54,7 +54,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1542,6 +1554,12 @@ static struct board_info __initdata boar
+@@ -1545,6 +1557,12 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -67,7 +67,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1917,6 +1935,8 @@ static struct board_info __initdata boar
+@@ -1920,6 +1938,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -76,7 +76,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1969,6 +1989,8 @@ static struct board_info __initdata boar
+@@ -1972,6 +1992,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -85,7 +85,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2109,6 +2131,8 @@ static struct board_info __initdata boar
+@@ -2112,6 +2134,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -94,7 +94,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2226,6 +2250,8 @@ static struct board_info __initdata boar
+@@ -2229,6 +2253,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {

diff --git a/target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch b/target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch
index 32a431504fae31ac6e81382bae4958efc8e382f1..0f5c7f3fad45c1026923601d0350afdc1adb0ab8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch
+++ b/target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2258,6 +2258,94 @@ static struct board_info __initdata boar
+@@ -2261,6 +2261,94 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
        .has_ehci0                      = 1,

diff --git a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
index 901a0d85877f27596af4f894de42e8ab3d6a9ce3..11cc46b405c5fdb0e04c2c3247c0a5275c7958e1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -102,6 +102,92 @@ static struct board_info __initdata boar
+@@ -102,6 +102,93 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -24,6 +24,7 @@
 +      .has_enetsw                     = 1,
 +
 +      .has_ehci0                      = 1,
++      .num_usbh_ports                 = 1,
 +
 +      .enetsw = {
 +              .used_ports = {
@@ -93,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4041,6 +4127,9 @@ static const struct board_info __initcon
+@@ -4052,6 +4139,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif

diff --git a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
index 35454d778af0c51fb20a7c377a0e5a02f5e206e4..edabea5f1894360cbd309a98074a2df35f46d7ff 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -185,6 +185,93 @@ static struct board_info __initdata boar
+@@ -186,6 +186,94 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -22,6 +22,7 @@
 +      .has_enetsw                     = 1,
 +
 +      .has_ehci0                      = 1,
++      .num_usbh_ports                 = 1,
 +
 +      .enetsw = {
 +              .used_ports = {
@@ -94,7 +95,7 @@
  #endif
  
  /*
-@@ -4129,6 +4216,7 @@ static const struct board_info __initcon
+@@ -4141,6 +4229,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,

diff --git a/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch
index 9c3b299de98638f7ceae5e1cb084001c8c4572a2..bfe7f9b90ff98e9a49b3449b63d9c7e71d730f98 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch
@@ -8,7 +8,7 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
  #include <linux/spi/74x164.h>
-@@ -4297,7 +4298,7 @@ static const struct board_info __initcon
+@@ -4310,7 +4311,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,
-@@ -4317,6 +4318,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -4330,6 +4331,7 @@ static struct ssb_sprom bcm63xx_sprom =
        .boardflags_lo          = 0x2848,
        .boardflags_hi          = 0x0000,
  };