mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	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 <jogo@openwrt.org> SVN-Revision: 39680
This commit is contained in:
		
							parent
							
								
									ece12908a8
								
							
						
					
					
						commit
						4a2f87bce0
					
				@ -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();
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
@ -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,
 | 
			
		||||
 | 
			
		||||
@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 | 
			
		||||
 static struct board_info __initdata board_rta1025w_16 = {
 | 
			
		||||
 	.name				= "RTA1025W_16",
 | 
			
		||||
 	.expected_cpu_id		= 0x6348,
 | 
			
		||||
@@ -3828,6 +3944,7 @@ static const struct board_info __initcon
 | 
			
		||||
@@ -3831,6 +3947,7 @@ static const struct board_info __initcon
 | 
			
		||||
 	&board_963281TAN,
 | 
			
		||||
 	&board_963281T_TEF,
 | 
			
		||||
 	&board_dsl_274xb_f1,
 | 
			
		||||
 | 
			
		||||
@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 | 
			
		||||
---
 | 
			
		||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 | 
			
		||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
 | 
			
		||||
@@ -3783,6 +3783,96 @@ static struct board_info __initdata boar
 | 
			
		||||
@@ -3786,6 +3786,96 @@ static struct board_info __initdata boar
 | 
			
		||||
 	.devs = nb6_devices,
 | 
			
		||||
 	.num_devs = ARRAY_SIZE(nb6_devices),
 | 
			
		||||
 };
 | 
			
		||||
@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 | 
			
		||||
 #endif
 | 
			
		||||
 
 | 
			
		||||
 /*
 | 
			
		||||
@@ -4004,6 +4094,7 @@ static const struct board_info __initcon
 | 
			
		||||
@@ -4007,6 +4097,7 @@ static const struct board_info __initcon
 | 
			
		||||
 
 | 
			
		||||
 #ifdef CONFIG_BCM63XX_CPU_6362
 | 
			
		||||
 	&board_nb6,
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
@ -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,
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 | 
			
		||||
 #endif
 | 
			
		||||
 
 | 
			
		||||
 /*
 | 
			
		||||
@@ -4547,6 +4592,7 @@ static const struct board_info __initcon
 | 
			
		||||
@@ -4550,6 +4595,7 @@ static const struct board_info __initcon
 | 
			
		||||
 	&board_96348A_122,
 | 
			
		||||
 	&board_CPVA502plus,
 | 
			
		||||
 	&board_96348W3,
 | 
			
		||||
 | 
			
		||||
@ -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,
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
@ -8,7 +8,7 @@
 | 
			
		||||
 #include <linux/spi/spi.h>
 | 
			
		||||
 #include <linux/spi/spi_gpio.h>
 | 
			
		||||
 #include <linux/spi/74x164.h>
 | 
			
		||||
@@ -4865,7 +4866,7 @@ static const struct board_info __initcon
 | 
			
		||||
@@ -4868,7 +4869,7 @@ static const struct board_info __initcon
 | 
			
		||||
  * bcm4318 WLAN work
 | 
			
		||||
  */
 | 
			
		||||
 #ifdef CONFIG_SSB_PCIHOST
 | 
			
		||||
@ -17,7 +17,7 @@
 | 
			
		||||
 	.revision		= 0x02,
 | 
			
		||||
 	.board_rev		= 0x17,
 | 
			
		||||
 	.country_code		= 0x0,
 | 
			
		||||
@@ -4885,6 +4886,7 @@ static struct ssb_sprom bcm63xx_sprom =
 | 
			
		||||
@@ -4888,6 +4889,7 @@ static struct ssb_sprom bcm63xx_sprom =
 | 
			
		||||
 	.boardflags_lo		= 0x2848,
 | 
			
		||||
 	.boardflags_hi		= 0x0000,
 | 
			
		||||
 };
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user