add basic support for BCM6362
cover add basic support for BCM6362
This patchset adds basic support for BCM6362. BCM6362 includes a 9 port ethernet switch (4 FE PHYs, 2 RGMII ports), integrated wifi and one PCIe port.
The first few patches do a bit of clean up first to allow the BCM6362 support code to be as small as possible.
Board definitions were left out as they are not really usable yet, and adding DT support is planned in the future. Most code added here will be also required with DT support.
Jonas Gorski (7):
MIPS: BCM63XX: remove duplicate spi register definitions
MIPS: BCM63XX: fix revision ID width
MIPS: BCM63XX: rework chip detection
MIPS: BCM63XX: add basic BCM6362 support
MIPS: BCM63XX: enable SPI controller for BCM6362
MIPS: BCM63XX: enable pcie for BCM6362
MIPS: BCM63XX: add flash detection for BCM6362
arch/mips/bcm63xx/Kconfig | 4 + arch/mips/bcm63xx/boards/board_bcm963xx.c | 6 +- arch/mips/bcm63xx/clk.c | 2 + arch/mips/bcm63xx/cpu.c | 142 +++++++++++++------- arch/mips/bcm63xx/dev-flash.c | 6 + arch/mips/bcm63xx/dev-spi.c | 26 +--- arch/mips/bcm63xx/irq.c | 22 +++ arch/mips/bcm63xx/prom.c | 2 + arch/mips/bcm63xx/reset.c | 28 ++++ arch/mips/bcm63xx/setup.c | 5 +- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 141 ++++++++++++++++++- .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 11 +- arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 2 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 105 +++++++++------ arch/mips/include/asm/mach-bcm63xx/ioremap.h | 1 + arch/mips/pci/pci-bcm63xx.c | 11 +- 16 files changed, 392 insertions(+), 122 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/7 MIPS: BCM63XX: remove duplicate spi register definitions
BCM6338 and BCM6348, and BCM6358 and everything after that share the same register layout. To not have to redefine them for each new chip and keep the code size small, only use the definitions for the first chip with the certain layout.
--- arch/mips/bcm63xx/dev-spi.c | 24 +++--------- .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 10 +---- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 40 +------------------- 3 files changed, 10 insertions(+), 64 deletions(-)
arch/mips/bcm63xx/dev-spi.c +6 -18
@@ -22,10 +22,6 @@/* * register offsets */ -static const unsigned long bcm6338_regs_spi[] = { -__GEN_SPI_REGS_TABLE (6338 ) -}; -static const unsigned long bcm6348_regs_spi[] = {__GEN_SPI_REGS_TABLE (6348 ) };
@@ -34,23 +30,15 @@ static const unsigned long bcm6358_regs_spi[] = {__GEN_SPI_REGS_TABLE (6358 ) }; -static const unsigned long bcm6368_regs_spi[] = { -__GEN_SPI_REGS_TABLE (6368 ) -}; -const unsigned long *bcm63xx_regs_spi;EXPORT_SYMBOL (bcm63xx_regs_spi);static __init void bcm63xx_spi_regs_init (void ) { -if (BCMCPU_IS_6338 ()) - bcm63xx_regs_spi = bcm6338_regs_spi; -if (BCMCPU_IS_6348 ()) +if (BCMCPU_IS_6338 () ||BCMCPU_IS_6348 ()) bcm63xx_regs_spi = bcm6348_regs_spi; -if (BCMCPU_IS_6358 ()) +if (BCMCPU_IS_6358 () ||BCMCPU_IS_6368 ()) bcm63xx_regs_spi = bcm6358_regs_spi; -if (BCMCPU_IS_6368 ()) - bcm63xx_regs_spi = bcm6368_regs_spi; }#else static __init void bcm63xx_spi_regs_init (void ) { }
@@ -104,10 +92,10 @@ int __init bcm63xx_spi_register(void) spi_resources[1 ].start =bcm63xx_get_irq_number (IRQ_SPI );if (BCMCPU_IS_6338 () ||BCMCPU_IS_6348 ()) { - spi_resources[0 ].end +=BCM_6338_RSET_SPI_SIZE -1 ; - spi_pdata.fifo_size =SPI_6338_MSG_DATA_SIZE ; - spi_pdata.msg_type_shift =SPI_6338_MSG_TYPE_SHIFT ; - spi_pdata.msg_ctl_width =SPI_6338_MSG_CTL_WIDTH ; + spi_resources[0 ].end +=BCM_6348_RSET_SPI_SIZE -1 ; + spi_pdata.fifo_size =SPI_6348_MSG_DATA_SIZE ; + spi_pdata.msg_type_shift =SPI_6348_MSG_TYPE_SHIFT ; + spi_pdata.msg_ctl_width =SPI_6348_MSG_CTL_WIDTH ; }if (BCMCPU_IS_6358 () ||BCMCPU_IS_6368 ()) {
arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h +2 -8
@@ -72,18 +72,12 @@ static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg)return bcm63xx_regs_spi[reg];#else -#ifdef CONFIG_BCM63XX_CPU_6338 - __GEN_SPI_RSET(6338) -#endif -#ifdef CONFIG_BCM63XX_CPU_6348 +#if defined(CONFIG_BCM63XX_CPU_6338 ) || defined(CONFIG_BCM63XX_CPU_6348 ) __GEN_SPI_RSET(6348)#endif -#ifdef CONFIG_BCM63XX_CPU_6358 +#if defined(CONFIG_BCM63XX_CPU_6358 ) || defined(CONFIG_BCM63XX_CPU_6368 ) __GEN_SPI_RSET(6358)#endif -#ifdef CONFIG_BCM63XX_CPU_6368 - __GEN_SPI_RSET(6368) -#endif #endif return 0 ; }
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +2 -38
@@ -1223,24 +1223,7 @@* _REG relative to RSET_SPI *************************************************************************/ -/* BCM 6338 SPI core */ -#define SPI_6338_CMD 0x00/* 16-bits register */ -#define SPI_6338_INT_STATUS 0x02 -#define SPI_6338_INT_MASK_ST 0x03 -#define SPI_6338_INT_MASK 0x04 -#define SPI_6338_ST 0x05 -#define SPI_6338_CLK_CFG 0x06 -#define SPI_6338_FILL_BYTE 0x07 -#define SPI_6338_MSG_TAIL 0x09 -#define SPI_6338_RX_TAIL 0x0b -#define SPI_6338_MSG_CTL 0x40/* 8-bits register */ -#define SPI_6338_MSG_CTL_WIDTH 8 -#define SPI_6338_MSG_DATA 0x41 -#define SPI_6338_MSG_DATA_SIZE 0x3f -#define SPI_6338_RX_DATA 0x80 -#define SPI_6338_RX_DATA_SIZE 0x3f - -/* BCM 6348 SPI core */ +/* BCM 6338/6348 SPI core */ #define SPI_6348_CMD 0x00/* 16-bits register */ #define SPI_6348_INT_STATUS 0x02#define SPI_6348_INT_MASK_ST 0x03
@@ -1257,7 +1240,7 @@#define SPI_6348_RX_DATA 0x80#define SPI_6348_RX_DATA_SIZE 0x3f -/* BCM 6358 SPI core */ +/* BCM 6358/6368 SPI core */ #define SPI_6358_MSG_CTL 0x00/* 16-bits register */ #define SPI_6358_MSG_CTL_WIDTH 16#define SPI_6358_MSG_DATA 0x02
@@ -1274,23 +1257,6 @@#define SPI_6358_MSG_TAIL 0x709#define SPI_6358_RX_TAIL 0x70B -/* BCM 6358 SPI core */ -#define SPI_6368_MSG_CTL 0x00/* 16-bits register */ -#define SPI_6368_MSG_CTL_WIDTH 16 -#define SPI_6368_MSG_DATA 0x02 -#define SPI_6368_MSG_DATA_SIZE 0x21e -#define SPI_6368_RX_DATA 0x400 -#define SPI_6368_RX_DATA_SIZE 0x220 -#define SPI_6368_CMD 0x700/* 16-bits register */ -#define SPI_6368_INT_STATUS 0x702 -#define SPI_6368_INT_MASK_ST 0x703 -#define SPI_6368_INT_MASK 0x704 -#define SPI_6368_ST 0x705 -#define SPI_6368_CLK_CFG 0x706 -#define SPI_6368_FILL_BYTE 0x707 -#define SPI_6368_MSG_TAIL 0x709 -#define SPI_6368_RX_TAIL 0x70B -/* Shared SPI definitions */ /* Message configuration */
@@ -1298,10 +1264,8 @@#define SPI_HD_W 0x01#define SPI_HD_R 0x02#define SPI_BYTE_CNT_SHIFT 0 -#define SPI_6338_MSG_TYPE_SHIFT 6#define SPI_6348_MSG_TYPE_SHIFT 6#define SPI_6358_MSG_TYPE_SHIFT 14 -#define SPI_6368_MSG_TYPE_SHIFT 14/* Command */ #define SPI_CMD_NOOP 0x00
Signature · 1 line
1.7.10.4
PATCH 2/7 MIPS: BCM63XX: fix revision ID width
The REVID is only 8 bit wide.
--- arch/mips/bcm63xx/cpu.c | 4 ++-- arch/mips/bcm63xx/setup.c | 2 +- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 2 +- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/mips/bcm63xx/cpu.c +2 -2
@@ -25,7 +25,7 @@ const int *bcm63xx_irqs;EXPORT_SYMBOL (bcm63xx_irqs);static u16 bcm63xx_cpu_id; -static u16 bcm63xx_cpu_rev; +static u8 bcm63xx_cpu_rev;static unsigned int bcm63xx_cpu_freq;static unsigned int bcm63xx_memory_size;
@@ -87,7 +87,7 @@ u16 __bcm63xx_get_cpu_id(void)EXPORT_SYMBOL (__bcm63xx_get_cpu_id); -u16 bcm63xx_get_cpu_rev (void ) +u8 bcm63xx_get_cpu_rev (void ) {return bcm63xx_cpu_rev; }
arch/mips/bcm63xx/setup.c +1 -1
@@ -126,7 +126,7 @@ static void __bcm63xx_machine_reboot(char *p)const char *get_system_type (void ) {static char buf[128 ]; -snprintf (buf,sizeof (buf),"bcm63xx/%s (0x%04x/0x%04X)" , +snprintf (buf,sizeof (buf),"bcm63xx/%s (0x%04x/0x%02X)" ,board_get_name (),bcm63xx_get_cpu_id (),bcm63xx_get_cpu_rev ());return buf;
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +1 -1
@@ -18,7 +18,7 @@void __init bcm63xx_cpu_init (void );u16 __bcm63xx_get_cpu_id (void ); -u16 bcm63xx_get_cpu_rev (void ); +u8 bcm63xx_get_cpu_rev (void );unsigned int bcm63xx_get_cpu_freq (void );#ifdef CONFIG_BCM63XX_CPU_6328
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +1 -1
@@ -10,7 +10,7 @@#define REV_CHIPID_SHIFT 16#define REV_CHIPID_MASK (0xffff << REV_CHIPID_SHIFT)#define REV_REVID_SHIFT 0 -#define REV_REVID_MASK (0xffff << REV_REVID_SHIFT) +#define REV_REVID_MASK (0xff << REV_REVID_SHIFT)/* Clock Control register */ #define PERF_CKCTL_REG 0x4
Signature · 1 line
1.7.10.4
PATCH 3/7 MIPS: BCM63XX: rework chip detection
In reply to Jonas GorskiInstead of trying to use a correlation of cpu prid and chip id and hoping they will always be unique, use the cpu prid to determine the chip id register location and just read out the chip id.
--- arch/mips/bcm63xx/cpu.c | 87 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 45 deletions(-)
arch/mips/bcm63xx/cpu.c +42 -45
@@ -240,53 +240,27 @@ static unsigned int detect_memory_size(void)void __init bcm63xx_cpu_init (void ) { -unsigned int tmp, expected_cpu_id; +unsigned int tmp;struct cpuinfo_mips *c = ¤t_cpu_data;unsigned int cpu =smp_processor_id (); +u32 chipid_reg;/* soc registers location depends on cpu type */ - expected_cpu_id =0 ; + chipid_reg =0 ;switch (c->cputype) {case CPU_BMIPS3300 : -if ((read_c0_prid () &0xff00 ) ==PRID_IMP_BMIPS3300_ALT ) { - expected_cpu_id =BCM6348_CPU_ID ; - bcm63xx_regs_base = bcm6348_regs_base; - bcm63xx_irqs = bcm6348_irqs; - }else { +if ((read_c0_prid () &0xff00 ) !=PRID_IMP_BMIPS3300_ALT ) __cpu_name[cpu] ="Broadcom BCM6338" ; - expected_cpu_id =BCM6338_CPU_ID ; - bcm63xx_regs_base = bcm6338_regs_base; - bcm63xx_irqs = bcm6338_irqs; - } -break ; +/* fall-through */ case CPU_BMIPS32 : - expected_cpu_id =BCM6345_CPU_ID ; - bcm63xx_regs_base = bcm6345_regs_base; - bcm63xx_irqs = bcm6345_irqs; + chipid_reg =BCM_6345_PERF_BASE ;break ;case CPU_BMIPS4350 : -if ((read_c0_prid () &0xf0 ) ==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 ; - } - } +if ((read_c0_prid () &0xf0 ) ==0x10 ) + chipid_reg =BCM_6345_PERF_BASE ; +else + chipid_reg =BCM_6368_PERF_BASE ;break ; }
@@ -294,20 +268,43 @@ void __init bcm63xx_cpu_init(void)* really early to panic, but delaying panic would not help since we * will never get any working console */ -if (!expected_cpu_id) +if (!chipid_reg)panic ("unsupported Broadcom CPU" ); -/* -* bcm63xx_regs_base is set, we can access soc registers -*/ - -/* double check CPU type */ - tmp =bcm_perf_readl (PERF_REV_REG ); +/* read out CPU type */ + tmp =bcm_readl (chipid_reg); bcm63xx_cpu_id = (tmp &REV_CHIPID_MASK ) >>REV_CHIPID_SHIFT ; bcm63xx_cpu_rev = (tmp &REV_REVID_MASK ) >>REV_REVID_SHIFT ; -if (bcm63xx_cpu_id != expected_cpu_id) -panic ("bcm63xx CPU id mismatch" ); +switch (bcm63xx_cpu_id) { +case BCM6328_CPU_ID : + bcm63xx_regs_base = bcm6328_regs_base; + bcm63xx_irqs = bcm6328_irqs; +break ; +case BCM6338_CPU_ID : + bcm63xx_regs_base = bcm6338_regs_base; + bcm63xx_irqs = bcm6338_irqs; +break ; +case BCM6345_CPU_ID : + bcm63xx_regs_base = bcm6345_regs_base; + bcm63xx_irqs = bcm6345_irqs; +break ; +case BCM6348_CPU_ID : + bcm63xx_regs_base = bcm6348_regs_base; + bcm63xx_irqs = bcm6348_irqs; +break ; +case BCM6358_CPU_ID : + bcm63xx_regs_base = bcm6358_regs_base; + bcm63xx_irqs = bcm6358_irqs; +break ; +case BCM6368_CPU_ID : + bcm63xx_regs_base = bcm6368_regs_base; + bcm63xx_irqs = bcm6368_irqs; +break ; +default : +panic ("unsupported broadcom CPU %x" , bcm63xx_cpu_id); +break ; + } bcm63xx_cpu_freq =detect_cpu_clock (); bcm63xx_memory_size =detect_memory_size ();
Signature · 1 line
1.7.10.4
PATCH 4/7 MIPS: BCM63XX: add basic BCM6362 support
In reply to Jonas GorskiAdd basic support for detecting and booting the BCM6362.
--- arch/mips/bcm63xx/Kconfig | 4 + arch/mips/bcm63xx/boards/board_bcm963xx.c | 6 +- arch/mips/bcm63xx/cpu.c | 51 +++++++- arch/mips/bcm63xx/irq.c | 22 ++++ arch/mips/bcm63xx/prom.c | 2 + arch/mips/bcm63xx/reset.c | 28 +++++ arch/mips/bcm63xx/setup.c | 3 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 139 +++++++++++++++++++++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 2 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 61 ++++++++- arch/mips/include/asm/mach-bcm63xx/ioremap.h | 1 + 11 files changed, 314 insertions(+), 5 deletions(-)
arch/mips/bcm63xx/Kconfig +4 -0
@@ -25,6 +25,10 @@ config BCM63XX_CPU_6358 bool "support 6358 CPU" select HW_HAS_PCI +config BCM63XX_CPU_6362 + bool "support 6362 CPU" + select HW_HAS_PCI + config BCM63XX_CPU_6368 bool "support 6368 CPU" select HW_HAS_PCI
arch/mips/bcm63xx/boards/board_bcm963xx.c +3 -3
@@ -726,11 +726,11 @@ void __init board_prom_init(void)u32 val;/* read base address of boot chip select (0) -* 6328 does not have MPI but boots from a fixed address +* 6328/6362 do not have MPI but boot from a fixed address */ -if (BCMCPU_IS_6328 ()) +if (BCMCPU_IS_6328 () ||BCMCPU_IS_6362 ()) { val =0x18000000 ; -else { + }else { val =bcm_mpi_readl (MPI_CSBASE_REG (0 )); val &=MPI_CSBASE_BASE_MASK ; }
arch/mips/bcm63xx/cpu.c +50 -1
75 lines not on this page · raw message
arch/mips/bcm63xx/irq.c +22 -0
@@ -82,6 +82,17 @@ static void __internal_irq_unmask_64(unsigned int irq) __maybe_unused;#define ext_irq_cfg_reg1 PERF_EXTIRQ_CFG_REG_6358#define ext_irq_cfg_reg2 0#endif +#ifdef CONFIG_BCM63XX_CPU_6362 +#define irq_stat_reg PERF_IRQSTAT_6362_REG +#define irq_mask_reg PERF_IRQMASK_6362_REG +#define irq_bits 64 +#define is_ext_irq_cascaded 1 +#define ext_irq_start (BCM_6362_EXT_IRQ0 - IRQ_INTERNAL_BASE) +#define ext_irq_end (BCM_6362_EXT_IRQ3 - IRQ_INTERNAL_BASE) +#define ext_irq_count 4 +#define ext_irq_cfg_reg1 PERF_EXTIRQ_CFG_REG_6362 +#define ext_irq_cfg_reg2 0 +#endif #ifdef CONFIG_BCM63XX_CPU_6368 #define irq_stat_reg PERF_IRQSTAT_6368_REG#define irq_mask_reg PERF_IRQMASK_6368_REG
@@ -170,6 +181,16 @@ static void bcm63xx_init_irq(void) ext_irq_end =BCM_6358_EXT_IRQ3 -IRQ_INTERNAL_BASE ; ext_irq_cfg_reg1 =PERF_EXTIRQ_CFG_REG_6358 ;break ; +case BCM6362_CPU_ID : + irq_stat_addr +=PERF_IRQSTAT_6362_REG ; + irq_mask_addr +=PERF_IRQMASK_6362_REG ; + irq_bits =64 ; + ext_irq_count =4 ; + is_ext_irq_cascaded =1 ; + ext_irq_start =BCM_6362_EXT_IRQ0 -IRQ_INTERNAL_BASE ; + ext_irq_end =BCM_6362_EXT_IRQ3 -IRQ_INTERNAL_BASE ; + ext_irq_cfg_reg1 =PERF_EXTIRQ_CFG_REG_6362 ; +break ;case BCM6368_CPU_ID : irq_stat_addr +=PERF_IRQSTAT_6368_REG ; irq_mask_addr +=PERF_IRQMASK_6368_REG ;
@@ -458,6 +479,7 @@ static int bcm63xx_external_irq_set_type(struct irq_data *d,case BCM6338_CPU_ID :case BCM6345_CPU_ID :case BCM6358_CPU_ID : +case BCM6362_CPU_ID :case BCM6368_CPU_ID :if (levelsense) reg |=EXTIRQ_CFG_LEVELSENSE (irq);
arch/mips/bcm63xx/prom.c +2 -0
@@ -36,6 +36,8 @@ void __init prom_init(void) mask =CKCTL_6348_ALL_SAFE_EN ; else if (BCMCPU_IS_6358()) mask =CKCTL_6358_ALL_SAFE_EN ; + else if (BCMCPU_IS_6362()) + mask =CKCTL_6362_ALL_SAFE_EN ; else if (BCMCPU_IS_6368()) mask =CKCTL_6368_ALL_SAFE_EN ; else
arch/mips/bcm63xx/reset.c +28 -0
@@ -85,6 +85,20 @@#define BCM6358_RESET_PCIE 0#define BCM6358_RESET_PCIE_EXT 0 +#define BCM6362_RESET_SPI SOFTRESET_6362_SPI_MASK +#define BCM6362_RESET_ENET 0 +#define BCM6362_RESET_USBH SOFTRESET_6362_USBH_MASK +#define BCM6362_RESET_USBD SOFTRESET_6362_USBS_MASK +#define BCM6362_RESET_DSL 0 +#define BCM6362_RESET_SAR SOFTRESET_6362_SAR_MASK +#define BCM6362_RESET_EPHY SOFTRESET_6362_EPHY_MASK +#define BCM6362_RESET_ENETSW SOFTRESET_6362_ENETSW_MASK +#define BCM6362_RESET_PCM SOFTRESET_6362_PCM_MASK +#define BCM6362_RESET_MPI 0 +#define BCM6362_RESET_PCIE (SOFTRESET_6362_PCIE_MASK | \ + SOFTRESET_6362_PCIE_CORE_MASK) +#define BCM6362_RESET_PCIE_EXT SOFTRESET_6362_PCIE_EXT_MASK +#define BCM6368_RESET_SPI SOFTRESET_6368_SPI_MASK#define BCM6368_RESET_ENET 0#define BCM6368_RESET_USBH SOFTRESET_6368_USBH_MASK
@@ -119,6 +133,10 @@ static const u32 bcm6358_reset_bits[] = { __GEN_RESET_BITS_TABLE(6358) }; +static const u32 bcm6362_reset_bits[] = { +__GEN_RESET_BITS_TABLE (6362 ) +}; +static const u32 bcm6368_reset_bits[] = {__GEN_RESET_BITS_TABLE (6368 ) };
@@ -140,6 +158,9 @@ static int __init bcm63xx_reset_bits_init(void) }else if (BCMCPU_IS_6358 ()) { reset_reg =PERF_SOFTRESET_6358_REG ; bcm63xx_reset_bits = bcm6358_reset_bits; + }else if (BCMCPU_IS_6362 ()) { + reset_reg =PERF_SOFTRESET_6362_REG ; + bcm63xx_reset_bits = bcm6362_reset_bits; }else if (BCMCPU_IS_6368 ()) { reset_reg =PERF_SOFTRESET_6368_REG ; bcm63xx_reset_bits = bcm6368_reset_bits;
@@ -182,6 +203,13 @@ static const u32 bcm63xx_reset_bits[] = {#define reset_reg PERF_SOFTRESET_6358_REG#endif +#ifdef CONFIG_BCM63XX_CPU_6362 +static const u32 bcm63xx_reset_bits[] = { +__GEN_RESET_BITS_TABLE (6362 ) +}; +#define reset_reg PERF_SOFTRESET_6362_REG +#endif +#ifdef CONFIG_BCM63XX_CPU_6368 static const u32 bcm63xx_reset_bits[] = { __GEN_RESET_BITS_TABLE(6368)
arch/mips/bcm63xx/setup.c +3 -0
@@ -83,6 +83,9 @@ void bcm63xx_machine_reboot(void)case BCM6358_CPU_ID : perf_regs[0 ] =PERF_EXTIRQ_CFG_REG_6358 ;break ; +case BCM6362_CPU_ID : + perf_regs[0 ] =PERF_EXTIRQ_CFG_REG_6362 ; +break ; }for (i =0 ; i <2 ; i++) {
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +139 -0
169 lines not on this page · raw message
arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +2 -0
@@ -17,6 +17,8 @@ static inline unsigned long bcm63xx_gpio_count(void)return 8 ;case BCM6345_CPU_ID :return 16 ; +case BCM6362_CPU_ID : +return 48 ;case BCM6368_CPU_ID :return 38 ;case BCM6348_CPU_ID :
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +60 -1
109 lines not on this page · raw message
arch/mips/include/asm/mach-bcm63xx/ioremap.h +1 -0
@@ -19,6 +19,7 @@ static inline int is_bcm63xx_internal_registers(phys_t offset)return 1 ;break ;case BCM6328_CPU_ID : +case BCM6362_CPU_ID :case BCM6368_CPU_ID :if (offset >=0xb0000000 && offset <0xb1000000 )return 1 ;
Signature · 1 line
1.7.10.4
PATCH 5/7 MIPS: BCM63XX: enable SPI controller for BCM6362
In reply to Jonas GorskiThe SPI controller shares the same register layout as the 6358 one.
--- arch/mips/bcm63xx/clk.c | 2 ++ arch/mips/bcm63xx/dev-spi.c | 4 ++-- arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)
arch/mips/bcm63xx/clk.c +2 -0
@@ -196,6 +196,8 @@ static void spi_set(struct clk *clk, int enable) mask =CKCTL_6348_SPI_EN ; else if (BCMCPU_IS_6358()) mask =CKCTL_6358_SPI_EN ; + else if (BCMCPU_IS_6362()) + mask =CKCTL_6362_SPI_EN ; else/* BCMCPU_IS_6368 */ mask =CKCTL_6368_SPI_EN ;
arch/mips/bcm63xx/dev-spi.c +2 -2
@@ -37,7 +37,7 @@ static __init void bcm63xx_spi_regs_init(void) {if (BCMCPU_IS_6338 () ||BCMCPU_IS_6348 ()) bcm63xx_regs_spi = bcm6348_regs_spi; -if (BCMCPU_IS_6358 () ||BCMCPU_IS_6368 ()) +if (BCMCPU_IS_6358 () ||BCMCPU_IS_6362 () ||BCMCPU_IS_6368 ()) bcm63xx_regs_spi = bcm6358_regs_spi; }#else
@@ -98,7 +98,7 @@ int __init bcm63xx_spi_register(void) spi_pdata.msg_ctl_width =SPI_6348_MSG_CTL_WIDTH ; } -if (BCMCPU_IS_6358 () ||BCMCPU_IS_6368 ()) { +if (BCMCPU_IS_6358 () ||BCMCPU_IS_6362 () ||BCMCPU_IS_6368 ()) { spi_resources[0 ].end +=BCM_6358_RSET_SPI_SIZE -1 ; spi_pdata.fifo_size =SPI_6358_MSG_DATA_SIZE ; spi_pdata.msg_type_shift =SPI_6358_MSG_TYPE_SHIFT ;
arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h +2 -1
@@ -75,7 +75,8 @@ static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg)#if defined(CONFIG_BCM63XX_CPU_6338 ) || defined(CONFIG_BCM63XX_CPU_6348 ) __GEN_SPI_RSET(6348)#endif -#if defined(CONFIG_BCM63XX_CPU_6358 ) || defined(CONFIG_BCM63XX_CPU_6368 ) +#if defined(CONFIG_BCM63XX_CPU_6358 ) || defined(CONFIG_BCM63XX_CPU_6362 ) || \ + defined(CONFIG_BCM63XX_CPU_6368 ) __GEN_SPI_RSET(6358)#endif #endif
Signature · 1 line
1.7.10.4
PATCH 6/7 MIPS: BCM63XX: enable pcie for BCM6362
In reply to Jonas GorskiThe PCIe controller is almost the same as the BCM6328 one, with only the SERDES register being at a different location.
--- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 3 ++- arch/mips/pci/pci-bcm63xx.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +2 -1
@@ -1365,7 +1365,8 @@/************************************************************************* * _REG relative to RSET_MISC *************************************************************************/ -#define MISC_SERDES_CTRL_REG 0x0 +#define MISC_SERDES_CTRL_6328_REG 0x0 +#define MISC_SERDES_CTRL_6362_REG 0x4#define SERDES_PCIE_EN (1 << 0)#define SERDES_PCIE_EXD_EN (1 << 15)
arch/mips/pci/pci-bcm63xx.c +9 -2
@@ -121,11 +121,17 @@ void __iomem *pci_iospace_start;static void __init bcm63xx_reset_pcie (void ) {u32 val; +u32 reg;/* enable SERDES */ - val =bcm_misc_readl (MISC_SERDES_CTRL_REG ); +if (BCMCPU_IS_6328 ()) + reg =MISC_SERDES_CTRL_6328_REG ; +else + reg =MISC_SERDES_CTRL_6362_REG ; + + val =bcm_misc_readl (reg); val |=SERDES_PCIE_EN |SERDES_PCIE_EXD_EN ; -bcm_misc_writel (val,MISC_SERDES_CTRL_REG ); +bcm_misc_writel (val, reg);/* reset the PCIe core */ bcm63xx_core_set_reset (BCM63XX_RESET_PCIE ,1 );
@@ -330,6 +336,7 @@ static int __init bcm63xx_pci_init(void)switch (bcm63xx_get_cpu_id ()) {case BCM6328_CPU_ID : +case BCM6362_CPU_ID :return bcm63xx_register_pcie ();case BCM6348_CPU_ID :case BCM6358_CPU_ID :
Signature · 1 line
1.7.10.4
PATCH 7/7 MIPS: BCM63XX: add flash detection for BCM6362
In reply to Jonas GorskiBCM6362 support booting from SPI flash and NAND.
--- arch/mips/bcm63xx/dev-flash.c | 6 ++++++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 1 + 2 files changed, 7 insertions(+)
arch/mips/bcm63xx/dev-flash.c +6 -0
@@ -77,6 +77,12 @@ static int __init bcm63xx_detect_flash_type(void)return BCM63XX_FLASH_TYPE_PARALLEL ; else return BCM63XX_FLASH_TYPE_SERIAL; +case BCM6362_CPU_ID : + val =bcm_misc_readl (MISC_STRAPBUS_6362_REG ); +if (val &STRAPBUS_6362_BOOT_SEL_SERIAL ) +return BCM63XX_FLASH_TYPE_SERIAL ; +else +return BCM63XX_FLASH_TYPE_NAND ;case BCM6368_CPU_ID : val =bcm_gpio_readl (GPIO_STRAPBUS_REG );switch (val &STRAPBUS_6368_BOOT_SEL_MASK ) {
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +1 -0
@@ -1372,6 +1372,7 @@#define MISC_STRAPBUS_6362_REG 0x14#define STRAPBUS_6362_FCVO_SHIFT 1 +#define STRAPBUS_6362_HSSPI_CLK_FAST (1 << 13)#define STRAPBUS_6362_FCVO_MASK (0x1f << STRAPBUS_6362_FCVO_SHIFT)#define STRAPBUS_6362_BOOT_SEL_SERIAL (1 << 15)#define STRAPBUS_6362_BOOT_SEL_NAND (0 << 15)
Signature · 1 line
1.7.10.4
Quoted 11 lines · Jonas Gorski
This patchset adds basic support for BCM6362. BCM6362 includes a 9 port ethernet switch (4 FE PHYs, 2 RGMII ports), integrated wifi and one PCIe port.
The first few patches do a bit of clean up first to allow the BCM6362 support code to be as small as possible.
Board definitions were left out as they are not really usable yet, and adding DT support is planned in the future. Most code added here will be also required with DT support.
Quoted 8 lines
Jonas Gorski (7):
MIPS: BCM63XX: remove duplicate spi register definitions
MIPS: BCM63XX: fix revision ID width
MIPS: BCM63XX: rework chip detection
MIPS: BCM63XX: add basic BCM6362 support
MIPS: BCM63XX: enable SPI controller for BCM6362
MIPS: BCM63XX: enable pcie for BCM6362
MIPS: BCM63XX: add flash detection for BCM6362
For this serie:
Thanks Jonas!
--
Florian