X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dae9860357e414cb14729b8eb12bce3efd191b72..dde3611c936ee77f93f2acb68e9552fa80153c84:/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c

diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
index f85494d88..98c900594 100644
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -54,6 +54,13 @@ static struct board_info __initdata board_96338gw = {
 
 	.has_ohci0			= 1,
 };
+
+static struct board_info __initdata board_96338w = {
+	.name				= "96338W",
+	.expected_cpu_id		= 0x6338,
+
+	.has_enet0			= 1,
+};
 #endif
 
 /*
@@ -287,6 +294,7 @@ static struct board_info __initdata board_AGPFS0 = {
 static const struct board_info __initdata *bcm963xx_boards[] = {
 #ifdef CONFIG_BCM63XX_CPU_6338
 	&board_96338gw,
+	&board_96338w,
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6348
 	&board_96348r,
@@ -315,9 +323,15 @@ void __init board_prom_init(void)
 	char cfe_version[32];
 	u32 val;
 
-	/* read base address of boot chip select (0) */
-	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-	val &= MPI_CSBASE_BASE_MASK;
+	/* read base address of boot chip select (0) 
+	 * 6338 does not have MPI but boots from standard
+	 * MIPS Flash address */
+	if (BCMCPU_IS_6338() || BCMCPU_IS_6345())
+		val = 0x1fc00000;
+	else {
+		val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+		val &= MPI_CSBASE_BASE_MASK;
+	}
 	boot_addr = (u8 *)KSEG1ADDR(val);
 
 	/* dump cfe version */
@@ -370,13 +384,13 @@ void __init board_prom_init(void)
 	 * this has to be done this early since PCI init is done
 	 * inside arch_initcall */
 	val = 0;
-
+#ifdef CONFIG_PCI
 	if (board.has_pci) {
 		bcm63xx_pci_enabled = 1;
 		if (BCMCPU_IS_6348())
 			val |= GPIO_MODE_6348_G2_PCI;
 	}
-
+#endif
 	if (board.has_pccard) {
 		if (BCMCPU_IS_6348())
 			val |= GPIO_MODE_6348_G1_MII_PCCARD;
@@ -530,12 +544,14 @@ int __init board_register_devices(void)
 		bcm63xx_udc_register();
 	/* Generate MAC address for WLAN and
 	 * register our SPROM */
+#ifdef CONFIG_PCI
 	if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
 		memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
 		memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
 		if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0)
 			printk(KERN_ERR "failed to register fallback SPROM\n");
 	}
+#endif
 
 	/* read base address of boot chip select (0) */
 	val = bcm_mpi_readl(MPI_CSBASE_REG(0));