From patchwork Mon Jul 22 01:25:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1134643 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="WHax0Ljy"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45sQLM6k9jz9sBF for ; Mon, 22 Jul 2019 12:20:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9D130C2205F; Mon, 22 Jul 2019 02:20:10 +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 115D5C21E4F; Mon, 22 Jul 2019 01:27:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 12D3CC21D9A; Mon, 22 Jul 2019 01:27:03 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70070.outbound.protection.outlook.com [40.107.7.70]) by lists.denx.de (Postfix) with ESMTPS id B0BEDC21D9A for ; Mon, 22 Jul 2019 01:25:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QBzviU7FpG3B2XtrItMahoQLvhwdkcd5HKWc0VZs8EChlyyP5AKE4Cd5aJ9FARsemNfbjwKOFYwKi4kDgygm2odbiKGLw/8pkoSDluxbiAiFBzocAOvuW+L/rgloMoxZXK10v0FVQ1nHbnmTywexnNKfPmrxHVpCv0hQo8TDV8qwiT3rM+zEG/p0rJLRRdA9z1LBR0PjBuAgQxym5jr/cM0EjLzu10yEafPAf3hWUGySEEqK/PHEVGWs2R9BnaY8wEE1z6M9+eLgN+AzxiZjw9JnOCSHRCWoMJEiMU8fIKLVn9HdOZ+oykhmrr+UEGxF1kU95XFwzOb2RICgfeuYCg== 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=72E02STdf7V/WMH/JN7QaxT7/OuSQXtxUVppotwU5m8=; b=LNo2Gtyk1rtTTMrKAx7puXCtzQ2/nmTSHDwwv9ng30igeDMfUfpRqxI9hA1IjC7bA3dn51SXxMoaoq5K3eGx1TvvUKtjj3rcTARxw07EUX38ekf4BCQWnQaanBPsWdbuAwrRh57VoGVWPPcM2fPEPmBO3SBZW29ZbGWmbtrBbSsbKCy3HPJp5jcWcyWQRfFKzBrU6YikkC9/yW4LZ67lxB+rw+a3ZCuz1T+MpZV3BbSKxLPFOmDg/22k+edRM5m/h3he9lfdz1hWICSL1T2UAMbRQM43eZ3O/tRaVXNGeejLJz17pGEL4pjk/yNHWWauaTdJon8D1lzIO8qXcAMs8Q== 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=72E02STdf7V/WMH/JN7QaxT7/OuSQXtxUVppotwU5m8=; b=WHax0LjyaiY2Q45H2EWS1PoeKYSbJM3kvgLcvLdw2XS0k+/6xTMBNsrr2ibYU8vGV81DXn9EmLuS1a1yc/hdMCMUsTZZ8bEhEN6AIMRqZ7RxwcqOj912hUzGk/DhRV6Qygn2SrDdud7YgO0enkyBWyf33El5WFRAWND1Vti0U/M= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5458.eurprd04.prod.outlook.com (20.178.112.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.16; Mon, 22 Jul 2019 01:25:05 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::2023:c0e5:8a63:2e47]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::2023:c0e5:8a63:2e47%5]) with mapi id 15.20.2094.011; Mon, 22 Jul 2019 01:25:05 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH RESEND 12/14] i.MX7ULP: Add CPU revision check for B0 Thread-Index: AQHVQCxKMv3v32bM8E6GxZ36enkwYQ== Date: Mon, 22 Jul 2019 01:25:05 +0000 Message-ID: <20190722013941.30857-12-peng.fan@nxp.com> References: <20190722013941.30857-1-peng.fan@nxp.com> In-Reply-To: <20190722013941.30857-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: HK2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:202::28) 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: 7a353ea6-9684-4757-ebc8-08d70e436d45 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:AM0PR04MB5458; x-ms-traffictypediagnostic: AM0PR04MB5458: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 01068D0A20 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(366004)(376002)(396003)(39860400002)(136003)(189003)(199004)(25786009)(5660300002)(81166006)(66446008)(66946007)(81156014)(66476007)(66556008)(64756008)(50226002)(256004)(14444005)(14454004)(4744005)(86362001)(54906003)(99286004)(110136005)(2501003)(4326008)(1076003)(2906002)(8936002)(316002)(36756003)(6506007)(53936002)(68736007)(3846002)(6116002)(478600001)(71200400001)(71190400001)(52116002)(26005)(186003)(386003)(76176011)(102836004)(476003)(2616005)(11346002)(446003)(7736002)(305945005)(6436002)(8676002)(44832011)(66066001)(486006)(6512007)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5458; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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: NY91XN35ijkQNPIx/tFW2PdCB4zQC26Fdcucw7ys032mSMOsLgD0GY29PmJr6ErG2TTNAxoz4GubYvHyf8Nb/1ZHXbQXNm0Mz48hSZWsEnWF1AaVN7V1wh0TKLaBqweJ9UoG1Pn/mhxEvueTQtqnP3WSitOw0OTIYCJ1M6LI0UlIrR5dHvQ7xm87ysM8VQ1rNbdk6MPumG3oNJkyXZhyXvtneahDSO+WdI8xMdu3mebnD4RRR5aDWQitr7vt7ZItETjJ+J1hAisuy6huUqYkaqgjPCrFX7MkSihROgtnDx7ROtiaaKqCYWi4AmTEfev8A8LhjA1soki+p2pidIVVawucUCy7v6P6uJLkk+ERAsF7h+gPdVSWTgJNFW4zj4Xowd1PfxIYyNu5GOIPQ8MnoRMVZuIWkzn38Kp7VWYvK9E= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a353ea6-9684-4757-ebc8-08d70e436d45 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2019 01:25:05.8529 (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: AM0PR04MB5458 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH RESEND 12/14] i.MX7ULP: Add CPU revision check for B0 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" Since there is no register for CPU revision, we use ROM version to check the A0 or B0 chip. Signed-off-by: Peng Fan --- arch/arm/mach-imx/mx7ulp/soc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index 7119ee4a07..6c53aa106e 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -18,10 +18,13 @@ struct imx_sec_config_fuse_t const imx_sec_config_fuse = { }; #endif +#define ROM_VERSION_ADDR 0x80 u32 get_cpu_rev(void) { - /* Temporally hard code the CPU rev to 0x73, rev 1.0. Fix it later */ - return (MXC_CPU_MX7ULP << 12) | (1 << 4); + /* Check the ROM version for cpu revision */ + u32 rom_version = readl((void __iomem *)ROM_VERSION_ADDR); + + return (MXC_CPU_MX7ULP << 12) | (rom_version & 0xFF); } #ifdef CONFIG_REVISION_TAG