Set usbh ports to 2 to fix #15007.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39681
--- /dev/null
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -634,6 +634,7 @@ static struct board_info __initdata boar
+ .has_ohci0 = 1,
+ .has_pccard = 1,
+ .has_ehci0 = 1,
++ .num_usbh_ports = 2,
+
+ .leds = {
+ {
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -911,6 +911,8 @@ void __init board_prom_init(void)
+@@ -912,6 +912,8 @@ void __init board_prom_init(void)
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G3_EXT_MII |
GPIO_MODE_6348_G0_EXT_MII;
#include <uapi/linux/bcm933xx_hcs.h>
#include <uapi/linux/bcm963xx_tag.h>
-@@ -968,6 +969,7 @@ int __init board_register_devices(void)
+@@ -969,6 +970,7 @@ int __init board_register_devices(void)
int button_count = 0;
int led_count = 0;
int usbh_ports = 0;
if (board.has_uart0)
bcm63xx_uart_register(0);
-@@ -1013,7 +1015,8 @@ int __init board_register_devices(void)
+@@ -1014,7 +1016,8 @@ int __init board_register_devices(void)
* do this after registering enet devices
*/
#ifdef CONFIG_SSB_PCIHOST
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
if (ssb_arch_register_fallback_sprom(
-@@ -1060,5 +1063,9 @@ int __init board_register_devices(void)
+@@ -1061,5 +1064,9 @@ int __init board_register_devices(void)
platform_device_register(&bcm63xx_gpio_keys_device);
}
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1035,7 +1035,7 @@ int __init board_register_devices(void)
+@@ -1036,7 +1036,7 @@ int __init board_register_devices(void)
if (board.num_spis)
spi_register_board_info(board.spis, board.num_spis);
return;
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1065,7 +1065,8 @@ int __init board_register_devices(void)
+@@ -1066,7 +1066,8 @@ int __init board_register_devices(void)
/* register any fixups */
for (i = 0; i < board.has_caldata; i++)
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1066,7 +1066,7 @@ int __init board_register_devices(void)
+@@ -1067,7 +1067,7 @@ int __init board_register_devices(void)
/* register any fixups */
for (i = 0; i < board.has_caldata; i++)
pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset,
#include <uapi/linux/bcm933xx_hcs.h>
#include <uapi/linux/bcm963xx_tag.h>
-@@ -1064,9 +1065,19 @@ int __init board_register_devices(void)
+@@ -1065,9 +1066,19 @@ int __init board_register_devices(void)
}
/* register any fixups */
#endif
/*
-@@ -732,6 +782,7 @@ static const struct board_info __initcon
+@@ -733,6 +783,7 @@ static const struct board_info __initcon
&board_DV201AMR,
&board_96348gw_a,
&board_rta1025w_16,
static struct board_info board;
/*
-@@ -754,6 +762,601 @@ static struct board_info __initdata boar
+@@ -755,6 +763,601 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
#endif
/*
-@@ -790,6 +1393,11 @@ static const struct board_info __initcon
+@@ -791,6 +1394,11 @@ static const struct board_info __initcon
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
#endif
};
-@@ -844,6 +1452,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -845,6 +1453,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();
#endif
/*
-@@ -1372,6 +1406,7 @@ static const struct board_info __initcon
+@@ -1373,6 +1407,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
&board_96338w,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -753,6 +753,98 @@ static struct board_info __initdata boar
+@@ -754,6 +754,98 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0",
.expected_cpu_id = 0x6358,
-@@ -1427,6 +1519,7 @@ static const struct board_info __initcon
+@@ -1428,6 +1520,7 @@ static const struct board_info __initcon
&board_96358vw,
&board_96358vw2,
&board_AGPFS0,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -889,6 +889,61 @@ static struct board_info __initdata boar
+@@ -890,6 +890,61 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
struct spi_gpio_platform_data nb4_spi_gpio_data = {
.sck = NB4_SPI_GPIO_CLK,
.mosi = NB4_SPI_GPIO_MOSI,
-@@ -1521,6 +1576,7 @@ static const struct board_info __initcon
+@@ -1522,6 +1577,7 @@ static const struct board_info __initcon
&board_AGPFS0,
&board_CPVA642,
&board_DWVS0,
#endif
/*
-@@ -1568,6 +1629,7 @@ static const struct board_info __initcon
+@@ -1569,6 +1630,7 @@ static const struct board_info __initcon
&board_96348gw_a,
&board_rta1025w_16,
&board_96348_D4PW,
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.expected_cpu_id = 0x6348,
-@@ -1622,6 +1728,8 @@ static const struct board_info __initcon
+@@ -1623,6 +1729,8 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,
#endif
/*
-@@ -1738,6 +1810,7 @@ static const struct board_info __initcon
+@@ -1739,6 +1811,7 @@ static const struct board_info __initcon
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1777,6 +1777,83 @@ static struct board_info __initdata boar
+@@ -1778,6 +1778,83 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
#endif
/*
-@@ -1825,6 +1902,7 @@ static const struct board_info __initcon
+@@ -1826,6 +1903,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
#endif
/*
-@@ -1870,6 +1909,7 @@ static const struct board_info __initcon
+@@ -1871,6 +1910,7 @@ static const struct board_info __initcon
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1893,6 +1893,72 @@ static struct board_info __initdata boar
+@@ -1894,6 +1894,72 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -1943,6 +2009,7 @@ static const struct board_info __initcon
+@@ -1944,6 +2010,7 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,
#endif
/*
-@@ -1994,6 +2053,7 @@ static const struct board_info __initcon
+@@ -1995,6 +2054,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2115,6 +2175,22 @@ void __init board_prom_init(void)
+@@ -2116,6 +2176,22 @@ void __init board_prom_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2054,6 +2112,7 @@ static const struct board_info __initcon
+@@ -2055,6 +2113,7 @@ static const struct board_info __initcon
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2113,6 +2158,7 @@ static const struct board_info __initcon
+@@ -2114,6 +2159,7 @@ static const struct board_info __initcon
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1312,6 +1312,8 @@ static struct board_info __initdata boar
+@@ -1313,6 +1313,8 @@ static struct board_info __initdata boar
.name = "DWV-S0",
.expected_cpu_id = 0x6358,
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
-@@ -1327,6 +1329,7 @@ static struct board_info __initdata boar
+@@ -1328,6 +1330,7 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2162,6 +2225,7 @@ static const struct board_info __initcon
+@@ -2163,6 +2226,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
#endif
/*
-@@ -2227,6 +2267,7 @@ static const struct board_info __initcon
+@@ -2228,6 +2268,7 @@ static const struct board_info __initcon
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2231,6 +2231,85 @@ static struct board_info __initdata boar
+@@ -2232,6 +2232,85 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2285,6 +2364,10 @@ static const struct board_info __initcon
+@@ -2286,6 +2365,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif
};
/*
-@@ -2466,12 +2549,25 @@ void __init board_prom_init(void)
+@@ -2467,12 +2550,25 @@ void __init board_prom_init(void)
bcm63xx_pci_enabled = 1;
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G2_PCI;
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2307,6 +2307,72 @@ static struct board_info __initdata boar
+@@ -2308,6 +2308,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif
/*
-@@ -2367,6 +2433,7 @@ static const struct board_info __initcon
+@@ -2368,6 +2434,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
#endif
/*
-@@ -2416,6 +2486,7 @@ static const struct board_info __initcon
+@@ -2417,6 +2487,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
#endif
/*
-@@ -2487,6 +2592,7 @@ static const struct board_info __initcon
+@@ -2488,6 +2593,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
#endif
/*
-@@ -2622,6 +2675,7 @@ static const struct board_info __initcon
+@@ -2623,6 +2676,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,
static struct board_info board;
/*
-@@ -2346,6 +2353,113 @@ static struct board_info __initdata boar
+@@ -2347,6 +2354,113 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2690,6 +2804,7 @@ static const struct board_info __initcon
+@@ -2691,6 +2805,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2602,6 +2602,73 @@ static struct board_info __initdata boar
+@@ -2603,6 +2603,73 @@ static struct board_info __initdata boar
},
}
};
#endif
/*
-@@ -2807,6 +2874,7 @@ static const struct board_info __initcon
+@@ -2808,6 +2875,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
-@@ -2671,6 +2674,104 @@ static struct board_info __initdata boar
+@@ -2672,6 +2675,104 @@ static struct board_info __initdata boar
};
#endif
/*
* known 6368 boards
*/
-@@ -2877,6 +2978,10 @@ static const struct board_info __initcon
+@@ -2878,6 +2979,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -2944,6 +3049,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2945,6 +3050,11 @@ static void __init boardid_fixup(u8 *boo
}
}
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -2946,6 +2997,7 @@ static const struct board_info __initcon
+@@ -2947,6 +2998,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
-@@ -2978,6 +3098,7 @@ static const struct board_info __initcon
+@@ -2979,6 +3099,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
-@@ -3097,6 +3170,7 @@ static const struct board_info __initcon
+@@ -3098,6 +3171,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
static struct board_info __initdata board_96328A_1441N1 = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
-@@ -3170,6 +3237,7 @@ static const struct board_info __initcon
+@@ -3171,6 +3238,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
#endif
/*
-@@ -3251,6 +3300,7 @@ static const struct board_info __initcon
+@@ -3252,6 +3301,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2900,6 +2900,492 @@ static struct board_info __initdata boar
+@@ -2901,6 +2901,492 @@ static struct board_info __initdata boar
},
};
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -3339,6 +3825,10 @@ static const struct board_info __initcon
+@@ -3340,6 +3826,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -3404,13 +3894,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3405,13 +3895,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();
#endif
/*
-@@ -3787,6 +3841,7 @@ static const struct board_info __initcon
+@@ -3788,6 +3842,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -3831,6 +3947,7 @@ static const struct board_info __initcon
+@@ -3832,6 +3948,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_963281T_TEF,
&board_dsl_274xb_f1,
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3786,6 +3786,96 @@ static struct board_info __initdata boar
+@@ -3787,6 +3787,96 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
#endif
/*
-@@ -4007,6 +4097,7 @@ static const struct board_info __initcon
+@@ -4008,6 +4098,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2210,6 +2210,99 @@ static struct board_info __initdata boar
+@@ -2211,6 +2211,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2228,6 +2250,8 @@ static struct board_info __initdata boar
+@@ -2229,6 +2251,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2345,6 +2369,8 @@ static struct board_info __initdata boar
+@@ -2346,6 +2370,8 @@ static struct board_info __initdata boar
},
.enet1 = {
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2377,6 +2377,94 @@ static struct board_info __initdata boar
+@@ -2378,6 +2378,94 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4261,6 +4348,9 @@ static const struct board_info __initcon
+@@ -4262,6 +4349,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
#endif
/*
-@@ -4350,6 +4438,7 @@ static const struct board_info __initcon
+@@ -4351,6 +4439,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4430,6 +4430,75 @@ static struct board_info __initdata boar
+@@ -4431,6 +4431,75 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4514,6 +4583,9 @@ static const struct board_info __initcon
+@@ -4515,6 +4584,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
#endif
/*
-@@ -4550,6 +4595,7 @@ static const struct board_info __initcon
+@@ -4551,6 +4596,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4541,6 +4541,108 @@ static struct board_info __initdata boar
+@@ -4542,6 +4542,108 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -4631,6 +4733,7 @@ static const struct board_info __initcon
+@@ -4632,6 +4734,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4478,6 +4478,131 @@ static struct board_info __initdata boar
+@@ -4479,6 +4479,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,
-@@ -4732,6 +4857,7 @@ static const struct board_info __initcon
+@@ -4733,6 +4858,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
#include <linux/spi/74x164.h>
-@@ -4868,7 +4869,7 @@ static const struct board_info __initcon
+@@ -4869,7 +4870,7 @@ static const struct board_info __initcon
* bcm4318 WLAN work
*/
#ifdef CONFIG_SSB_PCIHOST
.revision = 0x02,
.board_rev = 0x17,
.country_code = 0x0,
-@@ -4888,6 +4889,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -4889,6 +4890,7 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848,
.boardflags_hi = 0x0000,
};