From: Jiaxun Yang <jiaxun.yang@flygoat.com>
To: linux-mips@vger.kernel.org
Cc: keguang.zhang@gmail.com, paul.burton@mips.com,
Jiaxun Yang <jiaxun.yang@flygoat.com>
Subject: [PATCH 6/6] cpu-probe: Rename Loongson 1B to Loongson GS232
Date: Tue, 22 Jan 2019 21:04:15 +0800 [thread overview]
Message-ID: <20190122130415.3440-6-jiaxun.yang@flygoat.com> (raw)
In-Reply-To: <20190122130415.3440-1-jiaxun.yang@flygoat.com>
The Loongson-1A/1B/1C are shareing the same PRID.
Rename previous Loongson 1B to the core used in these
processors.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/include/asm/cpu.h | 2 +-
arch/mips/kernel/cpu-probe.c | 4 ++--
arch/mips/loongson32/common/setup.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 532b49b1dbb3..b37c1be08dbd 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -241,7 +241,7 @@
#define PRID_REV_VR4181A 0x0070 /* Same as VR4122 */
#define PRID_REV_VR4130 0x0080
#define PRID_REV_34K_V1_0_2 0x0022
-#define PRID_REV_LOONGSON1B 0x0020
+#define PRID_REV_LOONGSON_GS232 0x0020
#define PRID_REV_LOONGSON1C 0x0020 /* Same as Loongson-1B */
#define PRID_REV_LOONGSON2E 0x0002
#define PRID_REV_LOONGSON2F 0x0003
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 95b18a194f53..64bf2a971012 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -1546,8 +1546,8 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
c->cputype = CPU_LOONGSON1;
switch (c->processor_id & PRID_REV_MASK) {
- case PRID_REV_LOONGSON1B:
- __cpu_name[cpu] = "Loongson 1B";
+ case PRID_REV_LOONGSON_GS232:
+ __cpu_name[cpu] = "Loongson GS232";
break;
}
diff --git a/arch/mips/loongson32/common/setup.c b/arch/mips/loongson32/common/setup.c
index 1640744288ee..a1cb26dfc366 100644
--- a/arch/mips/loongson32/common/setup.c
+++ b/arch/mips/loongson32/common/setup.c
@@ -21,7 +21,7 @@ const char *get_system_type(void)
unsigned int processor_id = (¤t_cpu_data)->processor_id;
switch (processor_id & PRID_REV_MASK) {
- case PRID_REV_LOONGSON1B:
+ case PRID_REV_LOONGSON_GS232:
#if defined(CONFIG_LOONGSON1_LS1B)
return "LOONGSON LS1B";
#elif defined(CONFIG_LOONGSON1_LS1C)
--
2.20.1
next prev parent reply other threads:[~2019-01-22 13:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-22 13:04 [PATCH 1/6] MIPS: Loongson32: Remove unused platform devices Jiaxun Yang
2019-01-22 13:04 ` [PATCH 2/6] MIPS: Loongson32: workaround di issue Jiaxun Yang
2019-01-22 17:39 ` Paul Burton
2019-01-23 0:19 ` Jiaxun Yang
2019-01-23 1:34 ` Paul Burton
2019-01-22 13:04 ` [PATCH 3/6] MIPS: Loongson32: Revert ISA level to MIPS32R2 Jiaxun Yang
2019-01-23 1:34 ` Paul Burton
2019-01-22 13:04 ` [PATCH 4/6] MIPS: Loongson32: clarify we don't support MIPS16 and merge configs Jiaxun Yang
2019-01-23 1:34 ` Paul Burton
2019-01-22 13:04 ` [PATCH 5/6] MIPS: Loongson32: Set load address to 0x80200000 Jiaxun Yang
2019-01-23 1:34 ` Paul Burton
2019-01-22 13:04 ` Jiaxun Yang [this message]
2019-01-23 1:34 ` [PATCH 1/6] MIPS: Loongson32: Remove unused platform devices Paul Burton
[not found] ` <CAJhJPsU1DPBp6it0agNrDfLpQGRV0c45mH6mTi=wcwt0OZikkQ@mail.gmail.com>
2019-01-23 3:40 ` Jiaxun Yang
2019-01-23 21:40 ` Paul Burton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190122130415.3440-6-jiaxun.yang@flygoat.com \
--to=jiaxun.yang@flygoat.com \
--cc=keguang.zhang@gmail.com \
--cc=linux-mips@vger.kernel.org \
--cc=paul.burton@mips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.