---

yaml
---
r: 319622
b: refs/heads/master
c: 05b8c8c
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f74b770aa6deea65415e198852c832cceedf994
+refs/heads/master: 05b8c8c1288c078f8920f5894854086f0e10f095

trunk/arch/mips/Kconfig

@@ -2366,8 +2366,6 @@ config PCI_DOMAINS
 
 source "drivers/pci/Kconfig"
 
-source "drivers/pci/pcie/Kconfig"
-
 #
 # ISA support is now enabled via select.  Too many systems still have the one
 # or other ISA chip on the board that users don't know about so don't expect

trunk/arch/mips/bcm63xx/Kconfig

@@ -1,10 +1,6 @@
 menu "CPU support"
 	depends on BCM63XX
 
-config BCM63XX_CPU_6328
-	bool "support 6328 CPU"
-	select HW_HAS_PCI
-
 config BCM63XX_CPU_6338
 	bool "support 6338 CPU"
 	select HW_HAS_PCI

trunk/arch/mips/bcm63xx/Makefile

@@ -1,6 +1,5 @@
 obj-y		+= clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
-		   dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o dev-rng.o \
-		   dev-spi.o dev-uart.o dev-wdt.o
+		   dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 
 obj-y		+= boards/

trunk/arch/mips/bcm63xx/boards/board_bcm963xx.c

@@ -11,6 +11,9 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
 #include <linux/ssb/ssb.h>
 #include <asm/addrspace.h>
 #include <bcm63xx_board.h>
@@ -21,9 +24,7 @@
 #include <bcm63xx_dev_pci.h>
 #include <bcm63xx_dev_enet.h>
 #include <bcm63xx_dev_dsp.h>
-#include <bcm63xx_dev_flash.h>
 #include <bcm63xx_dev_pcmcia.h>
-#include <bcm63xx_dev_spi.h>
 #include <board_bcm963xx.h>
 
 #define PFX	"board_bcm963xx: "
@@ -32,48 +33,6 @@ static struct bcm963xx_nvram nvram;
 static unsigned int mac_addr_used;
 static struct board_info board;
 
-/*
- * known 6328 boards
- */
-#ifdef CONFIG_BCM63XX_CPU_6328
-static struct board_info __initdata board_96328avng = {
-	.name				= "96328avng",
-	.expected_cpu_id		= 0x6328,
-
-	.has_uart0			= 1,
-	.has_pci			= 1,
-
-	.leds = {
-		{
-			.name		= "96328avng::ppp-fail",
-			.gpio		= 2,
-			.active_low	= 1,
-		},
-		{
-			.name		= "96328avng::power",
-			.gpio		= 4,
-			.active_low	= 1,
-			.default_trigger = "default-on",
-		},
-		{
-			.name		= "96328avng::power-fail",
-			.gpio		= 8,
-			.active_low	= 1,
-		},
-		{
-			.name		= "96328avng::wps",
-			.gpio		= 9,
-			.active_low	= 1,
-		},
-		{
-			.name		= "96328avng::ppp",
-			.gpio		= 11,
-			.active_low	= 1,
-		},
-	},
-};
-#endif
-
 /*
  * known 6338 boards
  */
