linux-mips
[Top] [All Lists]

[PATCH V18 01/13] MIPS: Loongson: Rename PRID_IMP_LOONGSON1 and PRID_IMP

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH V18 01/13] MIPS: Loongson: Rename PRID_IMP_LOONGSON1 and PRID_IMP_LOONGSON2
From: Huacai Chen <chenhc@lemote.com>
Date: Thu, 13 Feb 2014 20:08:51 +0800
Cc: John Crispin <john@phrozen.org>, "Steven J. Hill" <Steven.Hill@imgtec.com>, Aurelien Jarno <aurelien@aurel32.net>, linux-mips@linux-mips.org, Fuxin Zhang <zhangfx@lemote.com>, Zhangjin Wu <wuzhangjin@gmail.com>, Huacai Chen <chenhc@lemote.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=kc3CYvMzd5heJH/rChjYPUHuOcJZJQC28jlNlUOUQQI=; b=0vZcaO5Z/OswFapMUjFGojx/O12ZdAaphQYSHUS80SESBxyM2KcgqM4B+8uEWCj3IF 79CNvPdGA55hYW7lpxfCTaE5OO0+gQxmAxktUiUbSamJWkeLUXNVK4/PqCVo1SAceb4x 49FPkwsdKoIUGxu2pW4e8LiTNROqplDnpT719kp+cTCUNu5x9IBaDGF15QeFn+2eXmBH 3K/neAlvZNkheH/XaDq+F2WPQfpX+v3EkdS9/+rL75y36szUDHtlsJnx6+8tSSEYwNeF nbCRUkZHxY7LOVD6pqkM98RQSgoR1Vz0bdrNdwLkGV/8xf7rpZePcCHnat3I84Uk4+kh a/hQ==
In-reply-to: <1392293343-5453-1-git-send-email-chenhc@lemote.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1392293343-5453-1-git-send-email-chenhc@lemote.com>
Sender: linux-mips-bounce@linux-mips.org
Loongson-1 is a 32-bit MIPS CPU and Loongson-2/3 are 64-bit MIPS CPUs,
and both Loongson-2/3 has the same PRID IMP filed (0x6300). As a
result, renaming PRID_IMP_LOONGSON1 and PRID_IMP_LOONGSON2 to
PRID_IMP_LOONGSON_32 and PRID_IMP_LOONGSON_64 will make more sense.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Tested-by: Alex Smith <alex.smith@imgtec.com>
Reviewed-by: Alex Smith <alex.smith@imgtec.com>
---
 arch/mips/include/asm/cpu.h  |    4 ++--
 arch/mips/kernel/cpu-probe.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 76411df..0792c4e 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -82,10 +82,10 @@
 #define PRID_IMP_RM7000                0x2700
 #define PRID_IMP_NEVADA                0x2800          /* RM5260 ??? */
 #define PRID_IMP_RM9000                0x3400
-#define PRID_IMP_LOONGSON1     0x4200
+#define PRID_IMP_LOONGSON_32   0x4200  /* Loongson-1 */
 #define PRID_IMP_R5432         0x5400
 #define PRID_IMP_R5500         0x5500
-#define PRID_IMP_LOONGSON2     0x6300
+#define PRID_IMP_LOONGSON_64   0x6300  /* Loongson-2/3 */
 
 #define PRID_IMP_UNKNOWN       0xff00
 
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 530f832..ad776a1 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -710,7 +710,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, 
unsigned int cpu)
                             MIPS_CPU_LLSC;
                c->tlbsize = 64;
                break;
-       case PRID_IMP_LOONGSON2:
+       case PRID_IMP_LOONGSON_64:  /* Loongson-2/3 */
                c->cputype = CPU_LOONGSON2;
                __cpu_name[cpu] = "ICT Loongson-2";
 
@@ -729,7 +729,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, 
unsigned int cpu)
                             MIPS_CPU_32FPR;
                c->tlbsize = 64;
                break;
-       case PRID_IMP_LOONGSON1:
+       case PRID_IMP_LOONGSON_32:  /* Loongson-1 */
                decode_configs(c);
 
                c->cputype = CPU_LOONGSON1;
-- 
1.7.7.3


<Prev in Thread] Current Thread [Next in Thread>