From patchwork Tue Nov 24 01:59:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Guo X-Patchwork-Id: 331561 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 20E4BC2D0E4 for ; Tue, 24 Nov 2020 02:00:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3BFD2072C for ; Tue, 24 Nov 2020 02:00:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="ZKBjLXzi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726932AbgKXCAD (ORCPT ); Mon, 23 Nov 2020 21:00:03 -0500 Received: from mail-eopbgr70048.outbound.protection.outlook.com ([40.107.7.48]:58572 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726904AbgKXCAC (ORCPT ); Mon, 23 Nov 2020 21:00:02 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EyB9VpU15UBbsei+2bMa+SYk5vjb7KCor3qjZSh23C6UjUFRU/MzV5J+FFtjJgA+/XCn+S0e0hqG2IeTWl4XbmVXMH/5YidABulSNeFCvKyM5uzX+h29/ZdEK+5Wtxdt4gCUqPme2pRlj0jZdGv+Fe6zn5l2x9FKskqklDn2eaT1ru2+6zRQP/lOnQmNZeHi+OJaDiDM7f//NPx5D3XXZhAxqFcYgzyTj3eEgOOJAhWZUOSu7sueUHOuh4yApE+a43VXw+rUQWbozVNcSbCS0DzBNbZ4yZ/7N8B0t5Y9AJ3/iBvczOXgkOtHa6Os8ugsAkDpvguU3ghgaVB05TfL+w== 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=BvrBEwp0KWEfnEV+BosvPVS4dz9eZWKBNU7ttKza4ko=; b=cCNSuKwv4SzMOebFNeBJ+YW63Wdz3+K4mjSlk5PjWj3ynX6XjsWrBMgjHUXd8WLF0uzcpsx9L2KB/5EIGGVOWsv2PLMVMiAHzZ46CFY043UYj1wlJXrIcsBBhprZiTkCADg6OU5x9zPQX2w1HTejS8X2wXeD9KHaoKZRmZ9D83fpoGEm45cwIdbVHj+KdiE7NKQpkpUQGrbIMAi9Kx/B83EJ9D7TnBD507yyXE/TCeapn5w3Ge6FFV4wmGpPdDK5sqVN/GIELVHw5BAAp8fBNHkxSz0+Iet02VKfPTkbTPHVTrjuRMEfJBBtAVReMqVNJwRLCWQXnZy3UO421NoSCA== 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=BvrBEwp0KWEfnEV+BosvPVS4dz9eZWKBNU7ttKza4ko=; b=ZKBjLXziQz1C8J5LT0mhFL9bPLR8Za/EVI/KYIW5l7HSnzy/M4xhnzYnTgT8EyYckMstH0JZpWA13knzTwO9E5HO60DSfVx8WQRulC0L33YQnJayKKQV/IN2bwBrLTSPfROXboZWK7K27RrhZZdJfDZprMVem22oLVSRTPzlI8c= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) by AM7PR04MB7096.eurprd04.prod.outlook.com (2603:10a6:20b:113::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.22; Tue, 24 Nov 2020 01:59:58 +0000 Received: from AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631]) by AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631%7]) with mapi id 15.20.3589.030; Tue, 24 Nov 2020 01:59:58 +0000 From: Alice Guo To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, krzk@kernel.org Cc: linux-imx@nxp.com, peng.fan@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 1/4] dt-bindings: soc: imx8m: add DT Binding doc for soc unique ID Date: Tue, 24 Nov 2020 09:59:46 +0800 Message-Id: <20201124015949.29262-1-alice.guo@nxp.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR04CA0188.apcprd04.prod.outlook.com (2603:1096:4:14::26) To AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from nxf55104-OptiPlex-7060.ap.freescale.net (119.31.174.71) by SG2PR04CA0188.apcprd04.prod.outlook.com (2603:1096:4:14::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Tue, 24 Nov 2020 01:59:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5573adf9-4bb9-46da-c9e7-08d8901ca569 X-MS-TrafficTypeDiagnostic: AM7PR04MB7096: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: el7b0zI9ZdBnaE4ti9xZ58BnPHC+BXUs6UjCsXRwsGqM68MvZFIa7CIJO6f+a0uS9ErnVhQo/NqKixf5vkdGZ+OvMMCa5Rfq6yTPSmnfk8QQqFR3ngW+9Q13w2wWfpEP5kn2YZvxpVXTQ0xeB1F/wK+N9Y2Ng7gNaECKv28YgPC3Fx9RjZjp7jSJbX3UqAkAoaUK8Y0rNEUh4QRYqpSWuI5ZVBtC7GxNXn48LITFl2DD+G5Tg7MxAGRZFQMT6s2kYNoaMzL50Wqg4ADdhejyf7YHa54lucMyQe1ikN16jRoHyYJbHfhpnmguzbv75ixwoqgVNDQcxXm93NFnM6XfwNQVy/UZHZR2izus7IAtRoEHUxV/VaSOP2jCPwAPjEbQ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB6053.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(39860400002)(366004)(136003)(346002)(956004)(478600001)(36756003)(2616005)(6512007)(8936002)(44832011)(4326008)(316002)(6486002)(26005)(8676002)(52116002)(2906002)(6506007)(16526019)(186003)(66476007)(66556008)(6666004)(66946007)(83380400001)(1076003)(86362001)(5660300002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: xJ5nD/wdJyUAgCAdb65xrxlndB3cyPEsPILBJMwOqcTntuM2XiO3vn8PkcZCgVZ95lCZDgkp2ZLKIBdGqJT9D+ZtGlgQkRi7a0TDSiVINUgnQOno+OZkyQ1AmAW2ux9yg9R6p+raNH79QgqF/cIWd7wW5H/KdtwZdsKucfpg/fUDGDqVmCS8uVy9HWlxTYE7pyQOo8NbPRLu49H+XNqQzMO+Q0o0fhUSWdTSWNW1w17KiixaMvD59TfzYH4KEeyx7miep3Swv5QrxGZLWiVCkThd56BDd+O5t3DxkuWqhoZWre2nA79TPqHkTobsqN4MAvo4CVcdIMXZk54ZlwkXy+obfaF/xB0AFV0dZ9Yc9A7XeoVaYnGOeOCxWNoQ9HA0djfgMudk4lVReke31cHJpSlB3xLBI/59ZZFSTyAUIWNrZFwZo7QmxmjnQJHngFzLs4CnPNNa6FQiRqO2y3kDxcAT2wRqp24EFrv4WrCCJa/JdzVmUJcQm++mAHuq8TsKii2Zy5UW0Nt8A8Ns+bU7mCdkB2ACdthWfrprQl+3QaXmkwvF/O5m4M8AswwrdlQX9coRQA4uOL+nRTV6oTi13Pwr9/XNA1LViFww2L5ZEe+k7nNRnAartSZ9CD5IsuGkOYt3OXqx09mxT9GNe8BpD/cGOfbNEVE2hoVv3GbDMSBXb3RGDeEAEgsH95DbaC+AegTAndNGxvE0LD4NrPvqT0e3Y4nVAX/bWr8XZJ2LJtLetFWAWXDrhnOyWDwXCGV1o/QTy8/Gc+lbW54KH/eWASN8lsLJ81/6YTLvTHCkpxC5dA8vxN+e9FdaGAJV7eIRHXXNYM5nsmErKaORMa3bW5SsTz21tw8PhRR7s0VtsDo/aJLZulIwkYKoVoooPh80deIwDwnmgBnHwdNnadgFAg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5573adf9-4bb9-46da-c9e7-08d8901ca569 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2020 01:59:58.3691 (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: nGptwQQFotYxSzpkAsrCtgxzxCWeSBgwkUY6+OQQ1mV2r5H9eTudAdRIi116FEcxydOFJcWGblo/Vi3nD4L3Ww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7096 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add DT Binding doc for the Unique ID of i.MX 8M series. Signed-off-by: Alice Guo --- v2: remove the subject prefix "LF-2571-1" v3: put it into Documentation/devicetree/bindings/arm/fsl.yaml modify the description of nvmem-cells use "make ARCH=arm64 dtbs_check" to test it and fix errors v4: use allOf to limit new version DTS files for i.MX8M to include "fsl,imx8mm/n/p/q-soc", nvmem-cells and nvmem-cells-names v5: correct the error of using allOf v6: none .../devicetree/bindings/arm/fsl.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) -- 2.17.1 diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml index 67980dcef66d..7132ffd41abb 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -918,6 +918,53 @@ properties: - fsl,s32v234-evb # S32V234-EVB2 Customer Evaluation Board - const: fsl,s32v234 + soc: + type: object + properties: + compatible: + oneOf: + - description: new version compatible for i.MX8M SoCs + items: + - enum: + - fsl,imx8mm-soc + - fsl,imx8mn-soc + - fsl,imx8mp-soc + - fsl,imx8mq-soc + - const: simple-bus + + - description: old version compatible for i.MX8M SoCs + items: + - const: simple-bus + +allOf: + - if: + properties: + compatible: + contains: + enum: + - fsl,imx8mm + - fsl,imx8mn + - fsl,imx8mp + - fsl,imx8mq + + then: + patternProperties: + "^soc@[0-9a-f]+$": + properties: + compatible: + items: + - enum: + - fsl,imx8mm-soc + - fsl,imx8mn-soc + - fsl,imx8mp-soc + - fsl,imx8mq-soc + - const: simple-bus + + required: + - compatible + - nvmem-cells + - nvmem-cell-names + additionalProperties: true ... From patchwork Tue Nov 24 01:59:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Guo X-Patchwork-Id: 332535 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 8A5DBC63798 for ; Tue, 24 Nov 2020 02:00:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B0C920782 for ; Tue, 24 Nov 2020 02:00:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="f6Fx5ZKa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727105AbgKXCAU (ORCPT ); Mon, 23 Nov 2020 21:00:20 -0500 Received: from mail-eopbgr70050.outbound.protection.outlook.com ([40.107.7.50]:21627 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726904AbgKXCAU (ORCPT ); Mon, 23 Nov 2020 21:00:20 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QpPIpcr2KxsK/Tetr/mJayBYCVl5FauZPX6IAPmx05ZR9iLI3fAXxHq+fPC2Mz+x51J6X7k5HjLizWBZu7fKhFu8AB5ZCF3immrSwNPR++lVAfmap9MiP4TTOW/OJcqBiiPUcb+udPHDelBPGyM9PUvy0TKQjOJmswGfACov8zcwAmQ1K2qKo7JoIdlLA6NLWWRXD1scRIJSXTG1IZsg7xWbviiBkUwBHNA2nmpxtP8bM/+yCmgwAaDlZZU3rc7CqiWvd4E5LB0OuNUBxeesmbIRpd8JFqV7jSV0AmaMt4ipTT5tSmF6rWokbpv/AATuvu9wOPc3+YjSe/BzCECaAA== 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=c9Z9S3TmKnT4aqTsb1HvO8pMfCKlinWvD2uxKXKkb34=; b=JeDoQJ9z1cSg8PyI+2RYea50yvlkC5vtl6SdOPokknbsMEZt0ZxMIWXd3alSaUGGm1ctMSMeqDfWIQ+pIj2Y3VU9wwu1Og+tZqdLSUZal6iSBlbzqwFNt0qHoMuDgxj+rzjrCibz10zoaD9UIKo71Ec550jxQCsH8thnkiTb0hUH+/8LdCJaP1Gpi8pUHIjCVDJbP2eAVrIYLTD/3fnpxwvtyF5QzRM3BhMhVqywN6fG0XVd42hidC0vmP9hTXEpppFZIiwCx2beiozPXRr4cGUwqaAfpyJ8vTiqU7e9ML4Q56at3Ib/q7nS/cjeqdKwF7RXOXccr7rB+3/VYKwUXw== 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=c9Z9S3TmKnT4aqTsb1HvO8pMfCKlinWvD2uxKXKkb34=; b=f6Fx5ZKa2qEjOP9GDlxB5vjrCRkrdbwGfDLEabrZLxt1/nR8giyPjubKuUm71s8NlHxkE6GrMYF3Z9QsLeu7GgQ7jdTcI1BoEujXMOrFaBY4dJ8d+96qCe0YMwgagSQ8Y08OPbRz3DrbABvVsmKVVp4Tdr+kKTZ65+0IBKHLrnE= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) by AM7PR04MB7096.eurprd04.prod.outlook.com (2603:10a6:20b:113::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.22; Tue, 24 Nov 2020 02:00:16 +0000 Received: from AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631]) by AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631%7]) with mapi id 15.20.3589.030; Tue, 24 Nov 2020 02:00:16 +0000 From: Alice Guo To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, krzk@kernel.org Cc: linux-imx@nxp.com, peng.fan@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 2/4] arm64: dts: imx8m: add SoC ID compatible Date: Tue, 24 Nov 2020 09:59:47 +0800 Message-Id: <20201124015949.29262-2-alice.guo@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201124015949.29262-1-alice.guo@nxp.com> References: <20201124015949.29262-1-alice.guo@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR04CA0188.apcprd04.prod.outlook.com (2603:1096:4:14::26) To AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from nxf55104-OptiPlex-7060.ap.freescale.net (119.31.174.71) by SG2PR04CA0188.apcprd04.prod.outlook.com (2603:1096:4:14::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Tue, 24 Nov 2020 02:00:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b22df386-734e-4816-df9a-08d8901cafe4 X-MS-TrafficTypeDiagnostic: AM7PR04MB7096: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:361; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7xbsoEhcR75W5FPfOTe8WOf0s69tRRIM88T/3GcKLypNvCLG4uPdmbWYrwiJ/7cxrviPO+gIwAsG0LSKSizWj7H/BeSlrcXQQj1ejWdLV985qTvvHQ9dNmiHQpXuT1W/7+3m9HkIJ7zQ5uQhgEwoAUV/r1SdJveI+GEbO11L8SURL4whNgKk9OMqZAMRhp/U8irQwfihvDq0jVSxoKPeSp8ca6P9cGxQ9z7FACI94DN3mEOaml8NhpwSa14HzbDkS9YGO+lueNFHbNoEk4zmZGcB+RnZpnkm/Ie6E1TwRea/x0ranMM6KBZ5Hc0sn9ioK06NI5fQ5vuuJnVOlnKZExQWtmPkk/V+XLvEvEe9cLqZLg2L2YcPZHZ6+dWtnkPP X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB6053.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(39860400002)(366004)(136003)(346002)(956004)(478600001)(36756003)(2616005)(6512007)(8936002)(44832011)(4326008)(316002)(6486002)(26005)(8676002)(52116002)(2906002)(6506007)(16526019)(186003)(66476007)(66556008)(6666004)(66946007)(83380400001)(1076003)(86362001)(5660300002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: J13Jq+owMK0VaaAFU3T0R2LUkwQormYwrWHhaPxH0NXnLaIHZ1sgcD1GHD8sWScdJCQzw+FMOJBYcWXIfnqMZigtuy2apytZhA4T0+1w2R0SyhSf5RnYEkSmxKy//FxPF9U9RsMbkyInDHeqhWaDX0dgR0xYCPo+i1+t2dF1kJVxhvbeLhT69sQXa/viP6zQUHDQFW0SNL0xyyrEe/YAEloqqbn3i1T/z6C8J5AtlEn7yivDl2bZ49zV7IDnb0CAJmyG+Xbsd91MbK5maxvMIQwwvwGXGPHUsbZiM8WHMXe/+6K2rnw1j6C+Ky2YZ7Wlc9nWdmfMT/haSPh+d8cX+GmqlX8+ZASYTopBFmhzuFJ0UTM/RYWWVBgdySDdQiD/ydkgSuzMGtPcpzmGFyKtl+SgxBZamxMHkBQm5BYLlXdHZpYhSci7t4KMI9aBAMZ1ORkUaPXrumbz02V2k/PeB1SpOSYdAdH57zwglJkU1179XfAE5UqQOaZkVWb1UrtHlz5qmBZzShmaC/UsJo9/4KLH2blKf6m3y0m+eQoNUTenjbQ5nZcyLS9NZjOrVn4zykeh2crQb8yC7DkdCW/pwotoXk9+dSD5mLl3XjE4SLXzy9HSHs4ZZqYPrTzgTpLKZBRZiwRbIg1CB1dPAWlmC/3tQqpk/RgPyzvKkHtCRwB8OkgCe+Mdbx6ev4R9B2bHFEEo21XtYe0r/JnKzqjxz+0+MB7ytF0EpVHS4lNMBYq3rvmcMKbFM+Vo3W1fZ6pLgK2Cpf2rwIinEY7LQzicRDBVaVSkRkBrNDFZCZgE4SMIsPvBuIlB4NykWw9EbAE7IrqlcMGr/K8ggNK40rVvnWu4pCKZJUCBpVBW8HRYZ0ihv+Xza09RzFwLm3R7xrUrmlgRusDK96Z6mwpXbQR4tg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b22df386-734e-4816-df9a-08d8901cafe4 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2020 02:00:16.1708 (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: nDeuF9pfC1SpGm5A0CfpXQeqT5he0+I3uSPcXkjPAhwy/Xfr8TvZJO2uHK0DoxyLT/QmFlPw2R///udEeiZITA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7096 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add compatible string to .dtsi files for binding of imx8_soc_info and device. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Alice Guo --- v2: remove the subject prefix "LF-2571-2" v3: none v4: change subject and commit message, add Reviewed-by v5: none v6: leave only the changelog under '---' arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index c824f2615fe8..d457ce815e68 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -257,7 +257,7 @@ }; soc@0 { - compatible = "simple-bus"; + compatible = "fsl,imx8mm-soc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x0 0x0 0x3e000000>; diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi index a06d2a6268e6..6d3a809a00fd 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi @@ -241,7 +241,7 @@ }; soc@0 { - compatible = "simple-bus"; + compatible = "fsl,imx8mn-soc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x0 0x0 0x3e000000>; diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index ecccfbb4f5ad..ec6ac523ecfc 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -218,7 +218,7 @@ }; soc@0 { - compatible = "simple-bus"; + compatible = "fsl,imx8mp-soc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x0 0x0 0x3e000000>; diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi index a841a023e8e0..9b6d9307e5d7 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi @@ -286,7 +286,7 @@ }; soc@0 { - compatible = "simple-bus"; + compatible = "fsl,imx8mq-soc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x0 0x0 0x3e000000>; From patchwork Tue Nov 24 01:59:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Guo X-Patchwork-Id: 331560 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 38C85C2D0E4 for ; Tue, 24 Nov 2020 02:00:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B62BE20757 for ; Tue, 24 Nov 2020 02:00:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="VSjh19U0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727238AbgKXCA2 (ORCPT ); Mon, 23 Nov 2020 21:00:28 -0500 Received: from mail-eopbgr70084.outbound.protection.outlook.com ([40.107.7.84]:15847 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727085AbgKXCA1 (ORCPT ); Mon, 23 Nov 2020 21:00:27 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U0l02CfD4JAwnG4K9ydKwHH+ZWhbVuttHEf9CAT1iYICxKVZd6s+9tf95975Jv5Y75uQlXh56BSWwVaL1wOeWEjQCjsCsvvOkLdTVQp2FOorhDH4EJ/5yVfVRh8HoX9wAKpwNgC5xqfRRICUmMBvZxLv1m6qxAuYvr4UOWN1GmbsYhGbSwJG0KNU+DtrpqhVwpgn2Nj/ijSrmzp8xQIy09SN3reCWmAGiAyH7J0na5BGuRAHdnZa2waeNVWf+aXPk52UFBMTh1DEo4Zd7+0Fhtijwm/ltfH+xPFpOtkGkJyQy+okJ0ZwBOeyqNzbQ5sS9YE3XwJCepTHQnYQQu4ycg== 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=egt9ps5zJYj69R/JhIJ1+pNjwTYTSQ8Gsv9w7u92muw=; b=aBYtlCg0s/7/z5BfDMELrnLgbEOKKvm6jMiDegqZlhlrappb/lpdkLDmn5rElnAUykEBXM6pVUHI+g5ibkk5AjN3cg8WQLYdHm0OPoGv7z1vYQ6l9zLD8yrV/m2tJYspRsWU3/bXmVBug2AlR2nBkAptp8HBAJs1P8hq32b3zBPgeyobMbHP7vrpjqdi4tgJcOhj5TwidLHgCHAts6qk3VRM+rbv09vGwjLtFkZ1968cfXbKTq/NGpW/a6XXIu1HF1sr3ZfiwW/4e5TIkxeGMLmhuupV1FmuhRilp1QrsKT4tGJgWVlibPIG++nwlSHNB2XvX0cvHVPlOU5coKf/Ug== 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=egt9ps5zJYj69R/JhIJ1+pNjwTYTSQ8Gsv9w7u92muw=; b=VSjh19U00k8fQa2dS1qs2y0SL5gS4IJ2tX6NZz6FmdLnDt8p7y7LcV6892Qyyk1WAsFaNtcrk+o0fs9qp2P3liS2YpWYtUXLyzwNGXjelJXiljhN6YHtM6385iiEBDpd2ZnvZgNTB2e7Yr9k/jGOkmPSTOlmblCZ1JDIGxlokbk= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) by AM7PR04MB7096.eurprd04.prod.outlook.com (2603:10a6:20b:113::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.22; Tue, 24 Nov 2020 02:00:21 +0000 Received: from AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631]) by AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631%7]) with mapi id 15.20.3589.030; Tue, 24 Nov 2020 02:00:21 +0000 From: Alice Guo To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, krzk@kernel.org Cc: linux-imx@nxp.com, peng.fan@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 3/4] arm64: dts: imx8m: add NVMEM provider and consumer to read soc unique ID Date: Tue, 24 Nov 2020 09:59:48 +0800 Message-Id: <20201124015949.29262-3-alice.guo@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201124015949.29262-1-alice.guo@nxp.com> References: <20201124015949.29262-1-alice.guo@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR04CA0188.apcprd04.prod.outlook.com (2603:1096:4:14::26) To AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from nxf55104-OptiPlex-7060.ap.freescale.net (119.31.174.71) by SG2PR04CA0188.apcprd04.prod.outlook.com (2603:1096:4:14::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Tue, 24 Nov 2020 02:00:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 64668bf6-a04b-446c-f409-08d8901cb30e X-MS-TrafficTypeDiagnostic: AM7PR04MB7096: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:506; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MkS6SNejLspIC1wWcPHPLCu9q1CK/u+AhXlkSQP+BsIlpgDXwHkGeXOkIq1nJl5m0u4BR8B5U72leP7JuOQrIY7F0kjbYhgJOO6CnQ3xpnL7321L1HtZR5HeSD5XcAbmqtFA5hrtc2frEwj6Tu/dmVTsVw+qqGzbV+CW7/RWYX2OOUZnyr+pTOkYgfqBeUYQbsOlUf162XIgxZmUzTG4+l65+0V+S2+1Z2tT/+KVfataU8NuW5L00Ep6apMGWRiTNQwvhnEJXzU3tEekZ+tdHlSyPl0EYqJO8JifX7WeDitxgWWSSTrNgm8aRTNvrcy6YflyXTV/9EDxYIwY2y073NQZZQw6ccaaLhDzXF25Oaqxh7WDUzI4pYaOo4+X+HVt X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB6053.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(39860400002)(366004)(136003)(346002)(956004)(478600001)(36756003)(2616005)(6512007)(8936002)(44832011)(4326008)(316002)(6486002)(26005)(8676002)(52116002)(2906002)(6506007)(16526019)(186003)(66476007)(66556008)(6666004)(66946007)(83380400001)(1076003)(86362001)(5660300002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: P0unwneWcSB7Y1A3WFydS36YThYLS9LTd14UXELauaolko43u8A1yNmtq+Idl88hFZQnQ6o1YURRvWiPtLWakZOiH6KU/OIPPhFIoOFFeCWUPtZEQrtLTM8EoyQq4mXGs5evTi+YqOtK/9SjQa66R16F3FfkgbIDpyp1ErY0aWf38rKUsu5xsZTVB8bJNbmtfpkbjzK/YkGkBGN1FylM9vrHSDgslc3UBhlcW7/Go4S6pGGjffJ/qS+d2XAgiMnUHQxUnSXy+/gWTkei0nlXa7aZTCux5FJWYMPOG3qa08THyNc3ItYSy3ywQ89sddSD3ASxuKERwmekVjZcjwHjNQWu9Rj+3ikX0KgNsSV+5LuTiufyL8HYDafaL/Gz6gSlrU8+vT7LJReuqb5ralDsup/DypNoDmGE3LD+JXiSB3Tz8FQj1/+cFugtZ3duxOkkpCWbLv+KWYiiAgrp+oTjwlrngld3CU1ruVuIQOoRWr8MRhUe4N8ZktnRUBMY4rUdPA9otGPhsOgakn/uX9ZkPkPjRg+gVx4ycW/7loY96/5HG+vxb1hEJW3MB3sHJlR7OLUY8Qca3bRM0FqOt82BA+RPoydVR2zKhSruYDySBpc88PFtutp2Q/XMkx7T5E/qjRyPYZjLd8TxPALnffXsgNudkd42e7fT1buZEd3Dm1jI8Z4CiigzYQQRXk8FitHN9MjxdvkPaUbDV1VYDZt1GqGGfGj5d1Kab3h8atwW3u/QVSA3dpX42qKE76UkuCpUlW4giiEYMD1AHWmCejPE2GogEI/3yRLjpls0D3okhL0z56h3LCxRY5Cvtl6kNYwCgWqRCvq7nFImqBDsKNg+IzVs3TDkVNkQjBFbu38hBB8NUQmICMPkY5+/1UhzXAkelqtGRIXizgFIzmlLaOM++A== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64668bf6-a04b-446c-f409-08d8901cb30e X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2020 02:00:21.3689 (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: d/m9b/vtitOI/AMZmQwdIOUypMaZLbbUuSkUAqmV5L65pAgNJ9HinMcOxHFiZnmBgWZdOdPFv9cQt6BtyA+TSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7096 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org In order to be able to use NVMEM APIs to read soc unique ID, add the nvmem data cell and name for nvmem-cells to the "soc" node, and add a nvmem node which provides soc unique ID to efuse@30350000. Signed-off-by: Alice Guo Reviewed-by: Krzysztof Kozlowski --- v2: remove the subject prefix "LF-2571-3" v3: convert register addresses and sizes to hex v4: delete "stuff" in subject and commit message, add detailed description v5: change underscore of device node to hyphen v6: none arch/arm64/boot/dts/freescale/imx8mm.dtsi | 6 ++++++ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 ++++++ arch/arm64/boot/dts/freescale/imx8mp.dtsi | 6 ++++++ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 6 ++++++ 4 files changed, 24 insertions(+) -- 2.17.1 diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index d457ce815e68..9bee6f1889a4 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -261,6 +261,8 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x0 0x0 0x3e000000>; + nvmem-cells = <&imx8mm_uid>; + nvmem-cell-names = "soc_unique_id"; aips1: bus@30000000 { compatible = "fsl,aips-bus", "simple-bus"; @@ -518,6 +520,10 @@ #address-cells = <1>; #size-cells = <1>; + imx8mm_uid: unique-id@410 { + reg = <0x4 0x8>; + }; + cpu_speed_grade: speed-grade@10 { reg = <0x10 4>; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi index 6d3a809a00fd..2edfde1119b8 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi @@ -245,6 +245,8 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x0 0x0 0x3e000000>; + nvmem-cells = <&imx8mn_uid>; + nvmem-cell-names = "soc_unique_id"; aips1: bus@30000000 { compatible = "fsl,aips-bus", "simple-bus"; @@ -388,6 +390,10 @@ #address-cells = <1>; #size-cells = <1>; + imx8mn_uid: unique-id@410 { + reg = <0x4 0x8>; + }; + cpu_speed_grade: speed-grade@10 { reg = <0x10 4>; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index ec6ac523ecfc..9401e92f1c84 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -222,6 +222,8 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x0 0x0 0x3e000000>; + nvmem-cells = <&imx8mp_uid>; + nvmem-cell-names = "soc_unique_id"; aips1: bus@30000000 { compatible = "fsl,aips-bus", "simple-bus"; @@ -328,6 +330,10 @@ #address-cells = <1>; #size-cells = <1>; + imx8mp_uid: unique-id@420 { + reg = <0x8 0x8>; + }; + cpu_speed_grade: speed-grade@10 { reg = <0x10 4>; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi index 9b6d9307e5d7..a2a885f1a07a 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi @@ -291,6 +291,8 @@ #size-cells = <1>; ranges = <0x0 0x0 0x0 0x3e000000>; dma-ranges = <0x40000000 0x0 0x40000000 0xc0000000>; + nvmem-cells = <&imx8mq_uid>; + nvmem-cell-names = "soc_unique_id"; bus@30000000 { /* AIPS1 */ compatible = "fsl,aips-bus", "simple-bus"; @@ -555,6 +557,10 @@ #address-cells = <1>; #size-cells = <1>; + imx8mq_uid: soc-uid@410 { + reg = <0x4 0x8>; + }; + cpu_speed_grade: speed-grade@10 { reg = <0x10 4>; }; From patchwork Tue Nov 24 01:59:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Guo X-Patchwork-Id: 332534 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 19DA4C6379D for ; Tue, 24 Nov 2020 02:00:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC4ED2072C for ; Tue, 24 Nov 2020 02:00:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="OpvH8niN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727454AbgKXCAf (ORCPT ); Mon, 23 Nov 2020 21:00:35 -0500 Received: from mail-eopbgr70084.outbound.protection.outlook.com ([40.107.7.84]:15847 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727245AbgKXCAa (ORCPT ); Mon, 23 Nov 2020 21:00:30 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dgM8i+tltWh1t9x0uaftt2H2wNRi+LEhq+C/DNDjfLzEbpkjz8yABd06uLOflE2JYBpabBSGnFYJzUH3Rqyb087sgGIdLBNMQuU1IvfWhlZRYZuKoUwXH3pTiCkQh8CNQ0t5e4eXQbUkh36tNvwuTVzxoYhThs2vsLEVov1BKIn/4srF1bsoKUvMrwfjv/qOClttgJPfjW2M4U9Bz3fFC2y5Xar0dmvcrvPAE9oX3fccdsj06nvcFb39hloqKi1sFCIvOICARICu0XNv5w2+cR+adTIhy/u1b7lOGtlm0uBXqlCM9BI0cQMivlGiFJugJ6MzcenP/VtKNfC53WHKSA== 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=5AxtkdrpXUMLQd7xPH7F8Y8AeaEot2qD1hnm8JRbVec=; b=FsmjdyV3INWLvF8xmLOKaNcN2CFm12i5gexoIPhcO+TuNMs59bYDUgn4S3xPm6hL0k+7DvPXBBEMlguiBg/wM9+5UxY13iGBVvDOoi29QaSIyuWFYsKyLIzuCxfBPZJR5YPzo5bxjrWJCuDloGcGWopYP8R7+8WWkAONUqIEJn4t5wWqo26UqZrXRbaLiTQJCL0dGNK4jqT4AwQ/67LKEuk9Bj4+8IDBugZA41tLepp2qNgqrwVmwWDyVaNhoHarOs07oplf4fMPOGHnB+hyGHB/1FbXkf6zPZ0a5RlVQ2DAfhFJQAcyi0z9A5uRtxSyC8ZVaoPYoLJkvFzHx5pVTQ== 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=5AxtkdrpXUMLQd7xPH7F8Y8AeaEot2qD1hnm8JRbVec=; b=OpvH8niNtkupR22lhM5G4aRo5HLqxc0YZDV9KEm6TEYlgrcD7wH9URv0pwbkou78dVTHl5D9RR1c5Dd8DIFiGYEfkG1pnKLonJDxEz2uCZ8rGZoLgf4BTjIT5t2RDpU1+M619RPjjI90HJSGfhWTYbpP7AlmbdOBJ0S1APHZ9NE= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) by AM7PR04MB7096.eurprd04.prod.outlook.com (2603:10a6:20b:113::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.22; Tue, 24 Nov 2020 02:00:25 +0000 Received: from AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631]) by AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631%7]) with mapi id 15.20.3589.030; Tue, 24 Nov 2020 02:00:25 +0000 From: Alice Guo To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, krzk@kernel.org Cc: linux-imx@nxp.com, peng.fan@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 4/4] soc: imx8m: change to use platform driver Date: Tue, 24 Nov 2020 09:59:49 +0800 Message-Id: <20201124015949.29262-4-alice.guo@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201124015949.29262-1-alice.guo@nxp.com> References: <20201124015949.29262-1-alice.guo@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR04CA0188.apcprd04.prod.outlook.com (2603:1096:4:14::26) To AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from nxf55104-OptiPlex-7060.ap.freescale.net (119.31.174.71) by SG2PR04CA0188.apcprd04.prod.outlook.com (2603:1096:4:14::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Tue, 24 Nov 2020 02:00:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 376f0762-f2dc-4d4b-1da0-08d8901cb5c7 X-MS-TrafficTypeDiagnostic: AM7PR04MB7096: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dAdM/qWviyQjLqSaTFivWJMQUVOR61w3KRx4Jhagr1SM8RvsCDIVOmsw5SAMB3jY8uwtIhERs9WTubVxowLd0m5/WfxkhC7+r/ouNHnFR/ClxykQXO67epQdtK/GhUbcK/In2k5mwURpOFbJ5tE6Dd+QWtlk4pZxFIl8kLdXR+b/4Tt4npb1ozlWBZdhQcs93LAaEYQSwytz7iU6GawnbSsRUbLLVY7JwipAooOY0+1bE6BVqzpJMSpSjJipUsd19+/xoMsUeyRJOhTxSFXF8Yn6XvH+4LowUezqPhwGx14Zc8htdrOvUpkgClLyhDx7wq9RgdqSxYxsqAXTWpASf8pIO8lyNETJaa4Rm6OSfywKFyZvAXjwJDwQD964Fptn X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB6053.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(39860400002)(366004)(136003)(346002)(956004)(478600001)(36756003)(2616005)(6512007)(8936002)(44832011)(4326008)(316002)(6486002)(26005)(8676002)(52116002)(2906002)(6506007)(16526019)(186003)(66476007)(66556008)(6666004)(66946007)(83380400001)(1076003)(86362001)(5660300002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: nYPvHTfGU/RcF9pCGzNFwpmsRxzn7VtlgdvDiWPOarqCeaVBGXa7F4FqxCJTneCb/3mO7VwPXzYCVKb070Hl2u7/HIamCHis/lbcziq+pdUjusWWcH1tSx125BN9ZY/noWJZMqid1lH+M9OdCS2rpiENuvYEXEHTv/4mBn0HwATZzFSBXyDiAbHMuHfO/lyuhQWXGsVPN2D5LqLldDxmcPx1Wb/V6DSxNxd4bRyegAGPJhCpbyMwhPiYwQ6MPpUlvxC9Uv2jbjNkKi8XOZuAefQvnR/n/N1T3POaYjeOM3SYQrIp7CddxICKLOT4HtJUvvgKc6jC6dAkUMu7p4fAbXVlO1TZ765bUWUFI5TdoV2WPXyJUtXetPLynz6rt4I5kGAz6EsBYGyHrsaY2mBvEXO+MuP8rL4fLG41HoGkrWu7rWr/3gWpF88dJvQiXziXxP+dkCdERrMdHeRbPKhGM4oUWA2WVfPWnvXB4y6VPNEFLX55hfrsnywXwWQQI1pWJgMMQDLdPJvS01X1Sn60NiVcm6xzm3RsM67otVRT1aWWawR7u6yEspNuc5tQyNjJAidgBBw9DVmfXVEdb4m3oNKSaMCkL5AVSVffq8v9/i3+6Uzc8dGrBHSNxvBpz6ZpKZ3lCqYnPhoXiYcL2WySvctTRrAk/HGrRaV50fwXZkb2SX9fN4jVmr4OHMSGp7i2+Hhp1vnG1EJWn5NB8l6EEa6k3zSH8kVUzSW7n+OOGycFtMFAvRtX5g+Hr5dqDQ0kCampwnurt/D2qiaF8qvm4gXONCt6ByToew4lrXf6H7uvjYKgqL76QSF4iZfDori90J1WxONnEuY+h3uwSOKN/eqxyyPFngFh5FrJ98jt0ypDXWSCTehNSwiiquh7j40cbj0L2XQjH1wMZJG/SvMy3w== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 376f0762-f2dc-4d4b-1da0-08d8901cb5c7 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2020 02:00:25.8293 (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: DkEXgJJ4fznp6b2NmwJWnr9RstNlU/lS7Jl2FrYiPq2fjguI/n0W7FNHgmXRa1m+TFMHOTBNqkLPOeIZcOdMqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7096 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Directly reading ocotp register depends on that bootloader enables ocotp clk, which is not always effective, so change to use nvmem API. Using nvmem API requires to support driver defer probe and thus change soc-imx8m.c to use platform driver. The other reason is that directly reading ocotp register causes kexec kernel hang because the 1st kernel running will disable unused clks after kernel boots up, and then ocotp clk will be disabled even if bootloader enables it. When kexec kernel, ocotp clk needs to be enabled before reading ocotp registers, and nvmem API with platform driver supported can accomplish this. Signed-off-by: Alice Guo Reported-by: kernel test robot --- v2: remove the subject prefix "LF-2571-4" v3: Keep the original way which uses device_initcall to read soc unique ID, and add the other way which uses module_platform_driver and nvmem API, so that it will not break the old version DTBs. v4: delete "__maybe_unused" delete MODULE_DEVICE_TABLE(of, imx8m_soc_match); rename match table, "fsl,imx8mm/n/q/p" is actually a machine compabile and "fsl,imx8mm/n/q/p-soc" is a compabile of soc@0 delete "flag" and change to determine whether the pointer is NULL ues of_find_matching_node_and_match() delete of_match_ptr() v5: add cleanup part "of_node_put" add note to explain that why device_initcall still exists v6: none drivers/soc/imx/soc-imx8m.c | 87 ++++++++++++++++++++++++++++++++----- 1 file changed, 75 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index cc57a384d74d..250530177920 100644 --- a/drivers/soc/imx/soc-imx8m.c +++ b/drivers/soc/imx/soc-imx8m.c @@ -5,6 +5,8 @@ #include #include +#include +#include #include #include #include @@ -29,7 +31,7 @@ struct imx8_soc_data { char *name; - u32 (*soc_revision)(void); + u32 (*soc_revision)(struct device *dev); }; static u64 soc_uid; @@ -50,7 +52,7 @@ static u32 imx8mq_soc_revision_from_atf(void) static inline u32 imx8mq_soc_revision_from_atf(void) { return 0; }; #endif -static u32 __init imx8mq_soc_revision(void) +static u32 __init imx8mq_soc_revision(struct device *dev) { struct device_node *np; void __iomem *ocotp_base; @@ -75,9 +77,20 @@ static u32 __init imx8mq_soc_revision(void) rev = REV_B1; } - soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH); - soc_uid <<= 32; - soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW); + if (dev) { + int ret = 0; + + ret = nvmem_cell_read_u64(dev, "soc_unique_id", &soc_uid); + if (ret) { + iounmap(ocotp_base); + of_node_put(np); + return ret; + } + } else { + soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH); + soc_uid <<= 32; + soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW); + } iounmap(ocotp_base); of_node_put(np); @@ -107,7 +120,7 @@ static void __init imx8mm_soc_uid(void) of_node_put(np); } -static u32 __init imx8mm_soc_revision(void) +static u32 __init imx8mm_soc_revision(struct device *dev) { struct device_node *np; void __iomem *anatop_base; @@ -125,7 +138,15 @@ static u32 __init imx8mm_soc_revision(void) iounmap(anatop_base); of_node_put(np); - imx8mm_soc_uid(); + if (dev) { + int ret = 0; + + ret = nvmem_cell_read_u64(dev, "soc_unique_id", &soc_uid); + if (ret) + return ret; + } else { + imx8mm_soc_uid(); + } return rev; } @@ -150,7 +171,7 @@ static const struct imx8_soc_data imx8mp_soc_data = { .soc_revision = imx8mm_soc_revision, }; -static __maybe_unused const struct of_device_id imx8_soc_match[] = { +static const struct of_device_id imx8_machine_match[] = { { .compatible = "fsl,imx8mq", .data = &imx8mq_soc_data, }, { .compatible = "fsl,imx8mm", .data = &imx8mm_soc_data, }, { .compatible = "fsl,imx8mn", .data = &imx8mn_soc_data, }, @@ -158,12 +179,20 @@ static __maybe_unused const struct of_device_id imx8_soc_match[] = { { } }; +static const struct of_device_id imx8_soc_match[] = { + { .compatible = "fsl,imx8mq-soc", .data = &imx8mq_soc_data, }, + { .compatible = "fsl,imx8mm-soc", .data = &imx8mm_soc_data, }, + { .compatible = "fsl,imx8mn-soc", .data = &imx8mn_soc_data, }, + { .compatible = "fsl,imx8mp-soc", .data = &imx8mp_soc_data, }, + { } +}; + #define imx8_revision(soc_rev) \ soc_rev ? \ kasprintf(GFP_KERNEL, "%d.%d", (soc_rev >> 4) & 0xf, soc_rev & 0xf) : \ "unknown" -static int __init imx8_soc_init(void) +static int imx8_soc_info(struct platform_device *pdev) { struct soc_device_attribute *soc_dev_attr; struct soc_device *soc_dev; @@ -182,7 +211,10 @@ static int __init imx8_soc_init(void) if (ret) goto free_soc; - id = of_match_node(imx8_soc_match, of_root); + if (pdev) + id = of_match_node(imx8_soc_match, pdev->dev.of_node); + else + id = of_match_node(imx8_machine_match, of_root); if (!id) { ret = -ENODEV; goto free_soc; @@ -191,8 +223,16 @@ static int __init imx8_soc_init(void) data = id->data; if (data) { soc_dev_attr->soc_id = data->name; - if (data->soc_revision) - soc_rev = data->soc_revision(); + if (data->soc_revision) { + if (pdev) { + soc_rev = data->soc_revision(&pdev->dev); + ret = soc_rev; + if (ret < 0) + goto free_soc; + } else { + soc_rev = data->soc_revision(NULL); + } + } } soc_dev_attr->revision = imx8_revision(soc_rev); @@ -230,4 +270,27 @@ static int __init imx8_soc_init(void) kfree(soc_dev_attr); return ret; } + +/* Retain device_initcall is for backward compatibility with DTS. */ +static int __init imx8_soc_init(void) +{ + int ret = 0; + + if (of_find_matching_node_and_match(NULL, imx8_soc_match, NULL)) + return 0; + + ret = imx8_soc_info(NULL); + return ret; +} device_initcall(imx8_soc_init); + +static struct platform_driver imx8_soc_info_driver = { + .probe = imx8_soc_info, + .driver = { + .name = "imx8_soc_info", + .of_match_table = imx8_soc_match, + }, +}; + +module_platform_driver(imx8_soc_info_driver); +MODULE_LICENSE("GPL v2");