@@ -633,9 +592,6 @@ static struct board_info __initdata board_DWVS0 = {
  * all boards
  */
 static const struct board_info __initdata *bcm963xx_boards[] = {
-#ifdef CONFIG_BCM63XX_CPU_6328
-	&board_96328avng,
-#endif
 #ifdef CONFIG_BCM63XX_CPU_6338
 	&board_96338gw,
 	&board_96338w,
@@ -753,15 +709,9 @@ void __init board_prom_init(void)
 	char cfe_version[32];
 	u32 val;
 
-	/* read base address of boot chip select (0)
-	 * 6328 does not have MPI but boots from a fixed address
-	 */
-	if (BCMCPU_IS_6328())
-		val = 0x18000000;
-	else {
-		val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-		val &= MPI_CSBASE_BASE_MASK;
-	}
+	/* read base address of boot chip select (0) */
+	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+	val &= MPI_CSBASE_BASE_MASK;
 	boot_addr = (u8 *)KSEG1ADDR(val);
 
 	/* dump cfe version */
@@ -858,6 +808,40 @@ void __init board_setup(void)
 		panic("unexpected CPU for bcm963xx board");
 }
 
+static struct mtd_partition mtd_partitions[] = {
+	{
+		.name		= "cfe",
+		.offset		= 0x0,
+		.size		= 0x40000,
+	}
+};
+
+static const char *bcm63xx_part_types[] = { "bcm63xxpart", NULL };
+
+static struct physmap_flash_data flash_data = {
+	.width			= 2,
+	.nr_parts		= ARRAY_SIZE(mtd_partitions),
+	.parts			= mtd_partitions,
+	.part_probe_types	= bcm63xx_part_types,
+};
+
+static struct resource mtd_resources[] = {
+	{
+		.start		= 0,	/* filled at runtime */
+		.end		= 0,	/* filled at runtime */
+		.flags		= IORESOURCE_MEM,
+	}
+};
+
+static struct platform_device mtd_dev = {
+	.name			= "physmap-flash",
+	.resource		= mtd_resources,
+	.num_resources		= ARRAY_SIZE(mtd_resources),
+	.dev			= {
+		.platform_data	= &flash_data,
+	},
+};
+
 static struct gpio_led_platform_data bcm63xx_led_data;
 
 static struct platform_device bcm63xx_gpio_leds = {
@@ -871,6 +855,8 @@ static struct platform_device bcm63xx_gpio_leds = {
  */
 int __init board_register_devices(void)
 {
+	u32 val;
+
 	if (board.has_uart0)
 		bcm63xx_uart_register(0);
 
@@ -904,9 +890,14 @@ int __init board_register_devices(void)
 	}
 #endif
 
-	bcm63xx_spi_register();
+	/* read base address of boot chip select (0) */
+	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+	val &= MPI_CSBASE_BASE_MASK;
+
+	mtd_resources[0].start = val;
+	mtd_resources[0].end = 0x1FFFFFFF;
 
-	bcm63xx_flash_register();
+	platform_device_register(&mtd_dev);
 
 	bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
 	bcm63xx_led_data.leds = board.leds;

trunk/arch/mips/bcm63xx/clk.c

@@ -120,7 +120,7 @@ static void enetsw_set(struct clk *clk, int enable)
 {
 	if (!BCMCPU_IS_6368())
 		return;
-	bcm_hwclock_set(CKCTL_6368_ROBOSW_EN |
+	bcm_hwclock_set(CKCTL_6368_ROBOSW_CLK_EN |
 			CKCTL_6368_SWPKT_USB_EN |
 			CKCTL_6368_SWPKT_SAR_EN, enable);
 	if (enable) {
@@ -163,7 +163,7 @@ static void usbh_set(struct clk *clk, int enable)
 	if (BCMCPU_IS_6348())
 		bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);
 	else if (BCMCPU_IS_6368())
-		bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
+		bcm_hwclock_set(CKCTL_6368_USBH_CLK_EN, enable);
 }
 
 static struct clk clk_usbh = {
@@ -181,11 +181,9 @@ static void spi_set(struct clk *clk, int enable)
 		mask = CKCTL_6338_SPI_EN;
 	else if (BCMCPU_IS_6348())
 		mask = CKCTL_6348_SPI_EN;
-	else if (BCMCPU_IS_6358())
-		mask = CKCTL_6358_SPI_EN;
 	else
-		/* BCMCPU_IS_6368 */
-		mask = CKCTL_6368_SPI_EN;
+		/* BCMCPU_IS_6358 */
+		mask = CKCTL_6358_SPI_EN;
 	bcm_hwclock_set(mask, enable);
 }
 
@@ -201,7 +199,7 @@ static void xtm_set(struct clk *clk, int enable)
 	if (!BCMCPU_IS_6368())
 		return;
 
-	bcm_hwclock_set(CKCTL_6368_SAR_EN |
+	bcm_hwclock_set(CKCTL_6368_SAR_CLK_EN |
 			CKCTL_6368_SWPKT_SAR_EN, enable);
 
 	if (enable) {
@@ -223,18 +221,6 @@ static struct clk clk_xtm = {
 	.set	= xtm_set,
 };
 
-/*
- * IPsec clock
- */
-static void ipsec_set(struct clk *clk, int enable)
-{
-	bcm_hwclock_set(CKCTL_6368_IPSEC_EN, enable);
-}
-
-static struct clk clk_ipsec = {
-	.set	= ipsec_set,
-};
-
 /*
  * Internal peripheral clock
  */
@@ -292,8 +278,6 @@ struct clk *clk_get(struct device *dev, const char *id)
 		return &clk_periph;
 	if (BCMCPU_IS_6358() && !strcmp(id, "pcm"))
 		return &clk_pcm;
-	if (BCMCPU_IS_6368() && !strcmp(id, "ipsec"))
-		return &clk_ipsec;
 	return ERR_PTR(-ENOENT);
 }
 

trunk/arch/mips/bcm63xx/cpu.c

@@ -29,14 +29,6 @@ static u16 bcm63xx_cpu_rev;
 static unsigned int bcm63xx_cpu_freq;
 static unsigned int bcm63xx_memory_size;
 
-static const unsigned long bcm6328_regs_base[] = {
-	__GEN_CPU_REGS_TABLE(6328)
-};
-
-static const int bcm6328_irqs[] = {
-	__GEN_CPU_IRQ_TABLE(6328)
-};
-
 static const unsigned long bcm6338_regs_base[] = {
 	__GEN_CPU_REGS_TABLE(6338)
 };
@@ -107,33 +99,6 @@ unsigned int bcm63xx_get_memory_size(void)
 static unsigned int detect_cpu_clock(void)
 {
 	switch (bcm63xx_get_cpu_id()) {
-	case BCM6328_CPU_ID:
-	{
-		unsigned int tmp, mips_pll_fcvo;
-
-		tmp = bcm_misc_readl(MISC_STRAPBUS_6328_REG);
-		mips_pll_fcvo = (tmp & STRAPBUS_6328_FCVO_MASK)
-				>> STRAPBUS_6328_FCVO_SHIFT;
-
-		switch (mips_pll_fcvo) {
-		case 0x12:
-		case 0x14:
-		case 0x19:
-			return 160000000;
-		case 0x1c:
-			return 192000000;
-		case 0x13:
-		case 0x15:
-			return 200000000;
-		case 0x1a:
-			return 384000000;
-		case 0x16:
-			return 400000000;
-		default:
-			return 320000000;
-		}
-
-	}
 	case BCM6338_CPU_ID:
 		/* BCM6338 has a fixed 240 Mhz frequency */
 		return 240000000;
@@ -205,9 +170,6 @@ static unsigned int detect_memory_size(void)
 	unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0;
 	u32 val;
 
-	if (BCMCPU_IS_6328())
-		return bcm_ddr_readl(DDR_CSEND_REG) << 24;
-
 	if (BCMCPU_IS_6345()) {
 		val = bcm_sdram_readl(SDRAM_MBASE_REG);
 		return (val * 8 * 1024 * 1024);
@@ -266,26 +228,17 @@ void __init bcm63xx_cpu_init(void)
 		bcm63xx_irqs = bcm6345_irqs;
 		break;
 	case CPU_BMIPS4350:
-		if ((read_c0_prid() & 0xf0) == 0x10) {
+		switch (read_c0_prid() & 0xf0) {
+		case 0x10:
 			expected_cpu_id = BCM6358_CPU_ID;
 			bcm63xx_regs_base = bcm6358_regs_base;
 			bcm63xx_irqs = bcm6358_irqs;
-		} else {
-			/* all newer chips have the same chip id location */
-			u16 chip_id = bcm_readw(BCM_6368_PERF_BASE);
-
-			switch (chip_id) {
-			case BCM6328_CPU_ID:
-				expected_cpu_id = BCM6328_CPU_ID;
-				bcm63xx_regs_base = bcm6328_regs_base;
-				bcm63xx_irqs = bcm6328_irqs;
-				break;
-			case BCM6368_CPU_ID:
-				expected_cpu_id = BCM6368_CPU_ID;
-				bcm63xx_regs_base = bcm6368_regs_base;
-				bcm63xx_irqs = bcm6368_irqs;
-				break;
-			}
+			break;
+		case 0x30:
+			expected_cpu_id = BCM6368_CPU_ID;
+			bcm63xx_regs_base = bcm6368_regs_base;
+			bcm63xx_irqs = bcm6368_irqs;
+			break;
 		}
 		break;
 	}

trunk/arch/mips/bcm63xx/dev-dsp.c

@@ -31,7 +31,7 @@ static struct resource voip_dsp_resources[] = {
 
 static struct platform_device bcm63xx_voip_dsp_device = {
 	.name		= "bcm63xx-voip-dsp",
-	.id		= -1,
+	.id		= 0,
 	.num_resources	= ARRAY_SIZE(voip_dsp_resources),
 	.resource	= voip_dsp_resources,
 };