From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 998CBC1B08C for ; Thu, 15 Jul 2021 10:40:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D11061360 for ; Thu, 15 Jul 2021 10:40:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241540AbhGOKnh (ORCPT ); Thu, 15 Jul 2021 06:43:37 -0400 Received: from out28-101.mail.aliyun.com ([115.124.28.101]:53489 "EHLO out28-101.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234408AbhGOKng (ORCPT ); Thu, 15 Jul 2021 06:43:36 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.07437276|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_regular_dialog|0.191699-0.00177163-0.80653;FP=0|0|0|0|0|-1|-1|-1;HT=ay29a033018047207;MF=zhouyanjie@wanyeetech.com;NM=1;PH=DS;RN=16;RT=16;SR=0;TI=SMTPD_---.Ki04TcU_1626345640; Received: from 192.168.88.128(mailfrom:zhouyanjie@wanyeetech.com fp:SMTPD_---.Ki04TcU_1626345640) by smtp.aliyun-inc.com(10.147.42.241); Thu, 15 Jul 2021 18:40:41 +0800 Subject: Re: [PATCH] MIPS: Ingenic: Add system type for new Ingenic SoCs. To: Paul Cercueil Cc: tsbogend@alpha.franken.de, paulburton@kernel.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, cand@gmx.com, git@xen0n.name, chenhuacai@kernel.org, maoxiaochuan@loongson.cn, f.fainelli@gmail.com, dongsheng.qiu@ingenic.com, aric.pzqi@ingenic.com, rick.tyliu@ingenic.com, sihui.liu@ingenic.com, jun.jiang@ingenic.com, sernia.zhou@foxmail.com References: <1625764602-67310-1-git-send-email-zhouyanjie@wanyeetech.com> <9YH5WQ.JHPWOQWG7E3R@crapouillou.net> From: Zhou Yanjie Message-ID: <583a8189-067e-8904-d845-5d260b4a421b@wanyeetech.com> Date: Thu, 15 Jul 2021 18:40:40 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <9YH5WQ.JHPWOQWG7E3R@crapouillou.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Paul, On 2021/7/13 上午5:20, Paul Cercueil wrote: > Hi Zhou, > > Le ven., juil. 9 2021 at 01:16:42 +0800, 周琰杰 (Zhou Yanjie) > a écrit : >> Add JZ4730, JZ4760, JZ4760B, X2000H, and X2100 system type for >> cat /proc/cpuinfo to give out JZ4730, JZ4760, JZ4760B, X2000H, >> and X2100. >> >> Signed-off-by: 周琰杰 (Zhou Yanjie) > > Reviewed-by: Paul Cercueil > > You could add JZ4750 and JZ4755 too, while you're at it. (Or not, I'm > fine with both). Sure, I will add them and send v2. Thanks and best regards! > > Cheers, > -Paul > >> --- >>  arch/mips/generic/board-ingenic.c | 15 +++++++++++++++ >>  arch/mips/include/asm/bootinfo.h  |  3 +++ >>  arch/mips/include/asm/cpu.h       |  4 ++-- >>  3 files changed, 20 insertions(+), 2 deletions(-) >> >> diff --git a/arch/mips/generic/board-ingenic.c >> b/arch/mips/generic/board-ingenic.c >> index 0cec0be..303bee6 100644 >> --- a/arch/mips/generic/board-ingenic.c >> +++ b/arch/mips/generic/board-ingenic.c >> @@ -21,6 +21,10 @@ >>  static __init char *ingenic_get_system_type(unsigned long machtype) >>  { >>      switch (machtype) { >> +    case MACH_INGENIC_X2100: >> +        return "X2100"; >> +    case MACH_INGENIC_X2000H: >> +        return "X2000H"; >>      case MACH_INGENIC_X2000E: >>          return "X2000E"; >>      case MACH_INGENIC_X2000: >> @@ -37,8 +41,14 @@ static __init char >> *ingenic_get_system_type(unsigned long machtype) >>          return "JZ4775"; >>      case MACH_INGENIC_JZ4770: >>          return "JZ4770"; >> +    case MACH_INGENIC_JZ4760B: >> +        return "JZ4760B"; >> +    case MACH_INGENIC_JZ4760: >> +        return "JZ4760"; >>      case MACH_INGENIC_JZ4725B: >>          return "JZ4725B"; >> +    case MACH_INGENIC_JZ4730: >> +        return "JZ4730"; >>      default: >>          return "JZ4740"; >>      } >> @@ -61,8 +71,11 @@ static __init const void *ingenic_fixup_fdt(const >> void *fdt, const void *match_d >>  } >> >>  static const struct of_device_id ingenic_of_match[] __initconst = { >> +    { .compatible = "ingenic,jz4730", .data = (void >> *)MACH_INGENIC_JZ4730 }, >>      { .compatible = "ingenic,jz4740", .data = (void >> *)MACH_INGENIC_JZ4740 }, >>      { .compatible = "ingenic,jz4725b", .data = (void >> *)MACH_INGENIC_JZ4725B }, >> +    { .compatible = "ingenic,jz4760", .data = (void >> *)MACH_INGENIC_JZ4760 }, >> +    { .compatible = "ingenic,jz4760b", .data = (void >> *)MACH_INGENIC_JZ4760B }, >>      { .compatible = "ingenic,jz4770", .data = (void >> *)MACH_INGENIC_JZ4770 }, >>      { .compatible = "ingenic,jz4775", .data = (void >> *)MACH_INGENIC_JZ4775 }, >>      { .compatible = "ingenic,jz4780", .data = (void >> *)MACH_INGENIC_JZ4780 }, >> @@ -71,6 +84,8 @@ static const struct of_device_id ingenic_of_match[] >> __initconst = { >>      { .compatible = "ingenic,x1830", .data = (void >> *)MACH_INGENIC_X1830 }, >>      { .compatible = "ingenic,x2000", .data = (void >> *)MACH_INGENIC_X2000 }, >>      { .compatible = "ingenic,x2000e", .data = (void >> *)MACH_INGENIC_X2000E }, >> +    { .compatible = "ingenic,x2000h", .data = (void >> *)MACH_INGENIC_X2000H }, >> +    { .compatible = "ingenic,x2100", .data = (void >> *)MACH_INGENIC_X2100 }, >>      {} >>  }; >> >> diff --git a/arch/mips/include/asm/bootinfo.h >> b/arch/mips/include/asm/bootinfo.h >> index 4c2e817..2128ba9 100644 >> --- a/arch/mips/include/asm/bootinfo.h >> +++ b/arch/mips/include/asm/bootinfo.h >> @@ -75,6 +75,7 @@ enum ingenic_machine_type { >>      MACH_INGENIC_JZ4750, >>      MACH_INGENIC_JZ4755, >>      MACH_INGENIC_JZ4760, >> +    MACH_INGENIC_JZ4760B, >>      MACH_INGENIC_JZ4770, >>      MACH_INGENIC_JZ4775, >>      MACH_INGENIC_JZ4780, >> @@ -83,6 +84,8 @@ enum ingenic_machine_type { >>      MACH_INGENIC_X1830, >>      MACH_INGENIC_X2000, >>      MACH_INGENIC_X2000E, >> +    MACH_INGENIC_X2000H, >> +    MACH_INGENIC_X2100, >>  }; >> >>  extern char *system_type; >> diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h >> index 9e6211e..c70cac7 100644 >> --- a/arch/mips/include/asm/cpu.h >> +++ b/arch/mips/include/asm/cpu.h >> @@ -46,8 +46,8 @@ >>  #define PRID_COMP_NETLOGIC    0x0c0000 >>  #define PRID_COMP_CAVIUM    0x0d0000 >>  #define PRID_COMP_LOONGSON    0x140000 >> -#define PRID_COMP_INGENIC_13    0x130000    /* X2000 */ >> -#define PRID_COMP_INGENIC_D0    0xd00000    /* JZ4740, JZ4750, X1830 */ >> +#define PRID_COMP_INGENIC_13    0x130000    /* X2000, X2100 */ >> +#define PRID_COMP_INGENIC_D0    0xd00000    /* JZ4730, JZ4740, >> JZ4750, JZ4760, X1830 */ >>  #define PRID_COMP_INGENIC_D1    0xd10000    /* JZ4770, JZ4775, X1000 */ >>  #define PRID_COMP_INGENIC_E1    0xe10000    /* JZ4780 */ >> >> -- >> 2.7.4 >> >