OpenWrt – Rev 1

Subversion Repositories:
Rev:
From d59120f23279ef62a48d9f94847254b061d0a8b6 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Sat, 7 Dec 2013 14:30:59 +0100
Subject: [PATCH 22/45] MIPS: BCM63XX: detect BCM6328 variants

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
---
 arch/mips/bcm63xx/cpu.c                          | 10 ++++++++++
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

--- a/arch/mips/bcm63xx/cpu.c
+++ b/arch/mips/bcm63xx/cpu.c
@@ -305,6 +305,7 @@ void __init bcm63xx_cpu_init(void)
        unsigned int tmp;
        unsigned int cpu = smp_processor_id();
        u32 chipid_reg;
+       u8 __maybe_unused varid = 0;
 
        /* soc registers location depends on cpu type */
        chipid_reg = 0;
@@ -344,6 +345,7 @@ void __init bcm63xx_cpu_init(void)
        bcm63xx_cpu_id = (tmp & REV_CHIPID_MASK) >> REV_CHIPID_SHIFT;
        bcm63xx_cpu_variant = bcm63xx_cpu_id;
        bcm63xx_cpu_rev = (tmp & REV_REVID_MASK) >> REV_REVID_SHIFT;
+       varid = (tmp & REV_VARID_MASK) >> REV_VARID_SHIFT;
 
        switch (bcm63xx_cpu_id) {
        case BCM3368_CPU_ID:
@@ -353,6 +355,14 @@ void __init bcm63xx_cpu_init(void)
        case BCM6328_CPU_ID:
                bcm63xx_regs_base = bcm6328_regs_base;
                bcm63xx_irqs = bcm6328_irqs;
+
+               if (varid == 1)
+                       bcm63xx_cpu_variant = BCM63281_CPU_ID;
+               else if (varid == 3)
+                       bcm63xx_cpu_variant = BCM63283_CPU_ID;
+               else
+                       pr_warn("unknown BCM6328 variant: %x\n", varid);
+
                break;
        case BCM6338_CPU_ID:
                bcm63xx_regs_base = bcm6338_regs_base;
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
@@ -12,6 +12,8 @@
  */
 #define BCM3368_CPU_ID         0x3368
 #define BCM6328_CPU_ID         0x6328
+#define BCM63281_CPU_ID                0x63281
+#define BCM63283_CPU_ID                0x63283
 #define BCM6338_CPU_ID         0x6338
 #define BCM6345_CPU_ID         0x6345
 #define BCM6348_CPU_ID         0x6348
@@ -86,8 +88,10 @@ static inline u16 __pure bcm63xx_get_cpu
 
 #define BCMCPU_VARIANT_IS_3368() \
        (bcm63xx_get_cpu_variant() == BCM3368_CPU_ID)
-#define BCMCPU_VARIANT_IS_6328() \
-       (bcm63xx_get_cpu_variant() == BCM6328_CPU_ID)
+#define BCMCPU_VARIANT_IS_63281() \
+       (bcm63xx_get_cpu_variant() == BCM63281_CPU_ID)
+#define BCMCPU_VARIANT_IS_63283() \
+       (bcm63xx_get_cpu_variant() == BCM63283_CPU_ID)
 #define BCMCPU_VARIANT_IS_6338() \
        (bcm63xx_get_cpu_variant() == BCM6338_CPU_ID)
 #define BCMCPU_VARIANT_IS_6345() \