From patchwork Thu Aug 8 09:55:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1143939 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="O/J4+gg7"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 4643nc3Mgjz9sBF for ; Thu, 8 Aug 2019 20:02:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 252F0C21F24; Thu, 8 Aug 2019 10:02:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E6A9DC21EEF; Thu, 8 Aug 2019 09:56:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C55A3C21F04; Thu, 8 Aug 2019 09:56:17 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20074.outbound.protection.outlook.com [40.107.2.74]) by lists.denx.de (Postfix) with ESMTPS id ABE44C21E49 for ; Thu, 8 Aug 2019 09:55:53 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GdBMo0x11Ud0q1QkMRe0lnz4Tt7b+JFq1bYKiSU4cOj9Mzt1WNJqoCl/rPoFNp3lrV4yANoKQew+0dpXY5eLMI+tk0q5jZ2Thy7y3/7rRqAGJO3weEcymzJxFSBQF9Xh/HA6IUTMTYgVbhlM4+2jyHumoyrz7nhqwb5BVP8eI4G5ZjXNngEKkDJ/1xTrx+MIfxcLhCaDCtaoyP4m8hyOTl1G8WKlxQ6GQO0jc8ULhXSYm745qmc1lRkHvDLTt0Q4YsPG8DVj4ccgvdfE9K/w2au/AwhkdAN1AYUujouTp+5owf5ayMA0Q69lVPQ2XIobB76GUMqyLJrWaAgU/6oUyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TZB0UslYgUpTEZAt9IByrGqXtkAIEuQnXllpVq5HRDY=; b=G+ZYWuhVOHPlKVfvPFkwCwo0RNqq9oJJwCg9XKuqSPlr+g0VMv6fcEKbC+/8yxELorEGL0lyWVHQvKd3Rb/0Jr8rmY71JLR2VliTYJy7H2C1R06jS22b6x7QTtVGIA+0HfFvHy4KnJsaE7JDQ4vGkEG6HSgIzMNyjddozlJniHDq8iqzZL6Sx+7gtX569gxLaJU687xdDjGnmOePdaXMt3bWXH51PiaQaHzRSibzUnomZU72fuqbhRLy5fnDSuzigIkry9rpsfrYWzJgwQ9FxllqyRCxIRI2FEhcKmvEXh+DbfRBJs204r/9VnmEA3qp9oey1E2JeWwzoNtFUCE0pQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TZB0UslYgUpTEZAt9IByrGqXtkAIEuQnXllpVq5HRDY=; b=O/J4+gg7Xv3NPxQvO4K6tpXIpwOlwp9WZKsgD4YS3HNyKe+klLCixxIpz0TKTyu5ZDNUErZZTc0OEnBtgoRSTTr7Jy//fM0hBexDEqkpNmILcbmGR/eI4jnfLINEmI0+Ak9Q/MuicSmelq/vVlqOeRYnIo24/L3g9dDgXaPJePQ= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5778.eurprd04.prod.outlook.com (20.178.203.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.14; Thu, 8 Aug 2019 09:55:52 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4%4]) with mapi id 15.20.2115.017; Thu, 8 Aug 2019 09:55:52 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH v2 4/5] imx: add i.MX6ULZ cpu type Thread-Index: AQHVTc92CY6WJPzlRkuAdjZG4Q3QVw== Date: Thu, 8 Aug 2019 09:55:52 +0000 Message-ID: <20190808101110.21912-4-peng.fan@nxp.com> References: <20190808101110.21912-1-peng.fan@nxp.com> In-Reply-To: <20190808101110.21912-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK2PR02CA0141.apcprd02.prod.outlook.com (2603:1096:202:16::25) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4c3ac643-f493-46f4-2234-08d71be69934 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB5778; x-ms-traffictypediagnostic: AM0PR04MB5778: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:901; x-forefront-prvs: 012349AD1C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(136003)(376002)(396003)(39860400002)(366004)(199004)(189003)(71200400001)(4326008)(26005)(6486002)(446003)(6436002)(305945005)(2501003)(386003)(36756003)(486006)(64756008)(316002)(66476007)(66446008)(66946007)(66556008)(86362001)(44832011)(6506007)(25786009)(2906002)(186003)(76176011)(102836004)(99286004)(7736002)(11346002)(2616005)(8676002)(476003)(52116002)(7416002)(478600001)(110136005)(81156014)(53936002)(71190400001)(8936002)(50226002)(66066001)(81166006)(5660300002)(14454004)(6116002)(3846002)(54906003)(1076003)(6512007)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5778; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: WuclGcoy0vD5z/xrwBu5G0fBmjizTaAuXR6Q+3NUmKa6Z6VsSVqWt3orZlUg2KGGMDRKSUBcEGxz3qb0rzy0mRG4gZC2+JfXL/yAeZuUK5cLpxSrej+WM4vbuK0TaIuSJ2Xd0Yz41tv/CpPy9nqPgkS9IJ8wrsy1RyeNMsuOlimYoYqUlTvrQgGMvjlk7xStfOeYLgaspOJG4sd/7+hTeP6Guu8tbR76U6rtXcVVAFTmJ5so2aHeVCcS3PCLH2mLHRubDAlgW7KbitVE55PJ+yN/25BeUqzu194nde7l3zPA9uvWu+j8Z0oQ6Q41vIRuzKgYmqMEMnsRFJakU+8bgCedmg515JDwlFpuYCcNns9385k/ngNg9upsA1j7SvgOEvS7W9c26BltT8qLoOc4LUaHkAz8VO4LnATawiFdHnU= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c3ac643-f493-46f4-2234-08d71be69934 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Aug 2019 09:55:52.6311 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: peng.fan@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5778 Cc: "marex@denx.de" , "igor.opaniuk@toradex.com" , "u-boot@lists.denx.de" , dl-uboot-imx , "sr@denx.de" , "judge.packham@gmail.com" Subject: [U-Boot] [PATCH v2 4/5] imx: add i.MX6ULZ cpu type X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add i.MX6ULZ cpu type and helper. Signed-off-by: Peng Fan Reviewed-by: Ye Li Reviewed-by: Fabio Estevam --- V2: None arch/arm/include/asm/arch-imx/cpu.h | 1 + arch/arm/include/asm/mach-imx/sys_proto.h | 1 + arch/arm/mach-imx/cpu.c | 2 ++ arch/arm/mach-imx/mx6/soc.c | 4 ++++ 4 files changed, 8 insertions(+) diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h index d4a83eef72..073efcd1b4 100644 --- a/arch/arm/include/asm/arch-imx/cpu.h +++ b/arch/arm/include/asm/arch-imx/cpu.h @@ -17,6 +17,7 @@ #define MXC_CPU_MX6Q 0x63 #define MXC_CPU_MX6UL 0x64 #define MXC_CPU_MX6ULL 0x65 +#define MXC_CPU_MX6ULZ 0x6B #define MXC_CPU_MX6SOLO 0x66 /* dummy */ #define MXC_CPU_MX6SLL 0x67 #define MXC_CPU_MX6D 0x6A diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 4925dd7894..260608062e 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -38,6 +38,7 @@ #define is_mx6solo() (is_cpu_type(MXC_CPU_MX6SOLO)) #define is_mx6ul() (is_cpu_type(MXC_CPU_MX6UL)) #define is_mx6ull() (is_cpu_type(MXC_CPU_MX6ULL)) +#define is_mx6ulz() (is_cpu_type(MXC_CPU_MX6ULZ)) #define is_mx6sll() (is_cpu_type(MXC_CPU_MX6SLL)) #define is_mx7ulp() (is_cpu_type(MXC_CPU_MX7ULP)) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 6e9a175210..73ce7f8d7d 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -173,6 +173,8 @@ const char *get_imx_type(u32 imxtype) return "6UL"; /* Ultra-Lite version of the mx6 */ case MXC_CPU_MX6ULL: return "6ULL"; /* ULL version of the mx6 */ + case MXC_CPU_MX6ULZ: + return "6ULZ"; /* ULZ version of the mx6 */ case MXC_CPU_MX51: return "51"; case MXC_CPU_MX53: diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index 075d2467ce..d37d3856d3 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -85,6 +85,10 @@ u32 get_cpu_rev(void) type = MXC_CPU_MX6D; } + if (type == MXC_CPU_MX6ULL) { + if (readl(SRC_BASE_ADDR + 0x1c) & (1 << 6)) + type = MXC_CPU_MX6ULZ; + } } major = ((reg >> 8) & 0xff); if ((major >= 1) &&