Changeset 30890

Timestamp:

2012-03-11T20:05:59+01:00 (6 years ago)

Author:

juhosg

Message:

ramips: rt305x: rewrite SoC detection

Location:

trunk/target/linux/ramips/files/arch/mips

Files:

• include/asm/mach-ralink/rt305x.h (modified) (1 diff)
• include/asm/mach-ralink/rt305x_regs.h (modified) (1 diff)
• ralink/rt305x/rt305x.c (modified) (3 diffs)

trunk/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h

@@ -16 +16 @@
 #include <linux/init.h>
 #include <linux/io.h>
+
+enum rt305x_soc_type {
+        RT305X_SOC_UNKNOWN = 0,
+        RT305X_SOC_RT3050,
+        RT305X_SOC_RT3052,
+        RT305X_SOC_RT3352,
+};
+
+extern enum rt305x_soc_type rt305x_soc;
+
+static inline int soc_is_rt3050(void)
+{
+        return rt305x_soc == RT305X_SOC_RT3050;
+}
+
+static inline int soc_is_rt3052(void)
+{
+        return rt305x_soc == RT305X_SOC_RT3052;
+}
+
+static inline int soc_is_rt305x(void)
+{
+        return soc_is_rt3050() || soc_is_rt3052();
+}
+
+static inline int soc_is_rt3352(void)
+{
+        return rt305x_soc == RT305X_SOC_RT3352;
+}
 
 #define RT305X_MEM_SIZE_MIN (2 * 1024 * 1024)

trunk/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_regs.h

@@ -57 +57 @@
 #define SYSC_REG_IA_ADDRESS     0x310   /* Illegal Access Address */
 #define SYSC_REG_IA_TYPE        0x314   /* Illegal Access Type */
+
+#define RT3052_CHIP_NAME0       0x30335452
+#define RT3052_CHIP_NAME1       0x20203235
+
+#define RT3352_CHIP_NAME0       0x33335452
+#define RT3352_CHIP_NAME1       0x20203235
 
 #define CHIP_ID_ID_MASK         0xff

trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c

@@ -16 +16 @@
 #include <linux/module.h>
 
+#include <asm/mipsregs.h>
+
 #include <asm/mach-ralink/common.h>
 #include <asm/mach-ralink/ramips_gpio.h>
@@ -23 +25 @@
 void __iomem * rt305x_sysc_base;
 void __iomem * rt305x_memc_base;
+enum rt305x_soc_type rt305x_soc;
 
 void __init ramips_soc_prom_init(void)
 {
         void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
+        const char *name = "unknown";
         u32 n0;
         u32 n1;
@@ -33 +37 @@
         n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
         n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
+
+        if (n0 == RT3052_CHIP_NAME0 && n1 == RT3052_CHIP_NAME1) {
+                unsigned long icache_sets;
+
+                icache_sets = (read_c0_config1() >> 22) & 7;
+                if (icache_sets == 1) {
+                        rt305x_soc = RT305X_SOC_RT3050;
+                        name = "RT3050";
+                } else {
+                        rt305x_soc = RT305X_SOC_RT3052;
+                        name = "RT3052";
+                }
+        } else if (n0 == RT3352_CHIP_NAME0 && n1 == RT3352_CHIP_NAME1) {
+                rt305x_soc = RT305X_SOC_RT3352;
+                name = "RT3352";
+        } else {
+                panic("rt305x: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
+        }
+
         id = __raw_readl(sysc + SYSC_REG_CHIP_ID);
 
         snprintf(ramips_sys_type, RAMIPS_SYS_TYPE_LEN,
-                "Ralink %c%c%c%c%c%c%c%c id:%u rev:%u",
-                (char) (n0 & 0xff), (char) ((n0 >> 8) & 0xff),
-                (char) ((n0 >> 16) & 0xff), (char) ((n0 >> 24) & 0xff),
-                (char) (n1 & 0xff), (char) ((n1 >> 8) & 0xff),
-                (char) ((n1 >> 16) & 0xff), (char) ((n1 >> 24) & 0xff),
+                "Ralink %s id:%u rev:%u",
+                name,
                 (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
                 (id & CHIP_ID_REV_MASK));