Просмотр исходного кода

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 <[email protected]>

SVN-Revision: 39325
Jonas Gorski 12 лет назад
Родитель
Сommit
66ec204935
38 измененных файлов с 83 добавлено и 70 удалено
  1. 8 3
      target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
  2. 1 1
      target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
  3. 1 1
      target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
  4. 1 1
      target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch
  5. 1 1
      target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
  6. 1 1
      target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch
  7. 1 1
      target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
  8. 3 2
      target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
  9. 1 1
      target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
  10. 2 2
      target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
  11. 2 2
      target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
  12. 1 1
      target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
  13. 1 1
      target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
  14. 1 1
      target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
  15. 1 1
      target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
  16. 3 3
      target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
  17. 2 2
      target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
  18. 1 1
      target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
  19. 1 1
      target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
  20. 1 1
      target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
  21. 2 2
      target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
  22. 2 2
      target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
  23. 4 3
      target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
  24. 1 1
      target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
  25. 3 2
      target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
  26. 3 2
      target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
  27. 3 2
      target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
  28. 2 2
      target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
  29. 4 3
      target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
  30. 2 2
      target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
  31. 1 1
      target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch
  32. 1 1
      target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch
  33. 1 1
      target/linux/brcm63xx/patches-3.10/552-board_96348gw-10_reset_button.patch
  34. 11 11
      target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
  35. 1 1
      target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch
  36. 3 2
      target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
  37. 3 2
      target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
  38. 2 2
      target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch

+ 8 - 3
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();
  

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 3 - 2
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,

+ 1 - 1
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,

+ 2 - 2
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,

+ 2 - 2
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);

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 3 - 3
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;

+ 2 - 2
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 2 - 2
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,

+ 2 - 2
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,

+ 4 - 3
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
  		}
  	}
  

+ 1 - 1
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,

+ 3 - 2
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,

+ 3 - 2
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,

+ 3 - 2
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,

+ 2 - 2
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,

+ 4 - 3
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();
  

+ 2 - 2
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,
  		},
  	},

+ 11 - 11
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 = {

+ 1 - 1
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,

+ 3 - 2
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

+ 3 - 2
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,

+ 2 - 2
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,
  };