From patchwork Wed Oct 16 10:24:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1177755 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 (no SPF record) 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="Wq+qwCDl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46tT2J0yK7z9sP7 for ; Wed, 16 Oct 2019 21:25:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D898BC21DD4; Wed, 16 Oct 2019 10:24:28 +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 8A676C21DB6; Wed, 16 Oct 2019 10:24:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9D7A3C21BE5; Wed, 16 Oct 2019 10:24:21 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10053.outbound.protection.outlook.com [40.107.1.53]) by lists.denx.de (Postfix) with ESMTPS id 773AEC21CB6 for ; Wed, 16 Oct 2019 10:24:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EkVATMF8dN7B2YRGrLW9+yip0mWGgWJ9vIsCZgjjTSxJoJvWVXEYUWJobOlGZMIrJxKKICnoeUIYWIxvTF2RNSCY9yJ2av5el9n7RtkfA+k8Yh1UcGUk6GHHpqlA+fk/IzMs+MjuHyeyBYxqk7GtATnAfuTiT2pfiBSGT7Y9CuM58dUUd541JMaeFrlcSlUxaJE4p1xhPZ/D/0DkTRKwGqZDUlQ6v9Ae8KRyxhfBrelXbhSJxlW4dEiW8LzoX7V5m0fpD6D268Lk8cpNbz4EUgzkltGKyAITRht+OpRw/Mvr+zGtQP3cUPcGWSBkJGNHmIKf9gOfAW9VbgMQjAvcHQ== 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=moofRoRe92LghPrxoTY1+2Yp7qTkSUlmY0fsYi31ZEM=; b=fd3XnSrm+/jcsFpBmJlt4EjGqIhpUfR2JbaSefnXC22ZYCGeOCF/Qnblf+8NqD0QavgEtCsGZMcgx8Co9NfAKERYkL0N9j+X9mD84Sj5U0COXPFwl/1ZpJmK4kGWpPc0OryYNOVZ8gMJ9s5lBeNMpY6F+tp0EDNvbdd2Br6zxCotqElR/8WULtq+xq7yZbgYxmPGIaRbVyA0+HMvLOINo/0R0BG5pe29GCereORZKqcGo49UXMSnuPWC7Zptpd1sKTjMlE+UNOUkQAkGjpVT6VIJNIikx4pWXeND8a0HjD7HnBnfelp3G0uX7c7JkkyexmeWpb4YHBW4LzyF+bVTtw== 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=moofRoRe92LghPrxoTY1+2Yp7qTkSUlmY0fsYi31ZEM=; b=Wq+qwCDli/P+Ja9TjNgxJf7PNGLFmjp+UQBUAEGzu/VjdzPeY/tlPv5QhLEgfXFbQoLmcWK6DtUK/zu0paILtA0x4v+X7VOvsXeU5bF7lTctLZ1lmK5T16fK0HhwqC+hEX/OStg1M+n3Nmsho51ILBIo7EqbtbClwrN9QNr3o8A= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5265.eurprd04.prod.outlook.com (20.177.40.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.18; Wed, 16 Oct 2019 10:24:17 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::843c:e722:27cb:74e1]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::843c:e722:27cb:74e1%5]) with mapi id 15.20.2347.021; Wed, 16 Oct 2019 10:24:17 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 01/10] imx8m: imx8mq: get chip rev for B1 revision Thread-Index: AQHVhAvdP08wFp+yqEuuLEZ7r0EEAg== Date: Wed, 16 Oct 2019 10:24:17 +0000 Message-ID: <20191016104133.6978-2-peng.fan@nxp.com> References: <20191016104133.6978-1-peng.fan@nxp.com> In-Reply-To: <20191016104133.6978-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: HK0P153CA0038.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::26) 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: 9a0df127-34f1-422b-4b55-08d75222ffeb x-ms-office365-filtering-ht: Tenant x-ms-traffictypediagnostic: AM0PR04MB5265:|AM0PR04MB5265: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 0192E812EC x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(396003)(366004)(39860400002)(346002)(376002)(136003)(199004)(189003)(44832011)(36756003)(14444005)(6512007)(7736002)(6436002)(66066001)(305945005)(50226002)(110136005)(54906003)(256004)(2501003)(14454004)(478600001)(1076003)(26005)(316002)(6486002)(5660300002)(186003)(66556008)(66946007)(64756008)(6116002)(3846002)(66476007)(446003)(66446008)(71190400001)(2616005)(76176011)(386003)(6506007)(99286004)(476003)(11346002)(86362001)(8676002)(71200400001)(52116002)(25786009)(8936002)(102836004)(486006)(2906002)(4326008)(81156014)(81166006)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5265; 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: BCL:0; x-microsoft-antispam-message-info: 2TiwhSSiR2YHlTrKzAqytmVu0dITDskD2hPunhJUyGoX+Qjg/kFq60qmmyHFaWYtzOovduv7MhUOO80tFjwe7r5uW/hB9vQAJLswFGGed49ybgJ3kNYIuTqav/Hobeb4RSZ3eFTdg0PDHWrbg2NILezoiVTYlCLth1uvbQkE5xHHFWRDzuJfqiVFnAeU+RoYOlYY5CF9Ge3stIXkegMOoF/Fh4CCTu4tqNVLQpfish86XJf7u1wU/sK2myZvJWMaateboxHoPtNb6aYoxdne1FrGMe/Ob53TfOzfeLOUk0CQn+aZTbl5L59PWHFiKq0O7FZtr1uw9GHYfgfKf230VQmXir8qqHx2xykKAg8sI95Xv0jADAVm9q4CnZMjdAIWqvZhCugbD1rQq2543Kfdm6/z2aGujvt6k3G3V2Tqk88= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a0df127-34f1-422b-4b55-08d75222ffeb X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Oct 2019 10:24:17.5008 (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: qYu1qR4CvJFlA/7diDzRBe/l5FwYYByr3S6s+OYdITa+thNRCWHwS763/oTVvnpJ1zSuhQ1jGYs4ifACddPQzw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5265 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH 01/10] imx8m: imx8mq: get chip rev for B1 revision 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" The i.MX8MQ B1 uses OCOTP_HW_OCOTP_READ_FUSE_DATA register for chip id. It returns a magic number 0xff0055aa. update get_cpu_rev to support it, and enable ocotp clock to access ocotp. Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx8m/clock_imx8mq.c | 1 + arch/arm/mach-imx/imx8m/soc.c | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c index feecdb50f6..5c3f780127 100644 --- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c +++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c @@ -804,6 +804,7 @@ int clock_init(void) init_wdog_clk(); clock_enable(CCGR_TSENSOR, 1); + clock_enable(CCGR_OCOTP, 1); return 0; } diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 3e73ca3cca..9a203e4736 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -204,14 +204,21 @@ u32 get_cpu_rev(void) } else { if (reg == CHIP_REV_1_0) { /* - * For B0 chip, the DIGPROG is not updated, still TO1.0. - * we have to check ROM version further + * For B0 chip, the DIGPROG is not updated, + * it is still TO1.0. we have to check ROM + * version or OCOTP_READ_FUSE_DATA. + * 0xff0055aa is magic number for B1. */ - rom_version = readl((void __iomem *)ROM_VERSION_A0); - if (rom_version != CHIP_REV_1_0) { - rom_version = readl((void __iomem *)ROM_VERSION_B0); - if (rom_version >= CHIP_REV_2_0) - reg = CHIP_REV_2_0; + if (readl((void __iomem *)(OCOTP_BASE_ADDR + 0x40)) == 0xff0055aa) { + reg = CHIP_REV_2_1; + } else { + rom_version = + readl((void __iomem *)ROM_VERSION_A0); + if (rom_version != CHIP_REV_1_0) { + rom_version = readl((void __iomem *)ROM_VERSION_B0); + if (rom_version == CHIP_REV_2_0) + reg = CHIP_REV_2_0; + } } } }