MIPS: BCM63XX: add support for BCM3368 Cable Modem

The Broadcom BCM3368 Cable Modem SoC is extremely similar to the
existing BCM63xx DSL SoCs, in particular BCM6358, therefore little effort
in the existing code base is required to get it supported. This patch adds
support for the following on-chip peripherals:

- two UARTS
- GPIO
- Ethernet
- SPI
- PCI
- NOR Flash

The most noticeable difference with 3368 is that it has its peripheral
register at 0xfff8_0000 we check that separately in ioremap.h. Since
3368 is identical to 6358 for its clock and reset bits, we use them
verbatim.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: cernekee@gmail.com
Cc: jogo@openwrt.org
Patchwork: https://patchwork.linux-mips.org/patch/5499/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

10 files changed, 98 insertions, 17 deletions

diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig
index 5639662fd503..afe52d4ed3b9 100644
--- a/arch/mips/bcm63xx/Kconfig
+++ b/arch/mips/bcm63xx/Kconfig
@@ -1,6 +1,10 @@
 menu "CPU support"
         depends on BCM63XX
 
+config BCM63XX_CPU_3368
+        bool "support 3368 CPU"
+        select HW_HAS_PCI
+
 config BCM63XX_CPU_6328
         bool "support 6328 CPU"
         select HW_HAS_PCI
diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
index c726a97fc798..fda2690a8ef1 100644
--- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c
@@ -84,7 +84,7 @@ static void enetx_set(struct clk *clk, int enable)
         else
                 clk_disable_unlocked(&clk_enet_misc);
 
