From patchwork Mon May 29 03:37:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 13258019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F1EFC77B7C for ; Mon, 29 May 2023 03:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yWv3A3waLoDZgxbIUrmF3ZIoDBKejjTe1OI4FuYyukI=; b=Lrhi33PVCdur9c 3ErsszCMUo7eUf2Mhe1gSOAzoQ2J2ghj7GLoqH+rnRaWnLHOPLXJnUrkwVy0+netmSJsLgD/3fV8R 5ZVqbtU2V6dfP+/BPHJtkUBL5cW+y1Scm4c5s7mYp+uHI4ALFmCvqb5TzbiwF5HwE7IWoa4uJ9b92 XpTzS4RGqqDZuNX+8WC5nk3komIxc6OjrUgxER0elWoWvoq/+FX3/aoSf3dKguRnb5+uF3w1eJZSX 9kbLJzGTk6l6oWonPDdwBqxvTVVwA7t4+yP+B/Zvpv3Bg9FGBqz0hVQL0dexmvQEcDxmfy+2gMh0S o1JQWHr00NWPOMkGZnAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q3Tce-008yhn-1f; Mon, 29 May 2023 03:32:40 +0000 Received: from mail-he1eur01on0601.outbound.protection.outlook.com ([2a01:111:f400:fe1e::601] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q3TcV-008yfI-0e for linux-arm-kernel@lists.infradead.org; Mon, 29 May 2023 03:32:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KMvA4sg1yKnONkOUfHdpTSxnB7nZ9YLJlvByPAWto02UEykyHdu2q586lymRWhvhmXRm9zVsM0rifi8iDQ6NuZlH9A+iqJ0p0aaaed18YuTsyDp33UE6qm83f84ciV+2dzqtgDKtdPTJH9BODbWR8ecDknp8ECr0ZXFRO05p+4JzIaZ2Asls111/IcWTMnDArfftoKcpiBsGCn8M5+lp2/WWX3zaTulegjPvujsxnlcGEc1qwaxM7OQ1nlTaAmFSv8tuwnlA1CeW5IHIGzy7prsPbyoG0s1p5+4OFjx08wRTf+ofxTeG60Pu0ifGrIUN4XQL7pRpj8ckNJODReYtiA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WygF8UKVBDOhjT69LiO0Nj23hx2TT7EIU3V9qalOWNU=; b=E/BZ7gnrG+bDMT68RKYRdd3JsMaZan0Xax8adWcl7RKg0wjhQ9QnVwpC25ctTOoinn6ihfB0F6OjGQJbOO65U9HvolrcSCnnHH/aZPAzJ5cUn83JbCmJGzH1IQrBpxzneRFJW+LkjmZLfOI2T97p8pVIwqapKxHRQu7tKfgymJmGShH0rZwnnNo31cu90av3GS6DrCWoAFTTaBxGop0I8OmWPdiblMcY6XJ0Wk7Kul+vENAT5sDyAYXBdzPXbnvVxuH15q5XjYxcTtEoY32lNy5aHEUmJ4L6V/CI9iHqWMhenRMaUXuprggZ+4fHo4DpvyWhd5BYuu9MsOVUCCo8nw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WygF8UKVBDOhjT69LiO0Nj23hx2TT7EIU3V9qalOWNU=; b=RompO3PAvnkWE5hSNEYYBYTRuD6Q24k1tWufg6DBX/JEmGb4ZSFLlIryXgi8dM8tPML8azaLik++fbujlW0umLt8cWKBCX+vVz4U4F05IRAagG/ErWP/ICDjN+NARgAWIFq2TCzP/2kxQO3RYPumGpoM097PmwsgXQ+yI7bXfXU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AS8PR04MB9062.eurprd04.prod.outlook.com (2603:10a6:20b:445::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 03:32:22 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::b999:f2c6:a8cc:7b4]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::b999:f2c6:a8cc:7b4%7]) with mapi id 15.20.6433.020; Mon, 29 May 2023 03:32:22 +0000 From: "Peng Fan (OSS)" To: shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Peng Fan Subject: [PATCH V4 2/2] soc: imx: support i.MX93 soc device Date: Mon, 29 May 2023 11:37:10 +0800 Message-Id: <20230529033710.4098568-2-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230529033710.4098568-1-peng.fan@oss.nxp.com> References: <20230529033710.4098568-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0033.apcprd01.prod.exchangelabs.com (2603:1096:4:192::23) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|AS8PR04MB9062:EE_ X-MS-Office365-Filtering-Correlation-Id: 97949180-f691-421f-bd6d-08db5ff55087 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d8YwaAWaamd337L0C+RvKXMN3ojjQ1JhH4GhBmec4yN1XZqMiuDUdOSL6mXN1hNfBWo9MtCK6cs5fJW4AC8yROfi3BDO2ys81geaL6kJVF/20NL/ZRsZbGPrQsYrYVwb+t6ulz7nWEPHYSZERK/uMQuGv3wTJfJ9FUkLHi3L+B1wj8Vk+P2PE8IO8KzR65CvlrR7mQERX3j4Wuj1ra6qiSo/U2Jy+LHkG49atQ9SSMZ28l+4hpRr87dl5C1IOS9Su1fQJ/zIVAOH6wDhLiOEZ4GoqXhpkKm09DBv5l9OWMDz2dh4aL4TKcmZ6v986vL40BpE2lVKna+T1cN34pKmXqco+1/Ck2DtVzgYOGnaXpRBluUK3U0K3UgTPDJsDCrrzn0V1BtCtJM9G2yOMS0Fdr2Cmtl6HtxGjXSbAAFfzjdK+05j7fJ3DrLTJ4bKWs3iUx7Wc9m0Sc1SMBNIt92isjsSQKnh1gNgV+Dbu1uKwWgt6uGGaEIz1zvhqxB2QL81GlBw4O6lv5ZP+7LU0IPTQdEF1Lj4yQauosf43UqhQ89QQ+HWQzgoDZOd6ImGLZGB+wdL6u8yMYRMZkXtg3+fevv8RUkZg0g5p8WAbhsJXi2bDdf7F+m0jOg9Ejd9FhcS X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199021)(66946007)(4326008)(66556008)(66476007)(83380400001)(5660300002)(86362001)(52116002)(38350700002)(41300700001)(38100700002)(186003)(2616005)(8936002)(8676002)(6486002)(2906002)(6512007)(6666004)(6506007)(316002)(26005)(1076003)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ysjKQJU8q9uPlzeTU6jgzMi8nrHrb3rV+I/8+X4t2eKl9ILXWFyeoS5yLj6+5njYQq3vjgPsPODlcJ1pOo6KPt6i3D1OIaPpzG3d31BYCSaz2FANJoke1ll3VaJESUBx6UdSkEfAP7X2N+r+dAlhHfORghajr25NZyzk7fKc/+5mHqUuXA4doGfMZD22QvrtSLHmQMwGljxlPK+XdKTsIXD3WvnJuvAgo5JfrMsglY7CJk+/rldDquKLiT6ddyj/tvsW7ggL8hl2ET4tSIMYa28yHR7akDNDcdA9vZqSurSpxd6kzsWVuC2GS0JtZbtjVam2LS0B1XtqgZnk4VqpOtVjWJQwSHfltCcq+YXXG8H7s3+Ytaa8h5srwE5MjeueE2O6S8yhAgWZri2EeGsuMNpPtNvWMb9Mpk75ksz3oJf21/qIyMF41lBO7X67G4hg476bgoH7NjLTHYfQFfC7q3vYOwHKv3s6nai1bCRf0Hyl0RZ0rrCaO8nC13KAisPnEpvsguWez1VLWVJDOHwvTcUc0CuXwTnQttUgfTqaoBgLpukVS0hYCnlbUNpcV3kf/EMEwykObESG2z0YNwhcHKGmnedCbS9v/5RjzJ3n77IQOKLNr9KXf0qxq+VajOAtK2UNGyV+6ifVz30OE7OTlDyQab8ZgBOb1oQMRlW+FS5P8g09h4xlkIObY0Rrj+Y5Tlb5qIe+Gm6uYru5DXdckf9gYCE1b1JxJrQOYjVqIhKrO+BAtvtpXrsB2lh2lzPT8IP0ImrPhaS3SUgUCXDBVLoZBPicaDtk3F810U/ga9UTPf4bN6iMXcuKJIlvHW6zigDfQEg4ePdx4kA7ROUICFXsaxWNEm/rDBxv69KToVsY674J8RWJaCytDr5EI2nan6jSeltvm7LYJIjiGk3weXkaVjXa3/ePGQk4DXqSZXUH/Ub0RJ57P8KRk5/lFrSRvQBqFDrdXQR0zrabssMuzStFq4y5JRh56cBKIYWlAZ0lMeHHKiJZPgwbhtTv4IVTnGUEsyiNt8kObURuDZgjxEiV8XdZ/rzH3X/C9Vx9WlLFMgk0UbP8ro27DIGXnVQ+rQTZpRk6Zvx2OHlQ0LuVVeEqlxxad/gIymJnza91Nd4Y6eX2/nsHdit0/F2wWgXhq1+JTo+w4f0AbqNOkgM1ewDeLd5oxLLrAbpotmVwCyoG9604H2CkepHvmql68zP/uT2oeqf5jsUl7FE8uX2leUOq48XRXZRHwnIaLeVwcCuhmgMoj3sXJeT183JVHfxjsFpJSKu4UWg6youivzL+BsO9IFjlK5UBGKGdbKzOhkqALIxhSGY379PnVhKu8sP2/4rTRbA+RTTtpDx7SpkrHpDRGq1zjqY9VR8VLMlg4HDSTbtmjzsg8Y4t2DlpLAH7wUooYtvRYVnMRaCh7SfaeAdNGkR54unyOZOyy86LLn6OzybNd2ByNu4Akyad6/E2MymFTHMIf/9/hcrrpXTvIZ39mXbGmi13g19IuWsEnKNJ8Q6vXMb3a/9Kz8dvS7CCguhGmmo+2UTz4FFCDRdJroYxbl7E4pnl2mBF20NLp4Ob+iKOF5cM6YDMEUjxw13t X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97949180-f691-421f-bd6d-08db5ff55087 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 03:32:22.8120 (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: o7ADwiLtEjyoHc3b+B2ZLCHWCS7vDlvSqWutno5fXV9bDMhNkhUMtURBE1ofBmUNXkFPad/QhKPKLiMuHE3JDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9062 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230528_203231_240497_BA94828A X-CRM114-Status: GOOD ( 16.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peng Fan i.MX93 Device Unique ID(UID) is in eFuse that could be read through OCOTP Fuse Shadow Block. i.MX93 UID is 128 bits long. The overall logic is similar as i.MX8M, so reuse soc-imx8m driver for i.MX93. Signed-off-by: Peng Fan --- V4: With patch 1 included, the soc_uid_h moved to patch 1 V3: Update commit log Drop uneeded {} V2: The ocotp yaml has got R-b from DT maintainer drivers/soc/imx/Makefile | 2 +- drivers/soc/imx/soc-imx8m.c | 57 ++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile index a28c44a1f16a..83aff181ae51 100644 --- a/drivers/soc/imx/Makefile +++ b/drivers/soc/imx/Makefile @@ -7,5 +7,5 @@ obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o obj-$(CONFIG_IMX8M_BLK_CTRL) += imx8m-blk-ctrl.o obj-$(CONFIG_IMX8M_BLK_CTRL) += imx8mp-blk-ctrl.o -obj-$(CONFIG_SOC_IMX9) += imx93-src.o imx93-pd.o +obj-$(CONFIG_SOC_IMX9) += soc-imx8m.o imx93-src.o imx93-pd.o obj-$(CONFIG_IMX9_BLK_CTRL) += imx93-blk-ctrl.o diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index be26bbdac9fa..cca207b90110 100644 --- a/drivers/soc/imx/soc-imx8m.c +++ b/drivers/soc/imx/soc-imx8m.c @@ -26,8 +26,11 @@ #define IMX8MP_OCOTP_UID_OFFSET 0x10 #define IMX8MP_OCOTP_UID_HIGH 0xE00 +#define IMX93_OCOTP_UID_OFFSET 0x80c0 + /* Same as ANADIG_DIGPROG_IMX7D */ #define ANADIG_DIGPROG_IMX8MM 0x800 +#define ANADIG_DIGPROG_IMX93 0x800 struct imx8_soc_data { char *name; @@ -149,6 +152,53 @@ static u32 __init imx8mm_soc_revision(void) return rev; } +static void __init imx93_soc_uid(void) +{ + void __iomem *ocotp_base; + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, "fsl,imx93-ocotp"); + if (!np) + return; + + ocotp_base = of_iomap(np, 0); + WARN_ON(!ocotp_base); + + soc_uid = readl_relaxed(ocotp_base + IMX93_OCOTP_UID_OFFSET + 0x8); + soc_uid <<= 32; + soc_uid |= readl_relaxed(ocotp_base + IMX93_OCOTP_UID_OFFSET + 0xC); + + soc_uid_h = readl_relaxed(ocotp_base + IMX93_OCOTP_UID_OFFSET + 0x0); + soc_uid_h <<= 32; + soc_uid_h |= readl_relaxed(ocotp_base + IMX93_OCOTP_UID_OFFSET + 0x4); + + iounmap(ocotp_base); + of_node_put(np); +} + +static u32 __init imx93_soc_revision(void) +{ + struct device_node *np; + void __iomem *anatop_base; + u32 rev; + + np = of_find_compatible_node(NULL, NULL, "fsl,imx93-anatop"); + if (!np) + return 0; + + anatop_base = of_iomap(np, 0); + WARN_ON(!anatop_base); + + rev = readl_relaxed(anatop_base + ANADIG_DIGPROG_IMX93); + + iounmap(anatop_base); + of_node_put(np); + + imx93_soc_uid(); + + return rev; +} + static const struct imx8_soc_data imx8mq_soc_data = { .name = "i.MX8MQ", .soc_revision = imx8mq_soc_revision, @@ -169,11 +219,17 @@ static const struct imx8_soc_data imx8mp_soc_data = { .soc_revision = imx8mm_soc_revision, }; +static const struct imx8_soc_data imx93_soc_data = { + .name = "i.MX93", + .soc_revision = imx93_soc_revision, +}; + static __maybe_unused const struct of_device_id imx8_soc_match[] = { { .compatible = "fsl,imx8mq", .data = &imx8mq_soc_data, }, { .compatible = "fsl,imx8mm", .data = &imx8mm_soc_data, }, { .compatible = "fsl,imx8mn", .data = &imx8mn_soc_data, }, { .compatible = "fsl,imx8mp", .data = &imx8mp_soc_data, }, + { .compatible = "fsl,imx93", .data = &imx93_soc_data, }, { } }; @@ -225,7 +281,6 @@ static int __init imx8_soc_init(void) soc_uid_h, soc_uid); else soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX", soc_uid); - if (!soc_dev_attr->serial_number) { ret = -ENOMEM; goto free_rev;