From ddd35f4b6f33483ef3f6bb8798769976466dcb73 Mon Sep 17 00:00:00 2001 From: jogo Date: Sat, 22 Feb 2014 11:16:50 +0000 Subject: brcm63xx: fix number of usb ports for HW556 variants Don't only fix up the fallback board, but also all three variants. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39680 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm63xx/patches-3.10/534-board_hw556.patch | 9 ++++++--- target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch | 2 +- target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch | 2 +- target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch | 4 ++-- target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch | 2 +- target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch | 2 +- target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch | 4 ++-- target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch | 2 +- target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch | 4 ++-- target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch | 4 ++-- .../brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch | 4 ++-- 11 files changed, 21 insertions(+), 18 deletions(-) (limited to 'target/linux/brcm63xx') 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 4eb6d55d33..63eb226ec1 100644 --- 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 -@@ -2900,6 +2900,489 @@ static struct board_info __initdata boar +@@ -2900,6 +2900,492 @@ static struct board_info __initdata boar }, }; @@ -102,6 +102,7 @@ + .has_pci = 1, + .has_ohci0 = 1, + .has_ehci0 = 1, ++ .num_usbh_ports = 2, + + .has_caldata = 1, + .caldata = { @@ -228,6 +229,7 @@ + .has_pci = 1, + .has_ohci0 = 1, + .has_ehci0 = 1, ++ .num_usbh_ports = 2, + + .has_caldata = 1, + .caldata = { @@ -361,6 +363,7 @@ + .has_pci = 1, + .has_ohci0 = 1, + .has_ehci0 = 1, ++ .num_usbh_ports = 2, + + .has_caldata = 1, + .caldata = { @@ -490,7 +493,7 @@ /* 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, @@ -501,7 +504,7 @@ &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(); 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 521c093d11..83e0ae1d7d 100644 --- a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch +++ b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch @@ -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, diff --git a/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch index f3d700a4d6..482b202823 100644 --- a/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch @@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski 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, diff --git a/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch index bfb2e6608e..05ef04da79 100644 --- a/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch +++ b/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch @@ -6,7 +6,7 @@ Signed-off-by: Max Staudt --- --- 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 #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, 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 83ea8933a4..91bd39a770 100644 --- a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch +++ b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch @@ -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 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 e33b44810e..e61fc4d924 100644 --- a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch +++ b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch @@ -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, diff --git a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch index 251d1387f1..ab5554d29d 100644 --- a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch +++ b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch @@ -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 diff --git a/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch index 5bef81064e..c5810d343d 100644 --- a/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch +++ b/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch @@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks #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, diff --git a/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch index 08e404601e..131b1f095d 100644 --- a/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch +++ b/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch @@ -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 }, }, }; @@ -109,7 +109,7 @@ #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, diff --git a/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch index b9b4a843e2..a34be1b4bf 100644 --- a/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch +++ b/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch @@ -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 @@ -132,7 +132,7 @@ 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 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 abbacf4d2f..be8a5fa035 100644 --- 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 #include #include -@@ -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, }; -- cgit v1.2.3