-        if (BCMCPU_IS_6358()) {
+        if (BCMCPU_IS_3368() || BCMCPU_IS_6358()) {
                 u32 mask;
 
                 if (clk->id == 0)
@@ -110,9 +110,8 @@ static struct clk clk_enet1 = {
  */
 static void ephy_set(struct clk *clk, int enable)
 {
-        if (!BCMCPU_IS_6358())
-                return;
-        bcm_hwclock_set(CKCTL_6358_EPHY_EN, enable);
+        if (BCMCPU_IS_3368() || BCMCPU_IS_6358())
+                bcm_hwclock_set(CKCTL_6358_EPHY_EN, enable);
 }
 
 
@@ -155,9 +154,10 @@ static struct clk clk_enetsw = {
  */
 static void pcm_set(struct clk *clk, int enable)
 {
-        if (!BCMCPU_IS_6358())
-                return;
-        bcm_hwclock_set(CKCTL_6358_PCM_EN, enable);
+        if (BCMCPU_IS_3368())
+                bcm_hwclock_set(CKCTL_3368_PCM_EN, enable);
+        if (BCMCPU_IS_6358())
+                bcm_hwclock_set(CKCTL_6358_PCM_EN, enable);
 }
 
 static struct clk clk_pcm = {
@@ -211,7 +211,7 @@ 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())
+        else if (BCMCPU_IS_3368() || BCMCPU_IS_6358())
                 mask = CKCTL_6358_SPI_EN;
         else if (BCMCPU_IS_6362())
                 mask = CKCTL_6362_SPI_EN;
@@ -338,7 +338,7 @@ struct clk *clk_get(struct device *dev, const char *id)
                 return &clk_xtm;
         if (!strcmp(id, "periph"))
                 return &clk_periph;
-        if (BCMCPU_IS_6358() && !strcmp(id, "pcm"))
+        if ((BCMCPU_IS_3368() || BCMCPU_IS_6358()) && !strcmp(id, "pcm"))
                 return &clk_pcm;
         if ((BCMCPU_IS_6362() || BCMCPU_IS_6368()) && !strcmp(id, "ipsec"))
                 return &clk_ipsec;
diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c
index 79fe32df5e96..7e17374a9ae8 100644
--- a/arch/mips/bcm63xx/cpu.c
+++ b/arch/mips/bcm63xx/cpu.c
@@ -29,6 +29,14 @@ static u8 bcm63xx_cpu_rev;
 static unsigned int bcm63xx_cpu_freq;
 static unsigned int bcm63xx_memory_size;
 
+static const unsigned long bcm3368_regs_base[] = {
+        __GEN_CPU_REGS_TABLE(3368)
+};
+
+static const int bcm3368_irqs[] = {
+        __GEN_CPU_IRQ_TABLE(3368)
+};
+
 static const unsigned long bcm6328_regs_base[] = {
         __GEN_CPU_REGS_TABLE(6328)
 };
@@ -116,6 +124,9 @@ unsigned int bcm63xx_get_memory_size(void)
 static unsigned int detect_cpu_clock(void)
 {
         switch (bcm63xx_get_cpu_id()) {
+        case BCM3368_CPU_ID:
+                return 300000000;
+
         case BCM6328_CPU_ID:
         {
                 unsigned int tmp, mips_pll_fcvo;
@@ -266,7 +277,7 @@ static unsigned int detect_memory_size(void)
                 banks = (val & SDRAM_CFG_BANK_MASK) ? 2 : 1;
         }
 
-        if (BCMCPU_IS_6358() || BCMCPU_IS_6368()) {
+        if (BCMCPU_IS_3368() || BCMCPU_IS_6358() || BCMCPU_IS_6368()) {
                 val = bcm_memc_readl(MEMC_CFG_REG);
                 rows = (val & MEMC_CFG_ROW_MASK) >> MEMC_CFG_ROW_SHIFT;
                 cols = (val & MEMC_CFG_COL_MASK) >> MEMC_CFG_COL_SHIFT;
@@ -302,10 +313,17 @@ void __init bcm63xx_cpu_init(void)
                 chipid_reg = BCM_6345_PERF_BASE;
                 break;
         case CPU_BMIPS4350:
-                if ((read_c0_prid() & 0xf0) == 0x10)
+                switch ((read_c0_prid() & 0xff)) {
+                case 0x04:
+                        chipid_reg = BCM_3368_PERF_BASE;
+                        break;
+                case 0x10:
                         chipid_reg = BCM_6345_PERF_BASE;
-                else
+                        break;
+                default:
                         chipid_reg = BCM_6368_PERF_BASE;
+                        break;
+                }
                 break;
         }
 
@@ -322,6 +340,10 @@ void __init bcm63xx_cpu_init(void)
         bcm63xx_cpu_rev = (tmp & REV_REVID_MASK) >> REV_REVID_SHIFT;
 
         switch (bcm63xx_cpu_id) {
+        case BCM3368_CPU_ID:
+                bcm63xx_regs_base = bcm3368_regs_base;
+                bcm63xx_irqs = bcm3368_irqs;
+                break;
         case BCM6328_CPU_ID:
                 bcm63xx_regs_base = bcm6328_regs_base;
                 bcm63xx_irqs = bcm6328_irqs;
diff --git a/arch/mips/bcm63xx/dev-flash.c b/arch/mips/bcm63xx/dev-flash.c
index 588d1ec622e4..172dd8397178 100644
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
@@ -71,6 +71,7 @@ static int __init bcm63xx_detect_flash_type(void)
         case BCM6348_CPU_ID:
                 /* no way to auto detect so assume parallel */
                 return BCM63XX_FLASH_TYPE_PARALLEL;
+        case BCM3368_CPU_ID:
         case BCM6358_CPU_ID:
                 val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
                 if (val & STRAPBUS_6358_BOOT_SEL_PARALLEL)
diff --git a/arch/mips/bcm63xx/dev-spi.c b/arch/mips/bcm63xx/dev-spi.c
index 3065bb61820d..d12daed749bc 100644
--- a/arch/mips/bcm63xx/dev-spi.c
+++ b/arch/mips/bcm63xx/dev-spi.c
@@ -37,7 +37,8 @@ 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_6362() || BCMCPU_IS_6368())
+        if (BCMCPU_IS_3368() || BCMCPU_IS_6358() ||
+                BCMCPU_IS_6362() || BCMCPU_IS_6368())
                 bcm63xx_regs_spi = bcm6358_regs_spi;
 }
 #else
@@ -87,7 +88,8 @@ int __init bcm63xx_spi_register(void)
                 spi_pdata.msg_ctl_width = SPI_6348_MSG_CTL_WIDTH;
         }
 
-        if (BCMCPU_IS_6358() || BCMCPU_IS_6362() || BCMCPU_IS_6368()) {
+        if (BCMCPU_IS_3368() || 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;
diff --git a/arch/mips/bcm63xx/dev-uart.c b/arch/mips/bcm63xx/dev-uart.c
index d6e42c608325..3bc7f3bfc9ad 100644
--- a/arch/mips/bcm63xx/dev-uart.c
+++ b/arch/mips/bcm63xx/dev-uart.c
@@ -54,7 +54,8 @@ int __init bcm63xx_uart_register(unsigned int id)
         if (id >= ARRAY_SIZE(bcm63xx_uart_devices))
                 return -ENODEV;
 
-        if (id == 1 && (!BCMCPU_IS_6358() && !BCMCPU_IS_6368()))
+        if (id == 1 && (!BCMCPU_IS_3368() && !BCMCPU_IS_6358() &&
+                !BCMCPU_IS_6368()))
                 return -ENODEV;
 
         if (id == 0) {
diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c
index d744606e19e9..1525f8a3841b 100644
--- a/arch/mips/bcm63xx/irq.c
+++ b/arch/mips/bcm63xx/irq.c
@@ -27,6 +27,17 @@ static void __internal_irq_unmask_32(unsigned int irq) __maybe_unused;
 static void __internal_irq_unmask_64(unsigned int irq) __maybe_unused;
 
 #ifndef BCMCPU_RUNTIME_DETECT
+#ifdef CONFIG_BCM63XX_CPU_3368
+#define irq_stat_reg            PERF_IRQSTAT_3368_REG
+#define irq_mask_reg            PERF_IRQMASK_3368_REG
+#define irq_bits                32
+#define is_ext_irq_cascaded     0
+#define ext_irq_start           0
+#define ext_irq_end             0
+#define ext_irq_count           4
+#define ext_irq_cfg_reg1        PERF_EXTIRQ_CFG_REG_3368
+#define ext_irq_cfg_reg2        0
+#endif
 #ifdef CONFIG_BCM63XX_CPU_6328
 #define irq_stat_reg            PERF_IRQSTAT_6328_REG
 #define irq_mask_reg            PERF_IRQMASK_6328_REG
@@ -140,6 +151,13 @@ static void bcm63xx_init_irq(void)
         irq_mask_addr = bcm63xx_regset_address(RSET_PERF);
 
         switch (bcm63xx_get_cpu_id()) {
+        case BCM3368_CPU_ID:
+                irq_stat_addr += PERF_IRQSTAT_3368_REG;
+                irq_mask_addr += PERF_IRQMASK_3368_REG;
+                irq_bits = 32;
+                ext_irq_count = 4;
+                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_3368;
+                break;
         case BCM6328_CPU_ID:
                 irq_stat_addr += PERF_IRQSTAT_6328_REG;
                 irq_mask_addr += PERF_IRQMASK_6328_REG;
@@ -479,6 +497,7 @@ static int bcm63xx_external_irq_set_type(struct irq_data *d,
                         reg &= ~EXTIRQ_CFG_BOTHEDGE_6348(irq);
                 break;
 
+        case BCM3368_CPU_ID:
         case BCM6328_CPU_ID:
         case BCM6338_CPU_ID:
         case BCM6345_CPU_ID:
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index fd698087fbfd..f3ff28f4c258 100644
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -26,7 +26,9 @@ void __init prom_init(void)
         bcm_wdt_writel(WDT_STOP_2, WDT_CTL_REG);
 
         /* disable all hardware blocks clock for now */
-        if (BCMCPU_IS_6328())
+        if (BCMCPU_IS_3368())
+                mask = CKCTL_3368_ALL_SAFE_EN;
+        else if (BCMCPU_IS_6328())
                 mask = CKCTL_6328_ALL_SAFE_EN;
         else if (BCMCPU_IS_6338())
                 mask = CKCTL_6338_ALL_SAFE_EN;
diff --git a/arch/mips/bcm63xx/reset.c b/arch/mips/bcm63xx/reset.c
index 317931c6cf58..acbeb1fe7c57 100644
--- a/arch/mips/bcm63xx/reset.c
+++ b/arch/mips/bcm63xx/reset.c
@@ -30,6 +30,19 @@
         [BCM63XX_RESET_PCIE]            = BCM## __cpu ##_RESET_PCIE,    \
         [BCM63XX_RESET_PCIE_EXT]        = BCM## __cpu ##_RESET_PCIE_EXT,
 
+#define BCM3368_RESET_SPI       SOFTRESET_3368_SPI_MASK
+#define BCM3368_RESET_ENET      SOFTRESET_3368_ENET_MASK
+#define BCM3368_RESET_USBH      0
+#define BCM3368_RESET_USBD      SOFTRESET_3368_USBS_MASK
+#define BCM3368_RESET_DSL       0
+#define BCM3368_RESET_SAR       0
+#define BCM3368_RESET_EPHY      SOFTRESET_3368_EPHY_MASK
+#define BCM3368_RESET_ENETSW    0
+#define BCM3368_RESET_PCM       SOFTRESET_3368_PCM_MASK
+#define BCM3368_RESET_MPI       SOFTRESET_3368_MPI_MASK
+#define BCM3368_RESET_PCIE      0
+#define BCM3368_RESET_PCIE_EXT  0
+
 #define BCM6328_RESET_SPI       SOFTRESET_6328_SPI_MASK
 #define BCM6328_RESET_ENET      0
 #define BCM6328_RESET_USBH      SOFTRESET_6328_USBH_MASK
@@ -117,6 +130,10 @@
 /*
  * core reset bits
  */
+static const u32 bcm3368_reset_bits[] = {
+        __GEN_RESET_BITS_TABLE(3368)
+};
+
 static const u32 bcm6328_reset_bits[] = {
         __GEN_RESET_BITS_TABLE(6328)
 };
@@ -146,7 +163,10 @@ static int reset_reg;
 
 static int __init bcm63xx_reset_bits_init(void)
 {
-        if (BCMCPU_IS_6328()) {
+        if (BCMCPU_IS_3368()) {
+                reset_reg = PERF_SOFTRESET_6358_REG;
+                bcm63xx_reset_bits = bcm3368_reset_bits;
+        } else if (BCMCPU_IS_6328()) {
                 reset_reg = PERF_SOFTRESET_6328_REG;
                 bcm63xx_reset_bits = bcm6328_reset_bits;
         } else if (BCMCPU_IS_6338()) {
@@ -170,6 +190,13 @@ static int __init bcm63xx_reset_bits_init(void)
 }
 #else
 
+#ifdef CONFIG_BCM63XX_CPU_3368
+static const u32 bcm63xx_reset_bits[] = {
+        __GEN_RESET_BITS_TABLE(3368)
+};
+#define reset_reg PERF_SOFTRESET_6358_REG
+#endif
+
 #ifdef CONFIG_BCM63XX_CPU_6328
 static const u32 bcm63xx_reset_bits[] = {
         __GEN_RESET_BITS_TABLE(6328)
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c
index 24a24445db64..6660c7ddf87b 100644
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
@@ -68,6 +68,9 @@ void bcm63xx_machine_reboot(void)
 
         /* mask and clear all external irq */
         switch (bcm63xx_get_cpu_id()) {
+        case BCM3368_CPU_ID:
+                perf_regs[0] = PERF_EXTIRQ_CFG_REG_3368;
+                break;
         case BCM6328_CPU_ID:
                 perf_regs[0] = PERF_EXTIRQ_CFG_REG_6328;
                 break;