From patchwork Wed Oct 21 08:31:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11848537 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 EBA70C4363A for ; Wed, 21 Oct 2020 08:37:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D3B222251 for ; Wed, 21 Oct 2020 08:37:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="HgM41u09" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440530AbgJUIhD (ORCPT ); Wed, 21 Oct 2020 04:37:03 -0400 Received: from mail-eopbgr10067.outbound.protection.outlook.com ([40.107.1.67]:59471 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2408254AbgJUIhC (ORCPT ); Wed, 21 Oct 2020 04:37:02 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AwwyTBMp/hGXORfUxss5AprjyPBBO9bj7ReAt9H44LX5PQebr8wDrVshHsr+JkOujU1JzVVoVPcN0Ixl8w2IDZ2Z7kUVLXfsyEGKCm9kkMKqDaDU/TlfZz+NPBDM7YNpE9K9+yZfU1r1kWWfe3RzsoksCyBowPAB/EibG8PQ+RuO5DcY82DlojyHPT+gUTzVMtB+JRgz7kP7QqqVgEiEIzlgc9nkjo9NGytC9uTSQ1tPt2N+ZYrXRfyy5azd5aMjHxYn3VI0FfscJEXqmzUmlm7xOY7gBfcIj1Mavq0reb70rrTvbaWdT2bZ0Vw8Jj/eHTLUZqDQnnAhIw1ko0OZfA== 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=qAL+RuC6sOBPgmdy9CPtMnJ3C3ef7Wj6C1za3+NDcwY=; b=lDALBHi053GXATIuU076ibhmtvGh6kciIt+7jZZd+pGm7RAzx4ewxywVUdewRN0CveWeBmUK7/yJT9zeIiIvC6YriJiBAYW8b1fu+GZZ6DFJ1lQ0tYmyx83URyzkAz6Z3j8sLUwGXpICn1F/yy9MzpWc3+rzl4rPn0tQO+VAkHxqAAzjO9aAa9hpbyelv3QW9bgK1hkM99WTXqES6H8EjL7+vG6+sx9cE2Vkd86I2gq99DUacnD/MUvS+x96LE7oYZBITp+MPiqyZ0NfYgCjShFgT+DhCNohDPPJO9zlzs3IB1kph1hNzpdkqezHLLRsBbfdnfeTJh6rrnoU8SbgDQ== 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=qAL+RuC6sOBPgmdy9CPtMnJ3C3ef7Wj6C1za3+NDcwY=; b=HgM41u09cLwz1U5XyfrGABKEQCJ8FT7pkSDoTu2Zc67iQCMv45jfxpariXgSDy8PoifMB2FWcZdWdf3XbjaSWK4oMtrcCM6TiSTWj1hWJn5Zf1HdDp6A8xRk4H2ppRXUtmK1giiCGzN4muaeteHwNBbXIpmeJkDEj4aZBJ5ssmU= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0401MB2376.eurprd04.prod.outlook.com (2603:10a6:4:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Wed, 21 Oct 2020 08:36:56 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef%8]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 08:36:56 +0000 From: peng.fan@nxp.com To: sboyd@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, abel.vesa@nxp.com Cc: kernel@pengutronix.de, linux-imx@nxp.com, Anson.Huang@nxp.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, aisheng.dong@nxp.com, Peng Fan Subject: [PATCH 1/5] clk: imx: add imx8m_clk_hw_composite_bus_critical Date: Wed, 21 Oct 2020 16:31:30 +0800 Message-Id: <1603269094-29367-2-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> References: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3499.4 via Frontend Transport; Wed, 21 Oct 2020 08:36:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1aebf226-bcb8-4162-ed27-08d8759c7816 X-MS-TrafficTypeDiagnostic: DB6PR0401MB2376: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:284; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EBeOkBqwil3SAHmh4b75I0kAh+NN5uNGEJuJQsCCnZrjkkhpOBkKEVVSgtxGlrKfuN9OuxU06Ng388jfFzKDdNdCkD6cAv/2aP1kDqKsbWaq4qRBNQNqSPDftKG/mF6B4cS5fm0vvQxd5I3Ctsm9jWIze5f/A+9aRAEm4f2rFfznmWfSwwOXy7BzWAp6Q/7V5b+wwbEBrhnupfeOpDuHDsK4EkyuEX9jmf6hb4s20i6FqeujJQMwqDV0kiZf11Ey/2v3Jf1H28L1DkIrbeH/0GoAx5kT8S3mN6hy0/NkAOfdb8Tcu0MUrPgGKdM4WWYkExVGuU2KJ1lxePGkmNulMyrBlcWXv43rZMvBod82BvQZsz57i/b3KbEnSDAX4xEJ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB6PR0402MB2760.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(39860400002)(136003)(346002)(366004)(69590400008)(956004)(2616005)(16526019)(5660300002)(83380400001)(4744005)(26005)(52116002)(4326008)(6506007)(36756003)(316002)(478600001)(8936002)(66556008)(8676002)(186003)(66946007)(9686003)(6486002)(6666004)(86362001)(66476007)(6512007)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: YR6s1pz4QJgZHuEYp1kYHK0LGm8gwCbxqkxDms+KzKMI8JToOHqZ+1XazW90v23LQS/AkHsuGc5trNw/SB+pS/o0h+P0w4FSwVA+7/usp48p5nhgIRXwOrA54F6ltwrxBNaX8wWueS5FlZuSIvVtxlRIsz/2+/yg2lh5SeuBFJq4YXOO1iuYhWMgbbMIUpIYD4JkWny0nOx0V4qpo77CsrQw00JM9DDanT2fonYHqPIl+ROW978RP7mVxzzpET3GLwB9BOp6MY7iiidfcMlKLydFPQbRWWVGixBxJszEHvLZX9hmrPtv9Y0xNrwALwxcqpKBXGM4Xrdt6cVJh7DWteqdHVQ8GZi1yyThcmzn1jJSYctY/XLRUEmZsnhdmpLzHSeNB7UEwhIS4hILv6Do+3v6Wo8Hl44Wzyezo4t6oPvBKT9FcoyBurIRIg04xxRsjUZk6M4y4ZBFwS61Da0tE0T9/hJPWf1xMF7zuD9kxO4v0ELCtD9op3zsBQmstpYNpOabFNksd09TYXL0DDAsqGrOz8xegz2gUXk96fvaxh/nuzmlODBIjQG8hrvWr1vDAGM9nqTLj8Og7uDEbYejeSpd8YaxFVparJNX+cUQCMYuG9HZDj48yQXbDpv14E2fA5hLLzWkbUTTdhbHO+OxhA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1aebf226-bcb8-4162-ed27-08d8759c7816 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 08:36:56.6629 (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: f8ZEbyCxhUo08mwC08xBYqUbj/dVyXas+4m/CmBizKHuUfdJuqjl4jOk9E/HvcS84KkvvDkzE83AtNME3bNAoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2376 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan Add imx8m_clk_hw_composite_bus_critical for bus critical clock usage. Signed-off-by: Peng Fan --- drivers/clk/imx/clk.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index 3b796b3da249..1d7be0c86538 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -549,6 +549,11 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, IMX_COMPOSITE_BUS, \ CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE) +#define imx8m_clk_hw_composite_bus_critical(name, parent_names, reg) \ + imx8m_clk_hw_composite_flags(name, parent_names, ARRAY_SIZE(parent_names), reg, \ + IMX_COMPOSITE_BUS, \ + CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE | CLK_IS_CRITICAL) + #define imx8m_clk_hw_composite_core(name, parent_names, reg) \ imx8m_clk_hw_composite_flags(name, parent_names, \ ARRAY_SIZE(parent_names), reg, \ From patchwork Wed Oct 21 08:31:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11848541 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 78B87C4363A for ; Wed, 21 Oct 2020 08:37:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1AA1F22251 for ; Wed, 21 Oct 2020 08:37:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="oUO6s51X" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408254AbgJUIhG (ORCPT ); Wed, 21 Oct 2020 04:37:06 -0400 Received: from mail-eopbgr10067.outbound.protection.outlook.com ([40.107.1.67]:59471 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2440607AbgJUIhF (ORCPT ); Wed, 21 Oct 2020 04:37:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B7P4wPR2eZjf/pOd3NNsM5scOHiXUxf/iRsTwvRef7y8M522RAr6hqSqPQm6PEPPop+EMTYn+pjDJi/1ZgFIBMk3ZhVPvrsrS2C4SxhBf42DowOpXPIKUB0l7Y7YQT6WLTe6ozkp/ys9AAu51NvAK8bg7jWMk6Bm+9iBRLEkZMME95Jigb+LbxuGqlyoPUBtpvc6MknoaT8+KoH3gV4P0C1DrYsEKv4DsqGqN+WsPPDLWE64j5fxHHLCdNIpPntD6GWUKjNfodgYrdJ6ww0RhEG1GzXAHarWa7UJgTQX4+A3ak/KkQVpEDN5twe4Fn5cEkdlZYTD6Xq6N9YkgpwT6g== 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=nl9FkLa0csOmTR9H1jJ3ma7EreWOQU+RKjYv5aIvuh8=; b=SCBPKVAQjKFhcwsK/1Z95driKPnRdyYiHY1bVbgfpjeUSxTq0Pf4V82i7OsfBiRMCVJqQqSEHSntPWFBoi7547eS0NIFWkd8z9KLSKygoXy/D8VDkSiir4nDM9aLvxj6vHjh1rEJU8wjhNvpPuN2nyrc0xKhEMKSmiGVbzyKgO4At/CZEJMmdACXFqpnfErTcdU3iXCnS4JrH/vfbJYF3HJD1JguxpTdxZXS/FqT5LaU5y7g00SKRFtJlc/ouBPOCzyWMa4WEjdvl0kPXCEe+yX8CbNvZhMXRxYPFgAP+rnkKXmzRyVgwZtIsC4D5Kl2XYAiU5yzZh6g/2P0Mi3N8A== 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=nl9FkLa0csOmTR9H1jJ3ma7EreWOQU+RKjYv5aIvuh8=; b=oUO6s51X1ufHEFoVFtqiEeU0oTcytltp5lQk9fwjQuwXLSG/arbvtVmwkSbBjFTkOyf6nkPh0zk13iPnaTtWEpFkm69bqxEhZpg5BAwpiRHqnN8nUwB9R2ky28qelzevQUOeKE/c2JgOgPDQ6aD/9j7egU5tbNCK1pij2BVzUMA= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0401MB2376.eurprd04.prod.outlook.com (2603:10a6:4:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Wed, 21 Oct 2020 08:37:00 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef%8]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 08:37:00 +0000 From: peng.fan@nxp.com To: sboyd@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, abel.vesa@nxp.com Cc: kernel@pengutronix.de, linux-imx@nxp.com, Anson.Huang@nxp.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, aisheng.dong@nxp.com, Peng Fan Subject: [PATCH 2/5] clk: imx8mq: fix noc and noc_io registration Date: Wed, 21 Oct 2020 16:31:31 +0800 Message-Id: <1603269094-29367-3-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> References: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3499.4 via Frontend Transport; Wed, 21 Oct 2020 08:36:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 536467eb-b84e-4fcc-2a99-08d8759c7a92 X-MS-TrafficTypeDiagnostic: DB6PR0401MB2376: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: smQib2ztNr79JjEHKoe0NCVxx8Yh8gnF/UJji+tNID+T3iHfaD78VooptXikxWZQnJ6I/tLTr5WGIWH1H4kx4Mk7O/hHAu/W/uGBlGFiDAECrWlDezXqA8AiA9rVjuzhG/FWyskfol0Lx/27Qtt3UZVtmyVHHxfBueA1mbFWkh9QuoKjLgRTfQ76UySeAz/i7SrXcLZ1Ri9mCh13il4JJfk6KEz750gv0+FgMhdJVSMZnbDsX3Q9/2/FdI9/bfmBCaOQpeAqHpWeoUk9t64rAjB+wFEOclbLX0RUz9Go63B88yWOQIb0zCP2AcCg6gyJAwlGULyP6oRmgxIz61g8971c/PJz/Wf+YPXE07STxWaKbcPp6qYz7n+aMvx2ddRHlug1BNcpOtnnn9DaJwB2BchiryWNGlXJOt7t9qX673s= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB6PR0402MB2760.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(39860400002)(136003)(346002)(366004)(69590400008)(956004)(2616005)(16526019)(5660300002)(83380400001)(26005)(52116002)(4326008)(6506007)(36756003)(316002)(478600001)(8936002)(66556008)(8676002)(186003)(66946007)(9686003)(6486002)(6666004)(86362001)(66476007)(6512007)(2906002)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: MuSo2IrkH5l+O1XAUkbpbfjT/eK7eQlKLUCnpys2Z6bD6hxSQgKrVENXSNj5cdpAZGSONCl1E0Dktv1ZECGLHfINnkJLSz+pFDt32cLhcdhpSzVWoLH/uKAMLWv3pUbaCRhYdUSHQ2VRBoeWPcuGE9tdJp5xxzD1/xJlp3TRuTgfoZpzrMJw9D3pTTj16lQXR82Bovwt/ntWX8skeCc5mO3HQ7dORtC1nVtpJbXH8FEhJ3ySE1xRpCvacaHaxKcGOmlVp6ERHW1saArCchMwjVAo6d3+z3We1KqkMAbts/UARXFvjA163Oa8eq/85gQzjhe1RZhh/tVKat9wP3AZOCK/sqlMg0VYnL/l1VmoxMk9KeckYOdclJQmVYnc7Mbs58vhfK1MRm99axf8ny8QHAjVqU+iWoGqqEFR1As0juMqGSvCKThERtGFTqioQjJJzbB/5Xgymct0U+vmThtSLV0E0wRRKCwBxS6p45N4Hb7QvshTPxeLjVoPZ2PRv1creVMN+PsMsEP8avuZK3Z4jLjdSuikFW9bZV3+sF6H5lix/bUtpQLtWzOIdLpAVbH80s8CtquFE9kIpBvEfIqH2hkSGPZXyizlHs1Sg0whKjU2qbTd1gavbTZ35Xnko1N1fCHpxfrOz/OSTnnHhsCx8A== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 536467eb-b84e-4fcc-2a99-08d8759c7a92 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 08:37:00.6841 (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: oaP6eSEVgIywL61tu0LYbIyqYPPwhMtklQYMLxqPxAEwrmt/rANLmaFka0htvccBChSpeg0cL+ZxPoUTY9E40A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2376 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan noc/axi/ahb are bus clk, not peripheral clk. Since peripheral clk has a limitation that for peripheral clock slice, IP clock slices must be stopped to change the clock source. So we added CLK_SET_PARENT_GATE flag to avoid glitch. However if noc is marked as critical clk peripheral, the assigned clock parent operation will fail. Fix to register as composite bus critical. Signed-off-by: Peng Fan --- drivers/clk/imx/clk-imx8mq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c index a06cc21181b4..28290e717d9c 100644 --- a/drivers/clk/imx/clk-imx8mq.c +++ b/drivers/clk/imx/clk-imx8mq.c @@ -431,7 +431,7 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) hws[IMX8MQ_CLK_A53_CORE] = imx_clk_hw_mux2("arm_a53_core", base + 0x9880, 24, 1, imx8mq_a53_core_sels, ARRAY_SIZE(imx8mq_a53_core_sels)); /* BUS */ - hws[IMX8MQ_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mq_main_axi_sels, base + 0x8800); + hws[IMX8MQ_CLK_MAIN_AXI] = imx8m_clk_hw_composite_bus_critical("main_axi", imx8mq_main_axi_sels, base + 0x8800); hws[IMX8MQ_CLK_ENET_AXI] = imx8m_clk_hw_composite_bus("enet_axi", imx8mq_enet_axi_sels, base + 0x8880); hws[IMX8MQ_CLK_NAND_USDHC_BUS] = imx8m_clk_hw_composite_bus("nand_usdhc_bus", imx8mq_nand_usdhc_sels, base + 0x8900); hws[IMX8MQ_CLK_VPU_BUS] = imx8m_clk_hw_composite_bus("vpu_bus", imx8mq_vpu_bus_sels, base + 0x8980); @@ -441,12 +441,12 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) hws[IMX8MQ_CLK_USB_BUS] = imx8m_clk_hw_composite_bus("usb_bus", imx8mq_usb_bus_sels, base + 0x8b80); hws[IMX8MQ_CLK_GPU_AXI] = imx8m_clk_hw_composite_bus("gpu_axi", imx8mq_gpu_axi_sels, base + 0x8c00); hws[IMX8MQ_CLK_GPU_AHB] = imx8m_clk_hw_composite_bus("gpu_ahb", imx8mq_gpu_ahb_sels, base + 0x8c80); - hws[IMX8MQ_CLK_NOC] = imx8m_clk_hw_composite_critical("noc", imx8mq_noc_sels, base + 0x8d00); - hws[IMX8MQ_CLK_NOC_APB] = imx8m_clk_hw_composite_critical("noc_apb", imx8mq_noc_apb_sels, base + 0x8d80); + hws[IMX8MQ_CLK_NOC] = imx8m_clk_hw_composite_bus_critical("noc", imx8mq_noc_sels, base + 0x8d00); + hws[IMX8MQ_CLK_NOC_APB] = imx8m_clk_hw_composite_bus_critical("noc_apb", imx8mq_noc_apb_sels, base + 0x8d80); /* AHB */ /* AHB clock is used by the AHB bus therefore marked as critical */ - hws[IMX8MQ_CLK_AHB] = imx8m_clk_hw_composite_critical("ahb", imx8mq_ahb_sels, base + 0x9000); + hws[IMX8MQ_CLK_AHB] = imx8m_clk_hw_composite_bus_critical("ahb", imx8mq_ahb_sels, base + 0x9000); hws[IMX8MQ_CLK_AUDIO_AHB] = imx8m_clk_hw_composite_bus("audio_ahb", imx8mq_audio_ahb_sels, base + 0x9100); /* IPG */ From patchwork Wed Oct 21 08:31:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11848539 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 6EB43C561F8 for ; Wed, 21 Oct 2020 08:37:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0866C22251 for ; Wed, 21 Oct 2020 08:37:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="Wy3m4aoG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2441017AbgJUIhK (ORCPT ); Wed, 21 Oct 2020 04:37:10 -0400 Received: from mail-eopbgr60044.outbound.protection.outlook.com ([40.107.6.44]:15054 "EHLO EUR04-DB3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2440607AbgJUIhJ (ORCPT ); Wed, 21 Oct 2020 04:37:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y+1AUJXdLUCydx/KNU9FyVHBmVrNQSgNvtm+njjAw5vZFH5ZfNeMxyd2MlZ+zU3bTZjMllQMa5fenbX0orQBcTIgUyPmBvKVjwCaaVFm5FTe1u+6bNKoGcy87KQD9B5x+Qe7VeeO9xKocRumi9ldpuGzb83r1916OScxv3PPfZ3xqzJitP9TMruhtGfvepcHBnoXzAo4HFUmj0CxB4hjRi/iF2KHrnhHeIMWJ/mXOCoWmYq7gbi0/zD8awvS/2zt1WJzUVP4P1IOW1m/i5s/H4OL5BdxSyhO5qzgvwhUEBCdLLpdmPal45x6N5TxTSXJBpbRDV9ecceK3b+5EfoUmQ== 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=iCr/GyqxcsNPxveAU84zLt1V/XRDFV1Uw/0VxQaEK6c=; b=fBMq1KNR2GYIS11MWOYIz49jEH+CSYJppTNRiAXTi/qGCrfMyopeM2Ie0VgxtpTDaBELDmOJMSIW2glYcfYi4MzQNkWsnzWnHQPV129QfJtub3e9GmVzoB7Zb8Rf+AOd3kvb2zm/RiXWpTEwiYbIe8bAcMFSx5Sb2IzsLN4fWOU7V5ZwB8Uj4v9GwA59SD9DbXhSF26i31JW4VZm1ZJVwaOIK0cniva27Gljnpwx6CmvtiayUMkYwYYVykZg7Ar0rwxWHi9nS4uG6Nta0CvZxVIlcGJxNkZGLFvN75iD+1hH1hDHD06LSlf4uykrLIMoNicnrCVevOmNhQgjxl7W8A== 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=iCr/GyqxcsNPxveAU84zLt1V/XRDFV1Uw/0VxQaEK6c=; b=Wy3m4aoGXKvRNLHq//X6Dd+Quyp4j0z8tIIdT3ojgr/qyJgZCpDgwguxTCYG9XYgJndmdmlIJL/wWW0QxWiY/CusKeYoQ7zk5R2DXbERJsh5BdNKy30E+RIaAM1UyQZULkpWXPXQvzEDR35mTazrK2ZmS0rWwkDdLqffqGX4Jws= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0401MB2376.eurprd04.prod.outlook.com (2603:10a6:4:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Wed, 21 Oct 2020 08:37:05 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef%8]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 08:37:04 +0000 From: peng.fan@nxp.com To: sboyd@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, abel.vesa@nxp.com Cc: kernel@pengutronix.de, linux-imx@nxp.com, Anson.Huang@nxp.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, aisheng.dong@nxp.com, Peng Fan Subject: [PATCH 3/5] clk: imx8mm: fix bus critical clk registration Date: Wed, 21 Oct 2020 16:31:32 +0800 Message-Id: <1603269094-29367-4-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> References: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3499.4 via Frontend Transport; Wed, 21 Oct 2020 08:37:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 71de34b6-a80b-48cc-dde7-08d8759c7cfb X-MS-TrafficTypeDiagnostic: DB6PR0401MB2376: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qdSv8T5BYZUlBA2JSgJAwhV/ftVWBf8KwKvttJJctc+CHPgR0Do+zzRGSM4YuEIW670utXm0mfjw+IMvcl8qp2Cp5/PI/vsP9oNrrfDF0ZuH/a/sAVyzILIsgWnnuPW5CdH++jJIzeJS6FELOE7QMQ8dZb6nPu+lxyQS5bXAkS4h2/FWYof07IvC5DlK3fZChm9YHmbNCAhxaPqFwwxBSCFhofAI89PDwmRtJCeJ250x2k+ozay8EwpWQ/Wj0G8sxRkUiQx/qxLvQjQn4Q9Z+L1qWreCw1R0527odBlGcC0DgWo3SjZ8EGKSNWfFIaxNJfwECfXKZ4TDd5IFDa02H0IXQ3aY0MJ3A8/vBs47/hk5+qkCj6XdMdpdtNIKa9f947LtiRbE5lxN5W65cGiWloJJ74xjlNBh4uRazdQDHK0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB6PR0402MB2760.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(39860400002)(136003)(346002)(366004)(69590400008)(956004)(2616005)(16526019)(5660300002)(83380400001)(26005)(52116002)(4326008)(6506007)(36756003)(316002)(478600001)(8936002)(66556008)(8676002)(186003)(66946007)(9686003)(6486002)(6666004)(86362001)(66476007)(6512007)(2906002)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: atzAIXMULM1lj/ZPUsTfvgVCBLZ14ayI0jvU9rQ2yBwoj9xqX3f2NxDYsOtVl9Y1VvsTYGhkoGhUcnGXFqp9AuQ/9/53paOsbmBBFOqHgMb6kzhchF87vO0svaj09wYddoQa8/R6SrZhgpL+FC1ixI4W9DUFAqkG7yK3G7WhVNOKdeksSiyNuPL06VUQn5/NIOHHmHoGO0JlEJ5qR3qTGZ7BVW4tt/BWGe0XG+WjdSDQ6stAi0F/AEdvCu5q7YdiNSmJ8lI5cRVcwkoFBrFPQ4N5vTMjTeYyTWkqn7SecKw1O3c6SFLuUdLyY17Bv0VgkXSrdsTGNbLWdtxc0Hml8DnsAk1hMxzSkZn+S3/2G0mK8wTd9DN4PUizSeTwun0QMAPheylcjP5ouWI6u0cK5SIejRqRHBO+fxqxf4hsAyIFKFe/+/zvm7O5tvv1qeozzgfz61tMQtnfy6CgrDpntMA8k7bPdqPKxwlS3UoZTLwZHHaHtEu1EpYKq0X4nyKfgsVFzjHc2XjcRIjCAcVNBf6cNBx1MEiDpKy1me41relzCC41oOhrAj+rsZBhuxU5SG77R8Jal44+20ShMzHWQg2yZ0p4TSqS/jYMIto/5MKluyv/0P2pcFnWvsiC+q13gI175NDDFW0xlNOnwH6CVQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71de34b6-a80b-48cc-dde7-08d8759c7cfb X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 08:37:04.7893 (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: 5UUiyOo6A91c7A3ix26AnNt4i3CiRD3eTKJ+y/Q6YUsCaRPt6CeYwGiE74lMBF34E5aUJ/aFOXcKjQjRp/Vs7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2376 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan noc/axi/ahb are bus clk, not peripheral clk. Since peripheral clk has a limitation that for peripheral clock slice, IP clock slices must be stopped to change the clock source. So we added CLK_SET_PARENT_GATE flag to avoid glitch. However if noc is marked as critical clk peripheral, the assigned clock parent operation will fail. Fix to register as composite bus critical. Signed-off-by: Peng Fan --- drivers/clk/imx/clk-imx8mm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index 0de0be0cf548..f358ad907299 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -443,9 +443,9 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) hws[IMX8MM_CLK_A53_CORE] = imx_clk_hw_mux2("arm_a53_core", base + 0x9880, 24, 1, imx8mm_a53_core_sels, ARRAY_SIZE(imx8mm_a53_core_sels)); /* BUS */ - hws[IMX8MM_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mm_main_axi_sels, base + 0x8800); + hws[IMX8MM_CLK_MAIN_AXI] = imx8m_clk_hw_composite_bus_critical("main_axi", imx8mm_main_axi_sels, base + 0x8800); hws[IMX8MM_CLK_ENET_AXI] = imx8m_clk_hw_composite_bus("enet_axi", imx8mm_enet_axi_sels, base + 0x8880); - hws[IMX8MM_CLK_NAND_USDHC_BUS] = imx8m_clk_hw_composite_critical("nand_usdhc_bus", imx8mm_nand_usdhc_sels, base + 0x8900); + hws[IMX8MM_CLK_NAND_USDHC_BUS] = imx8m_clk_hw_composite_bus_critical("nand_usdhc_bus", imx8mm_nand_usdhc_sels, base + 0x8900); hws[IMX8MM_CLK_VPU_BUS] = imx8m_clk_hw_composite_bus("vpu_bus", imx8mm_vpu_bus_sels, base + 0x8980); hws[IMX8MM_CLK_DISP_AXI] = imx8m_clk_hw_composite_bus("disp_axi", imx8mm_disp_axi_sels, base + 0x8a00); hws[IMX8MM_CLK_DISP_APB] = imx8m_clk_hw_composite_bus("disp_apb", imx8mm_disp_apb_sels, base + 0x8a80); @@ -453,11 +453,11 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) hws[IMX8MM_CLK_USB_BUS] = imx8m_clk_hw_composite_bus("usb_bus", imx8mm_usb_bus_sels, base + 0x8b80); hws[IMX8MM_CLK_GPU_AXI] = imx8m_clk_hw_composite_bus("gpu_axi", imx8mm_gpu_axi_sels, base + 0x8c00); hws[IMX8MM_CLK_GPU_AHB] = imx8m_clk_hw_composite_bus("gpu_ahb", imx8mm_gpu_ahb_sels, base + 0x8c80); - hws[IMX8MM_CLK_NOC] = imx8m_clk_hw_composite_critical("noc", imx8mm_noc_sels, base + 0x8d00); - hws[IMX8MM_CLK_NOC_APB] = imx8m_clk_hw_composite_critical("noc_apb", imx8mm_noc_apb_sels, base + 0x8d80); + hws[IMX8MM_CLK_NOC] = imx8m_clk_hw_composite_bus_critical("noc", imx8mm_noc_sels, base + 0x8d00); + hws[IMX8MM_CLK_NOC_APB] = imx8m_clk_hw_composite_bus_critical("noc_apb", imx8mm_noc_apb_sels, base + 0x8d80); /* AHB */ - hws[IMX8MM_CLK_AHB] = imx8m_clk_hw_composite_critical("ahb", imx8mm_ahb_sels, base + 0x9000); + hws[IMX8MM_CLK_AHB] = imx8m_clk_hw_composite_bus_critical("ahb", imx8mm_ahb_sels, base + 0x9000); hws[IMX8MM_CLK_AUDIO_AHB] = imx8m_clk_hw_composite_bus("audio_ahb", imx8mm_audio_ahb_sels, base + 0x9100); /* IPG */ From patchwork Wed Oct 21 08:31:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11848543 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 99BE6C4363A for ; Wed, 21 Oct 2020 08:37:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3032922249 for ; Wed, 21 Oct 2020 08:37:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="S+7WxWAU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2441028AbgJUIhS (ORCPT ); Wed, 21 Oct 2020 04:37:18 -0400 Received: from mail-am6eur05on2075.outbound.protection.outlook.com ([40.107.22.75]:22112 "EHLO EUR05-AM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2440607AbgJUIhR (ORCPT ); Wed, 21 Oct 2020 04:37:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SI+YewFD6u7VTOfKbdyWdpgLf9CiA7BOaYzxYc9R6toB5kD25rsVas3EKgrdOHQOzog3VZGxNRXqprNhRS+g5b1SzpCARpKGNIpCN+/pBp7pjSDDnYWiSlnUN1LyaKA84+Fm2C2+s+yjizc/c813wEcRUNcHtcgFZW/NVAfX8SOyG75RB7MpF0Z1zf/zQuzI88AovJIRIDGzznKnIacWHmcursJ8D+YBNUzRDeFc/Khn6z8Q8Ehxt/0EK5yNqKv9bhMHqxIz/Cu/QFjW6Bpf+peU+g/huXr5UyhvLz8q/r691ZlVYBX3jzQrlfgOsAjzojt+YNtJiuhfH0OqUAeCHw== 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=owP+ftRfPGXBy+W051+XVxhCLpMtPSVGkk2farXvbcE=; b=nP0e17otSN3YtzfrWmIXzT9aSmM8ifHCSaQV80UlQ5yJDvwV1m0HgnL/c+8yO4Ewt3Vy0rNgjr3UBpKvKvVFvgrjD4KCZihnxhvWxl72EqS37iMUM/3l4B6YNPSr+BbPXonpcqg2IsubnIZFai9tEpF8GItjSIg0x3di/+SfDqD2kxbqHo1f4bRje/HojCdtMw2VSD4NNX5cAE1EE+ySUpNPuhLgm7QyfEKunCF7aTv8bhf73aDIu7x2Q5oBUfLzkYZPJwOzAKKZSYEcjyP4TMKOSb34t8oRNrGhfMgROIe5k/XKw+G8/byapnxkzZdWn1FT4g3AQjKq3N+unEXIQg== 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=owP+ftRfPGXBy+W051+XVxhCLpMtPSVGkk2farXvbcE=; b=S+7WxWAUNW0wiVz7TXmAMSj8Dw81Y04UQFbM1H6iVPqmTq9jo5q9JfpEB4PE5mWtShY1TbvlCth8Sr6eVCd6CDXLekh90AzYATf934UlwCW8TtiCGJO6PpDtGvwkOzRKJLN4vR5i3r1HrnTGKjGViOjJwLdcey0jMtsdiUqnx2c= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4636.eurprd04.prod.outlook.com (2603:10a6:5:2e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.22; Wed, 21 Oct 2020 08:37:09 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef%8]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 08:37:09 +0000 From: peng.fan@nxp.com To: sboyd@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, abel.vesa@nxp.com Cc: kernel@pengutronix.de, linux-imx@nxp.com, Anson.Huang@nxp.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, aisheng.dong@nxp.com, Peng Fan Subject: [PATCH 4/5] clk: imx8mn: fix bus critical clk registration Date: Wed, 21 Oct 2020 16:31:33 +0800 Message-Id: <1603269094-29367-5-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> References: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3499.4 via Frontend Transport; Wed, 21 Oct 2020 08:37:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9acd1a39-fb27-4ff6-6099-08d8759c7f7b X-MS-TrafficTypeDiagnostic: DB7PR04MB4636: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d7fjisP0jNYloMqHHYeDXmoooj1aXIH6OgTG5hqY4O1LVv/F9Vk1p4wiQLH0pK05nLHo/46Q8lK+o+k4n8R9Jd3TxQJkfKfGFvA8US55i/jFOuo3wb34bDg+d//HHKRIikyv05TP5Ox6pRw7+M+e4RqNa+RbHjEVNj67AuX1ubuw5k/dwHgaFbB2KVsANqCEshdoRbGbud+HxCcwk8xHWjTWytAf6/OYPP9EEW6ea/cZk7E7lzmfv+KbERzjtreDxAEuQFuPYlwsXsCy54QpUBmvA/NnqvDwmyWIA63dtwLKCj1yNHUad5sSlv4RT300D5+yVpfwvtLDYhH5ebEXZlOL6nQedcK1BRSXxpi5oCKFQT4Os0VKQ+NlXfTkYOVT27f20uMpNb8iOBtnacA5anHrGhliqXkrapl5cj5zwAk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB6PR0402MB2760.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(366004)(136003)(376002)(396003)(8936002)(36756003)(83380400001)(52116002)(2616005)(16526019)(6666004)(26005)(69590400008)(6506007)(956004)(6512007)(5660300002)(186003)(9686003)(8676002)(66556008)(4326008)(2906002)(86362001)(66946007)(66476007)(478600001)(316002)(6486002)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 7Fr6r+RyShhnxo3wRppn1jv85vAOciXYJwsvj+TWOys/1uSat7d7jujGuNwXZrwcnKxQ/AO0y9hWui/ELo4l4AFIDlv9PH64GHMZ2gndpE15OV8qITePEeTBpwSLnIWhuZYfDgFU8kishvvtDW4T/OMqKcg8P0cm+kz0aE5DqA3p1swdwN5jkVT1AuZX+ywCG+BPm5ppeXVoft4IsNmFgImSYw7CwFSO/4oD4xUHZdhwccHIMX5FvcuWGh3Ipgj2k1o2Im3/XryFWNF/zn0tW41R/Rbhx1k0jxGn7LOFLtZD8uh6tqv5gsn/vf3kD4Wgjzjw6l4REp5yLxXcN5eyDZjKl9VAkT1FNQIyLsin9HnjDrZkjTLy3DdkrjmitVUXufZ9Hx8rmB89jNR6wu2mvop59JeDaD4Y744uC7iP+rUbexXhvdNs+4MX22yWUEKjaulSJ7lph7q9UggFyEZ7bQ3mQn4W/LPLrejOXFp1x/mg44shlquau3Hm/Ap+xN5LPub0x5s/EITmEK5NpT9SyRFZc6yjp9O2YV8nXS09wvUuoIwVklWaerW39xawNazBcx8dqGxmmxFZZsKwHqAsE683nH2cCIJdkS9su+ItBaVj3juPvde1x6YQ7DFWc7a8QafFyEzao9ZTpL0SlDaFWA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9acd1a39-fb27-4ff6-6099-08d8759c7f7b X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 08:37:08.9264 (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: cJ4J9CrTdDzdF2A9AIrz3CBAR2xK/KzWvPfQ8ZCNqyVyH3rKyZMgUsWA2MswBMAg8leImEIpp6Q2ZT944bbdhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4636 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan noc/axi/ahb are bus clk, not peripheral clk. Since peripheral clk has a limitation that for peripheral clock slice, IP clock slices must be stopped to change the clock source. So we added CLK_SET_PARENT_GATE flag to avoid glitch. However if noc is marked as critical clk peripheral, the assigned clock parent operation will fail. Fix to register as composite bus critical. Signed-off-by: Peng Fan --- drivers/clk/imx/clk-imx8mn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index e984de543f0b..f3c5e6cf55dd 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -431,7 +431,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_CLK_A53_CORE] = imx_clk_hw_mux2("arm_a53_core", base + 0x9880, 24, 1, imx8mn_a53_core_sels, ARRAY_SIZE(imx8mn_a53_core_sels)); /* BUS */ - hws[IMX8MN_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mn_main_axi_sels, base + 0x8800); + hws[IMX8MN_CLK_MAIN_AXI] = imx8m_clk_hw_composite_bus_critical("main_axi", imx8mn_main_axi_sels, base + 0x8800); hws[IMX8MN_CLK_ENET_AXI] = imx8m_clk_hw_composite_bus("enet_axi", imx8mn_enet_axi_sels, base + 0x8880); hws[IMX8MN_CLK_NAND_USDHC_BUS] = imx8m_clk_hw_composite_bus("nand_usdhc_bus", imx8mn_nand_usdhc_sels, base + 0x8900); hws[IMX8MN_CLK_DISP_AXI] = imx8m_clk_hw_composite_bus("disp_axi", imx8mn_disp_axi_sels, base + 0x8a00); @@ -439,9 +439,9 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_CLK_USB_BUS] = imx8m_clk_hw_composite_bus("usb_bus", imx8mn_usb_bus_sels, base + 0x8b80); hws[IMX8MN_CLK_GPU_AXI] = imx8m_clk_hw_composite_bus("gpu_axi", imx8mn_gpu_axi_sels, base + 0x8c00); hws[IMX8MN_CLK_GPU_AHB] = imx8m_clk_hw_composite_bus("gpu_ahb", imx8mn_gpu_ahb_sels, base + 0x8c80); - hws[IMX8MN_CLK_NOC] = imx8m_clk_hw_composite_critical("noc", imx8mn_noc_sels, base + 0x8d00); + hws[IMX8MN_CLK_NOC] = imx8m_clk_hw_composite_bus_critical("noc", imx8mn_noc_sels, base + 0x8d00); - hws[IMX8MN_CLK_AHB] = imx8m_clk_hw_composite_critical("ahb", imx8mn_ahb_sels, base + 0x9000); + hws[IMX8MN_CLK_AHB] = imx8m_clk_hw_composite_bus_critical("ahb", imx8mn_ahb_sels, base + 0x9000); hws[IMX8MN_CLK_AUDIO_AHB] = imx8m_clk_hw_composite_bus("audio_ahb", imx8mn_audio_ahb_sels, base + 0x9100); hws[IMX8MN_CLK_IPG_ROOT] = imx_clk_hw_divider2("ipg_root", "ahb", base + 0x9080, 0, 1); hws[IMX8MN_CLK_IPG_AUDIO_ROOT] = imx_clk_hw_divider2("ipg_audio_root", "audio_ahb", base + 0x9180, 0, 1); From patchwork Wed Oct 21 08:31:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11848545 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 F30C6C4363A for ; Wed, 21 Oct 2020 08:37:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1DF22177B for ; Wed, 21 Oct 2020 08:37:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="HtnsCF17" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2441041AbgJUIhc (ORCPT ); Wed, 21 Oct 2020 04:37:32 -0400 Received: from mail-am6eur05on2075.outbound.protection.outlook.com ([40.107.22.75]:22112 "EHLO EUR05-AM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2441027AbgJUIhb (ORCPT ); Wed, 21 Oct 2020 04:37:31 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lGzn9uQwIY9rENQmUXT0sCJoiKZG3z6pxdZRc4AKTXqvJa4HmLTCsIqhJnAQ9LQWNCsR1OUsYYnkRSdlGvRZamD5jO67tykNvj1X+SaUnWvFv3cEswALO+G2CLeVSu9U7K8TQlv2TcjacrA1ltZKqFsehKM1j7Mav/ofAW9W3ZECJegpuAQc8mgX+7klw6yqPRGEgywkjKg24wtCHR4RoL1BWQwG4XXXkCRxvNEwlOtmAlDhvTyVmcpeWzkCW2x4nutPkspGbolkNLOYEv6U5HPoW47nLti3wcCBD/NiKo6RiYpEF2Z0meR8tlyoKl2N+WKejQBm9nAKxKzIbuS5ZQ== 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=XAmWjAC2ceW+A8L2k1i/ZBYrzgXodgnO6OQiYKr8I4A=; b=BQW6Aa/Aku5w6/6d0oWF2r4YH+A1cFJHLUxtZpf91sggj+SETaezv4B3doAzir4ES7o1/rzWxs40KQnIEre1R7yIfflDQzYRNnHzBnXWrvfBRxW+78z44wbrh4mWh5T9iGbGPfu/zzt1hneNqXs9IAYJ2F2YKnLbBO7/jzlpVSVMXGTUcQHsTzFyumEwuObl/6ioNEK4xeFj8Y3A9NH9iQr+1MoQ19tzRZ6mmJ+KpcA/URrslY6IWElXty+u6bcGwjaX970UmJ2HMQG8P7fG+BZYC+a/qHxlEbquQY4/tjrWYRHYaou5EZyuCN1/l9wPcdYwMxsl66lDwW8/4KSIOA== 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=XAmWjAC2ceW+A8L2k1i/ZBYrzgXodgnO6OQiYKr8I4A=; b=HtnsCF17oeD+guUNz8CBW/UG3XBS4oa3vwGB7g5WbO1WEWcowQEo7TIBsTwPUROQyxuzclLUDX4C0YSgE1Cg7sennlegrDyA8ohYwwlreg8PpFtAokzVJ0+yDRHrpW1L+ptGXWDvvK+FmSzN+T4Oi3TZ3immvs1OC1xqLAKf6gw= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4636.eurprd04.prod.outlook.com (2603:10a6:5:2e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.22; Wed, 21 Oct 2020 08:37:13 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef%8]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 08:37:13 +0000 From: peng.fan@nxp.com To: sboyd@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, abel.vesa@nxp.com Cc: kernel@pengutronix.de, linux-imx@nxp.com, Anson.Huang@nxp.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, aisheng.dong@nxp.com, Peng Fan Subject: [PATCH 5/5] clk: imx8mp: fix bus critical clk registration Date: Wed, 21 Oct 2020 16:31:34 +0800 Message-Id: <1603269094-29367-6-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> References: <1603269094-29367-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR03CA0155.apcprd03.prod.outlook.com (2603:1096:4:c9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3499.4 via Frontend Transport; Wed, 21 Oct 2020 08:37:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8bee661f-c0c0-4c9f-4c3f-08d8759c81e6 X-MS-TrafficTypeDiagnostic: DB7PR04MB4636: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EwC0NgmuZI3I+ZsMP9qfRxa0AiBUq2IYiwrh21X09jBqsYkklWVKhSBL25iP/ADSmTDNMtC8QDk4PRcEyyQ3koGNoMv8xn01252VOLxhMgIEc6p0n8/N0Xw0DZkgG2uN6gxxiX2paVXfqDXRhP9MWtiSsCY7MIxf28GwOPiOR+afwHY7UiCpimpsCIFh541+fb2aU2hhieHOUG855i/JRa1tu8SOhmCiSdGFx5FYps2sw4e5b4d9t+82kU0DkcCu2daKBqUvTuJTXiLStdjLUIlDqofLp4KDEsoSzt2NAPbtrqG3BtgBbNKQOHsYFOmBQYkvO39fd0Pjq5wsMF31RpE5GqsmQY9P7OGW0LT7EwPmCOIXewarY9M4HTeO01kPPxNqSxBvgy6QZXS2SGwRTWMCOieJp/m48zrGvBoOvpc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB6PR0402MB2760.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(366004)(136003)(376002)(396003)(8936002)(36756003)(83380400001)(52116002)(2616005)(16526019)(6666004)(26005)(69590400008)(6506007)(956004)(6512007)(5660300002)(186003)(9686003)(8676002)(66556008)(4326008)(2906002)(86362001)(66946007)(66476007)(478600001)(316002)(6486002)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: kii9USdaNvQYHBMlAXiC8zDYrCzJoUzMk7tRdT/6v/oIQf7/M3hCCfOuogHhMFELjy2l4tLvu6oRjIZkvP0rQwoKx8xy+PrkxZLN59VtcExOSJMvypRaNZLyKidPovwZJM1Lu+B8qf6fjTcLKkR+qSiRqKayRW7Jl9ZyETufnwHOq4hOJmLoI49yMBaOJQjm1Xr63cEziaSm1i7eKcWyQY/oeCNVkwi+/YSiH13NRlISZM62MbPwopTFnp8VnRJhHBNqrPXfQ+OC/81LyecsnLF41emVgu3sf/SveJCyXzaXwrFimydtGzNWs/nTmGcX7bNesMAj8zhtexNvGl02SP0Hx1OBFUzCQQbjrBjUt5qw5jqoeYCUymUGdepXDBmoKpmUo6353nwjTx6J8J+jmj7tohYRkf/FROxUy21aXlI8E5HAVTYkXk8NmFGB/i99LBQHfpWxHPFYUENtQsRJ0B2NCFM+SJcEjBIjv/lHNU9U1B1ulj37rzjI6uZZvv8oLlaoVXn5O/6/joTKjhw5HbJuWIpzA96UPrDVa4PpryHMJrHDpVZhO0G72YYll5Sy3mTWpwD37ABC+4khW4tW3Yd81rn02O/2j4hCKFp0PUjwUdSiSeIn7X3wgQv1hO6J6FSD4Asc1VKTpjlj0FofNQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bee661f-c0c0-4c9f-4c3f-08d8759c81e6 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 08:37:12.9915 (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: QbcF8/brmkI1UYxADYQs5HGXAsMlFIg4egXq5va7IGBO+hxLhk9EdqUMhePVUBK2furLtpx3XZomZS087JgBuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4636 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan noc/axi/ahb are bus clk, not peripheral clk. Since peripheral clk has a limitation that for peripheral clock slice, IP clock slices must be stopped to change the clock source. So we added CLK_SET_PARENT_GATE flag to avoid glitch. However if noc is marked as critical clk peripheral, the assigned clock parent operation will fail. Fix to register as composite bus critical. Signed-off-by: Peng Fan --- drivers/clk/imx/clk-imx8mp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index 12ce4770f702..48e212477f52 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -557,9 +557,9 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) /* CORE SEL */ hws[IMX8MP_CLK_A53_CORE] = imx_clk_hw_mux2("arm_a53_core", ccm_base + 0x9880, 24, 1, imx8mp_a53_core_sels, ARRAY_SIZE(imx8mp_a53_core_sels)); - hws[IMX8MP_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mp_main_axi_sels, ccm_base + 0x8800); + hws[IMX8MP_CLK_MAIN_AXI] = imx8m_clk_hw_composite_bus_critical("main_axi", imx8mp_main_axi_sels, ccm_base + 0x8800); hws[IMX8MP_CLK_ENET_AXI] = imx8m_clk_hw_composite_bus("enet_axi", imx8mp_enet_axi_sels, ccm_base + 0x8880); - hws[IMX8MP_CLK_NAND_USDHC_BUS] = imx8m_clk_hw_composite_critical("nand_usdhc_bus", imx8mp_nand_usdhc_sels, ccm_base + 0x8900); + hws[IMX8MP_CLK_NAND_USDHC_BUS] = imx8m_clk_hw_composite_bus_critical("nand_usdhc_bus", imx8mp_nand_usdhc_sels, ccm_base + 0x8900); hws[IMX8MP_CLK_VPU_BUS] = imx8m_clk_hw_composite_bus("vpu_bus", imx8mp_vpu_bus_sels, ccm_base + 0x8980); hws[IMX8MP_CLK_MEDIA_AXI] = imx8m_clk_hw_composite_bus("media_axi", imx8mp_media_axi_sels, ccm_base + 0x8a00); hws[IMX8MP_CLK_MEDIA_APB] = imx8m_clk_hw_composite_bus("media_apb", imx8mp_media_apb_sels, ccm_base + 0x8a80); @@ -567,12 +567,12 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_HDMI_AXI] = imx8m_clk_hw_composite_bus("hdmi_axi", imx8mp_media_axi_sels, ccm_base + 0x8b80); hws[IMX8MP_CLK_GPU_AXI] = imx8m_clk_hw_composite_bus("gpu_axi", imx8mp_gpu_axi_sels, ccm_base + 0x8c00); hws[IMX8MP_CLK_GPU_AHB] = imx8m_clk_hw_composite_bus("gpu_ahb", imx8mp_gpu_ahb_sels, ccm_base + 0x8c80); - hws[IMX8MP_CLK_NOC] = imx8m_clk_hw_composite_critical("noc", imx8mp_noc_sels, ccm_base + 0x8d00); - hws[IMX8MP_CLK_NOC_IO] = imx8m_clk_hw_composite_critical("noc_io", imx8mp_noc_io_sels, ccm_base + 0x8d80); + hws[IMX8MP_CLK_NOC] = imx8m_clk_hw_composite_bus_critical("noc", imx8mp_noc_sels, ccm_base + 0x8d00); + hws[IMX8MP_CLK_NOC_IO] = imx8m_clk_hw_composite_bus_critical("noc_io", imx8mp_noc_io_sels, ccm_base + 0x8d80); hws[IMX8MP_CLK_ML_AXI] = imx8m_clk_hw_composite_bus("ml_axi", imx8mp_ml_axi_sels, ccm_base + 0x8e00); hws[IMX8MP_CLK_ML_AHB] = imx8m_clk_hw_composite_bus("ml_ahb", imx8mp_ml_ahb_sels, ccm_base + 0x8e80); - hws[IMX8MP_CLK_AHB] = imx8m_clk_hw_composite_critical("ahb_root", imx8mp_ahb_sels, ccm_base + 0x9000); + hws[IMX8MP_CLK_AHB] = imx8m_clk_hw_composite_bus_critical("ahb_root", imx8mp_ahb_sels, ccm_base + 0x9000); hws[IMX8MP_CLK_AUDIO_AHB] = imx8m_clk_hw_composite_bus("audio_ahb", imx8mp_audio_ahb_sels, ccm_base + 0x9100); hws[IMX8MP_CLK_MIPI_DSI_ESC_RX] = imx8m_clk_hw_composite_bus("mipi_dsi_esc_rx", imx8mp_mipi_dsi_esc_rx_sels, ccm_base + 0x9200);