Linux-MIPS Archive on lore.kernel.org
 help / color / Atom feed
* Add Ingenic X1000 system type.
@ 2019-07-30 11:30 Zhou Yanjie
  2019-07-30 11:30 ` [PATCH] MIPS: X1000: Add " Zhou Yanjie
  0 siblings, 1 reply; 3+ messages in thread
From: Zhou Yanjie @ 2019-07-30 11:30 UTC (permalink / raw)
  To: linux-mips
  Cc: linux-kernel, ralf, paul, paul.burton, jhogan, fancer.lancer,
	chenhc, tglx, gregkh, armijn, syq, jiaxun.yang

Add X1000 system type for cat /proc/cpuinfo to give out X1000.



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] MIPS: X1000: Add X1000 system type.
  2019-07-30 11:30 Add Ingenic X1000 system type Zhou Yanjie
@ 2019-07-30 11:30 ` " Zhou Yanjie
  2019-07-30 16:44   ` Paul Burton
  0 siblings, 1 reply; 3+ messages in thread
From: Zhou Yanjie @ 2019-07-30 11:30 UTC (permalink / raw)
  To: linux-mips
  Cc: linux-kernel, ralf, paul, paul.burton, jhogan, fancer.lancer,
	chenhc, tglx, gregkh, armijn, syq, jiaxun.yang

Add X1000 system type for cat /proc/cpuinfo to give out X1000.

Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>
---
 arch/mips/include/asm/bootinfo.h | 1 +
 arch/mips/include/asm/cpu.h      | 2 +-
 arch/mips/jz4740/setup.c         | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 235bc2f..32ba103 100644
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -81,6 +81,7 @@ enum loongson_machine_type {
 #define  MACH_INGENIC_JZ4740	1	/* JZ4740 SOC		*/
 #define  MACH_INGENIC_JZ4770	2	/* JZ4770 SOC		*/
 #define  MACH_INGENIC_JZ4780	3	/* JZ4780 SOC		*/
+#define  MACH_INGENIC_X1000		4	/* X1000 SOC		*/
 
 extern char *system_type;
 const char *get_system_type(void);
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 6ad7d3c..65c780e4 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -45,7 +45,7 @@
 #define PRID_COMP_CAVIUM	0x0d0000
 #define PRID_COMP_LOONGSON	0x140000
 #define PRID_COMP_INGENIC_D0	0xd00000	/* JZ4740, JZ4750 */
-#define PRID_COMP_INGENIC_D1	0xd10000	/* JZ4770, JZ4775 */
+#define PRID_COMP_INGENIC_D1	0xd10000	/* JZ4770, JZ4775, X1000 */
 #define PRID_COMP_INGENIC_E1	0xe10000	/* JZ4780 */
 
 /*
diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
index 4264eaf..5c58f30 100644
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -45,6 +45,8 @@ static void __init jz4740_detect_mem(void)
 
 static unsigned long __init get_board_mach_type(const void *fdt)
 {
+	if (!fdt_node_check_compatible(fdt, 0, "ingenic,x1000"))
+		return MACH_INGENIC_X1000;
 	if (!fdt_node_check_compatible(fdt, 0, "ingenic,jz4780"))
 		return MACH_INGENIC_JZ4780;
 	if (!fdt_node_check_compatible(fdt, 0, "ingenic,jz4770"))
@@ -85,6 +87,8 @@ void __init device_tree_init(void)
 const char *get_system_type(void)
 {
 	switch (mips_machtype) {
+	case MACH_INGENIC_X1000:
+		return "X1000";
 	case MACH_INGENIC_JZ4780:
 		return "JZ4780";
 	case MACH_INGENIC_JZ4770:
-- 
2.7.4



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] MIPS: X1000: Add X1000 system type.
  2019-07-30 11:30 ` [PATCH] MIPS: X1000: Add " Zhou Yanjie
@ 2019-07-30 16:44   ` Paul Burton
  0 siblings, 0 replies; 3+ messages in thread
From: Paul Burton @ 2019-07-30 16:44 UTC (permalink / raw)
  To: Zhou Yanjie
  Cc: linux-mips, linux-kernel, ralf, paul, Paul Burton, jhogan,
	fancer.lancer, chenhc, tglx, gregkh, armijn, syq, jiaxun.yang,
	linux-mips

Hello,

Zhou Yanjie wrote:
> Add X1000 system type for cat /proc/cpuinfo to give out X1000.
> 
> Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>

Applied to mips-next.

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email paul.burton@mips.com to report it. ]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-30 11:30 Add Ingenic X1000 system type Zhou Yanjie
2019-07-30 11:30 ` [PATCH] MIPS: X1000: Add " Zhou Yanjie
2019-07-30 16:44   ` Paul Burton

Linux-MIPS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-mips/0 linux-mips/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-mips linux-mips/ https://lore.kernel.org/linux-mips \
		linux-mips@vger.kernel.org linux-mips@archiver.kernel.org
	public-inbox-index linux-mips


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-mips


AGPL code for this site: git clone https://public-inbox.org/ public-inbox