From patchwork Wed Oct 21 13:10:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11849061 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 DC1ACC388F9 for ; Wed, 21 Oct 2020 13:15:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5473122249 for ; Wed, 21 Oct 2020 13:15:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="qfCIR1Ma" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442871AbgJUNPp (ORCPT ); Wed, 21 Oct 2020 09:15:45 -0400 Received: from mail-eopbgr50071.outbound.protection.outlook.com ([40.107.5.71]:62253 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2437394AbgJUNPo (ORCPT ); Wed, 21 Oct 2020 09:15:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ri4zt3emXvdOs1oZpjYztMdlbeiiJZ0oUwVjeB2CjY5CD8CWlrTHp5Pafape4gwQKfpiR8mR9g1zx3zziEmOaYATsTETP3zrhppEF/Qk08hbdBuucNySCzzbhpPFikOUFD97XzdGow87RMDG0K1v0lq9OdsEScAbsi9RUGp1/wbdV8jax5n04p2tV3J8VnfmPZzMXoT1rm4TqB7t5QZypY3c6hiv7iQ61cX96WZRzKeApkwoQcGjfqTpzcGMUMUlDj0dkf9jlRdyDvs+5RWruWN6Cgwe7jbKU7Ta+WIiVvnDFvwoseD26sG2ywdmCdJpVPAcD+V9Z3ev29jPmtg1aA== 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=kB/eiw67HvpItqzPVL0LeDjz+ZpMWoicbTCO0APAl+gpy+GvFIkhm/51sHQZ5/AQwlGjED174Yq+fS8ah0LE4/fg56OTFLuR7Pmp8czKoZlb1KJQHNPorVJafPLqIbIKTSFLET/wqyRUSU9st7NoTwrN0Eu/+T4P+CSpdy5kClupBm0Lb7WhBt6oDOTDywAT2TbKuvU3UYUpWp1iaFTVfzJZT0ixeZa4saZLm5nwl+NTB0TjT5Am1I0zYfZcEzfUiyfNMSS593MA859o2oxm4IMs2p9Ncl0DD5h1KCISOn7ewszId5abincFU2iMPbndAMpKDid1ZheFQDZHvA2T/w== 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=qfCIR1Ma6vMCpB/p0Ci/xKLwst97kUe2KR25BTAs42yWJnfJUIayLpynKDEiqfktbggSjJdiFyQQ0hJUEZ3hB2eHvHf3i/N30YiCuBwYGYzmK5JfHCUg7Fs52728absdJxrRv/QsrQX9phatmygjg88Fm/qeeknK2ZeknoWGbpU= 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 DB7PR04MB5995.eurprd04.prod.outlook.com (2603:10a6:10:8e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.26; Wed, 21 Oct 2020 13:15:41 +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 13:15:41 +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 V2 1/5] clk: imx: add imx8m_clk_hw_composite_bus_critical Date: Wed, 21 Oct 2020 21:10:16 +0800 Message-Id: <1603285820-30196-2-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> References: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 13:15:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9e0d51d3-0778-4119-446f-08d875c368c3 X-MS-TrafficTypeDiagnostic: DB7PR04MB5995: 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: iHRvJMQVSWP3mnSUP29JpOA861PyEMo+cCKlza5FOVGLoQlC5m3QX3IdBl2UolqbIKBHs3s/JW1m09vPP7iySK9KxXJpYKEQicBH24srLCswZ9Woqk6KEIWhwlEhIZnZP/5Q74oBjgaMYcDSQ+kFsZMaT7mi8PY4bV9a9BW8ZzrzpV0Pk89Dd4vPa6pEea1WYHZOqSHijEKPZ75wNMHfwjz+5yL4TXUzXRUBUZNBjvcdgNrHMmdj/cSGNIZKsgpO2x19sPcg55N9Y9Ej5QijZsZsBX/RLwT73fhxR+3ZyOQktKGocXaAxjkcBM+SBt88S/jc1KMnQZs3J1doHWgvnBeiqxt+EhIJB9mZWl7yySSrz5mXtYA5+pdN8dR5AB2v 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)(346002)(136003)(39860400002)(366004)(8936002)(5660300002)(66946007)(4326008)(478600001)(316002)(8676002)(36756003)(66556008)(66476007)(52116002)(86362001)(4744005)(6506007)(2906002)(2616005)(83380400001)(956004)(9686003)(6512007)(6666004)(186003)(16526019)(26005)(69590400008)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: rvvodbtUrb37CxQf1X1SAKRolctnZpl1oHmkxNCEq5kuqh/so9e+OSQfcTjvoQeTpSTyQeAkiRLSnM8TmHclsZWKzVXV54mpNmGLVs2G4iFx9DWJenqEe7X2NaoOEA2tGTkm75B6SiQ253H6r1Mcn2ybIP/gdXa3Ld3Ypw3WZRXc1c8z8WYd9Z06aYpIAelDdo7t9T2MDHq0OCGhNsAFXUXNpTI8UGv3351iuKAgUhPsrlhTcRlx1clh44MBlNidUI3nUEtWKOhVGYGkYJXTMe46/z5JArwFAbgpTUvAgZg0i41pDaPsv202JCXLAFVdjp0ZtPDWaRjswWQpIkkZmVKhY9ODZF7/C5d9rudJg2IjICpaiMHLL0dXrm1aoMnl4rkaDmxfmd3gXnn2sQSMwWttioiC+nNKmpgbd4vAmU67CubwMGsaKxfcucaw1TnnsJv86qn0/Ff3GNa02ct1SOYbSZ0hz2hobcrs7TB/aDrEQFussDS5tzrBReFjTXfYe4rOkr3GFrGc+4iIWYLYnCemTU5iS8XftUlDa9M8bl4ihChD0qUrHUWlYcB2pFz0nIDoFhprVivLWudEDGrBLMgUZsrXuyHe/oweRBYXqlwFm2d2M4lstgjno7b2H1o1hPLsnMvFftSZJ9QBBAVPbQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e0d51d3-0778-4119-446f-08d875c368c3 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 13:15:41.4472 (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: jcZSCqYsjF6LcmTb19Uxe+VdrMwCX4OnUZPwEyNtx3wUpeBQ7WhJSHKPmswjh+/PSsHs49wpYwtBOgde/SZSoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5995 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 13:10:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11849069 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=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 61CB2C55178 for ; Wed, 21 Oct 2020 13:15:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F2F7222C8 for ; Wed, 21 Oct 2020 13:15:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="a6aO+vGi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442910AbgJUNPu (ORCPT ); Wed, 21 Oct 2020 09:15:50 -0400 Received: from mail-eopbgr50073.outbound.protection.outlook.com ([40.107.5.73]:32194 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2442908AbgJUNPu (ORCPT ); Wed, 21 Oct 2020 09:15:50 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kwCg/RQsYTFKyuzRlHoAkR5SxSj1rTDqMn3Dm+m/g6hMzZHTdtxczSbwN4A3gi4xYXqlIMZ4jImQLwYynsKiBsUC027n0WkiiUpgIlZzSUUzbx1kU8HUdgPgrp3xo6anEAMop6jqiYlMBTDvTqzJN8M56HMSlEyXmEGaygPk71TZHZe0h6nFGejYIUkG6KXmKH5fuznyuhBsyRCVZ0V/8fwl/0RlS2jqekeWD0pouSo9JOmJJ1fl9d8hz0tYZu2FOzCjRgOSlEQiQPYP1HRAUnv3kNt0vFaiGO/+vi1+m0fYCpW5HXIlusQzB8T1XdiA5DnfXtvbZdv0n/PceTTI5Q== 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=UjD3KvsweV+X/J/voD1lUlzo2SkBgO4uCN5NhR/QpNaFL27nZhH44glvqz88/ZebfMk5XG+c4zM7e5oUVTNep0C6qsqxdEouyLgY9eyPY9iqErxJ6cuzy+1gnD8cz9Mni53Q3istq4vNp7IJLD1RYwdnvpq/TmdbUXTJruZvp6LCIbEh01eE0t34UKTJZVDvcP0/N5JP5a4SlAlx06SgVuT9KYKEJdpbInP5+IHp5NLp8vaNnEjttMGyUAqRVm5Zj7n09Qyccp63UhrOhA6AHoCWlYoh9hp+R+98frdl64xXuNFQ5RDNTKxWs7dLDc2t1eMZUzE9ZubOI4t+PdzfDw== 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=a6aO+vGiIb8+TNVm0gGDQE3GiC59LTSpmN6J9OkIlcMlk8Jr49EUSFO9pnLC/MfGruTkm05ERfGmXYUYVfLUYMGestjudB2Pva2cm818MFiTB/3PcNBMzTSE0bnDaToAGE1lorEolj4fmyin7eeLxsy2Hf33vnrZQ1FeMxXDRjI= 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 DB7PR04MB5995.eurprd04.prod.outlook.com (2603:10a6:10:8e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.26; Wed, 21 Oct 2020 13:15:45 +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 13:15:45 +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 V2 2/5] clk: imx8mq: fix noc and noc_io registration Date: Wed, 21 Oct 2020 21:10:17 +0800 Message-Id: <1603285820-30196-3-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> References: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 13:15:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5b9384ed-6322-43d3-efd5-08d875c36b6b X-MS-TrafficTypeDiagnostic: DB7PR04MB5995: 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: QXyROQqc6xUnsldDpEueOFti5N+mZWOrVNmyOglMQYde77OV36gpQQQQCnXil5igeYk5uBlNV67piXqtmrmEK51/hpJHJKV4rWMjNLMfUPdfS8QChCyiQUSfFywzomRRa9Gd/c9nyKh+uMCnkwAtaTdlAZMslDh/MUUQwz3OFDKh4QIKBl8WteXdz6D1xKI8H9DP7V3dtUqfxd+Tu2+JdxhbqZt5XsDJXMbdZW0KYvTBCCf7aE+LaVKngeFqQ9vYFpVl8lHZzMdh1wYLLrvNljT/P9A54aIf5Gdz0SU4ryPvU/PRVuzEfQO7mjXAxGZrLRUOBia7Sx/JEhqKbFbHCilHBEayN2i4fwcV5NrK5vGgNBdJ4cVQU57Dgqox9mFY55iPK67noRdnMvLNdmOfxUs+I02A5jl1RdTYZeXhbco= 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)(346002)(136003)(39860400002)(366004)(8936002)(5660300002)(66946007)(4326008)(478600001)(316002)(8676002)(36756003)(66556008)(66476007)(52116002)(86362001)(6506007)(2906002)(2616005)(83380400001)(956004)(9686003)(6512007)(6666004)(186003)(16526019)(26005)(69590400008)(6486002)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: PBrZhh2ItwrYG1EOCkc10i2n9hC1W9BDmnm+PNZXXL3B6kF3mLWC6zkk24IVe334fLwBCVJeQmdlHpSeihXz0DnXOEeRJlA1DDUZg5LKCezih3cHaXCTUxzru5dCJNUdCCIlv32ibQlB3FJCA2wqdXLIg2qzRNjlXkdbEac5Ch2MWkmO9ZybIwGdiVWvbNUWvKAE/MB2XS2RJuIUVaXpSjhbxFZjzOc9T9bjHwibNxPGpsCXMyakFC1Vhk3qAPQ3Ya7Y+/cxuWWiBD0O1Z7B6Z2m23/DgCoLNSgLOK2QzY+8Mtsk4fky8p/YtGKC1M0xEBp9/okbXSSrF2wLMfRaBpFoRfxGoPSTFVmgilEHIww1Y29jgMctlp8uUl3CYxI7XDbHRLME6DpmN9I3g8DJgSxXZWZoNAQqN6dSDVLNIpotRGNUndzvhxYVF4TpN0Hap7QxpxDuKH5Kp7Npj3L28fMgMscot82zKhsRWVmJlay44IdsVpDY3myTp1R5ecx12adbrDSBxDbSkdSQRJ2bEf9pVdgbIMetQk5xYYfNR+eetm9IdiX+NoXqR3YcVTgG/x+vt3HA7tLFHLZVZfSTwchOc+7Abx9P2fHPw4H3WG1ARmN2k3wT1vh9GW0ZnU0tJYnZDLlnEjVcEwkTI+htGQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b9384ed-6322-43d3-efd5-08d875c36b6b X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 13:15:45.8381 (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: QqUMmeV0n3EgK15yX8sdG3AL4QJ15Lg/bsplnzG2izcetqNIMOcJ+xhu6gFWvYza19mVE2RxCJfJ1S3DGKWYjw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5995 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 13:10:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11849065 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 B1DD3C55179 for ; Wed, 21 Oct 2020 13:15:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 473C722249 for ; Wed, 21 Oct 2020 13:15:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="ehObfFo0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442921AbgJUNPy (ORCPT ); Wed, 21 Oct 2020 09:15:54 -0400 Received: from mail-vi1eur05on2045.outbound.protection.outlook.com ([40.107.21.45]:62689 "EHLO EUR05-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2442918AbgJUNPy (ORCPT ); Wed, 21 Oct 2020 09:15:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WCrV0fPB7XUANdjJhxNMPZA0wWnt6mPJCtysfjqKjSFTQ+I7RLUf6uYMqbtPqtx7W6ltrOwOlfavXq0KX8z/+sdU2zcGtBQa6l7QcZyGulPXQPpZ0CqQVY15dR5tBf1zyy+DFvQAV1+a5NSfnmsvLbnYy3gkOuW0LFWhN3Krq3k9yxAIEj1tH/FuJCqYCL7VO5rZqEUQr2gu1LZHjxEAbZwGK6LVo2zYRgHcewJlsMkkVrqu0rZaM25cohLBXOI7ukvnXXcZKDMEPNi7toH96Y2Y+YbzkHPuxDlYKl2Kt4qivXcwZn14dX8HgDvz0K6GP3CDCOdEZWBDp7wVEI3cWg== 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=WWv3iq21sfgMYm5gJqhPyFu/A7USMUDkVUjqe89GodIhk2R9mgbutfe9JpNMexQfF2Zl6bWW6c99+SMcjjUP/TnejB8BRXGAguZ7BFX13ijo5oMQ9MtJdC7oOKZ7MPZPWbeiLM/ZHWiIOJHDvSrHvLmUt7DEeXAr9dho/mdK6FyfbOpDkbYkOaQCCZ4PZF2UPT9Mo11pcmB5TdYK+b9FfYHHv6+sxSZv3qcH/qPxMyUEJZMAqqCKVaG51L/o0mEO0765hQoBCRDze1vd0nJq2BDvB8NYQbNScfY6gIjTAuz511Q9QHyRvu5KCsO6h8mP78N30kZ5Vx4eXCl5J5nolw== 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=ehObfFo0QAsr9RqP6AZK+5GZ+pg8aalVvmNY0zETA/LkttoyJO6sQY7mG1Dsf61dflotvdi/7lKsfc/6k7AsJV2Wxgb1cEn2oc/asgkeeU3G4IDWIrSKEKcYCYwI53nlLhElUpiYi3r3L/2YavUk5IluS5OazTi4FENuhL32R6I= 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 DB7PR04MB5995.eurprd04.prod.outlook.com (2603:10a6:10:8e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.26; Wed, 21 Oct 2020 13:15:50 +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 13:15:50 +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 V2 3/5] clk: imx8mm: fix bus critical clk registration Date: Wed, 21 Oct 2020 21:10:18 +0800 Message-Id: <1603285820-30196-4-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> References: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 13:15:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e0277f33-0d52-4b23-dc12-08d875c36e1a X-MS-TrafficTypeDiagnostic: DB7PR04MB5995: 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: uJaf7ZQk4mhIwpNmq+WrKb7H6w3e9JwmlKboKaZtK7EotNrRzcPAqS8lt0+6+v49eNYn5ud5P2GQYLwJyGAAd8Hh/sW+lZH5N4wu+WHDvhZStFfagvKy2U+OIYff2z7CpxFW6w6FyuEvOOQ/rfogyX1B8rH3OuNRIBFAEVc6XYBnsmipFni7D3JFjJe15qiDaEov1poiNg3h+zVx1H5I80JjdznIJJCfA1VFe/Wveg8CpqaLkRcwwS2LkMlvrgki5/6uKvRYnBHdHaQNbzvLRCtWGGz6jPOxjJq0rbaJUOoL210LbFzLMWkQwZKMut3+zuTmMphIZUfjzhPUfsQUIFcO44A8Z4yqbNWQAM3zw3zKooAhGTJ1tjMcUjN2tQUeTylL/4qrU8IryZpUAidu/uBP9aJ1+ttyHTFrRoUZBI0= 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)(346002)(136003)(39860400002)(366004)(8936002)(5660300002)(66946007)(4326008)(478600001)(316002)(8676002)(36756003)(66556008)(66476007)(52116002)(86362001)(6506007)(2906002)(2616005)(83380400001)(956004)(9686003)(6512007)(6666004)(186003)(16526019)(26005)(69590400008)(6486002)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 1xjxCNZleH8w9hzsfQf6yRv4yIt0ncCHlKfRdsSBJf8EX7xiBaNoyXEA7RprCgtEsSdZ2xeh8xFexeU/SF3ykw47K328Dh6cIh1pcTeLQMLh/KP1DT/V74+mlyIWcdR8naQNa7M4Srb1+4hgPq4DPmmWdcVkEL4ShXblaSWTmldYGJjO4VOQgI+39lCPsyGLRPV3qMdSUEmBfatmXyGdJA2/ScPB4smkszgOg5//w1IdaXaX+7CuoqWoTHMJnJpLy4pqbdB02Oqg4qAXSVkpsPxGMkz7oNKwIRs35vRfXi+wdRcom0p6bVMohFetlwAj4/QtQAmDwwKV+oAEUc0OTrhTfH3yh3Pmz7GJwPEb+rZx+2DANkSWeKMnYOUHRySWD1L4dZcg5fONjPwjGXu1eU0dWhsKvW8SpVajZNToh+b//HDbYRQRVZ5P4GgVYZUhCIStjw2JQxDrqHO7YUxTk1XcsYY78kI2Zwz5KFmDV3oieKqrtbnpmWIvXPPMr7kV0t/VCWvmOf1JYtIazZK8qZpRy7c8EvG+uMfCnindni0JwD+3K3if3HqFeOKQ7nqfjQGl7XM6gFfnz3j9VeYug5pV+Y5PNt9Ue5qZdCAzdWJwayld5rK66Vqk7TKypzVBp1vEyVrE9sOn/pBcV9x/9g== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0277f33-0d52-4b23-dc12-08d875c36e1a X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 13:15:50.1950 (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: 8MJV5AO2TrIdhBCMhxzaX+Y+4342mQah9s2p5bAjuReUZImc43/8/OfbAy0ZkQLpWq+wXAncEmlxTVzeM7ppXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5995 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 13:10:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11849059 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 9520FC55178 for ; Wed, 21 Oct 2020 13:16:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3083A22249 for ; Wed, 21 Oct 2020 13:16:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="NtbtICZ0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437433AbgJUNP7 (ORCPT ); Wed, 21 Oct 2020 09:15:59 -0400 Received: from mail-eopbgr50079.outbound.protection.outlook.com ([40.107.5.79]:40069 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2442927AbgJUNP7 (ORCPT ); Wed, 21 Oct 2020 09:15:59 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fjAUswF5CUgy0Aosv6cRDLnjQCDo7AlijejxQibwNlOCw2b/w7k2oVpPWRUcsm2XBGnjN4BV73POXxJXP8i2uxGZGxb/UdsA28rzN6nypqdEEbY/V/cbTSKgwV+9MOx/VFzWZGRA71G41jXdlyjTeTjjkrydyTnr7rTFYGu7rQ78V3FcBekqL/E+Y8T1naLRQt89NDLbjdGJMXy52/PCnshYTbqhjzsF12HmvdTzHCys62m/QoicvliyrusyDNzr/ehcrhZg++RQoRnNDLco2k4f11R7Cq5tNVnxrJocDifBVzqaHGkICTl6l+Dd065JznsGGHjJ3pE74MLHivnLiA== 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=DTrn4oneyJmT2ZnGtgWuaVTPQScsGVXT12mWTofVcoxdyI9xbAQwE1kBQyFEGs+OkrqQlSeE97byTEgBYi1BQeTZilx9uvPriIUVp4WuSmw3gfbTckt1DMmVDqG5+JKPG+CeSQedzNwzQYigDEnChPfrjMKJWTirt19kEd7lslv0eXpqN7DX7XKRQjC+Q0iq8TOnEPrqSev/tDSZd8pxS5gYAr+Dg1Zm7/I1kHyoAqn6c3yfhtlS1FKNZEhSyTnIwyANULnpcAVEKZ0I6JBFdQr5lO00Xk3fdrDBTUzfjasGmdEFnIEyiRkmFO9zEKUs2WwFMj+fCQoJTj7h6PUHuw== 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=NtbtICZ0lDInyLtQzlpE/o82i2h/q9MjnU+EVRk9MRAzCMEFq1ZMbQfHYj1/7eElwb4/UxCxZOEa1WRro8m7RWgdjkIWyrhFOyUJo0qlmXXe1ASGEtoVVvKGypqXYWp49Ddc7LkanCg44MUoMFGznMOsWZQcNbJrSLW3B9ILY8k= 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 DB7PR04MB5995.eurprd04.prod.outlook.com (2603:10a6:10:8e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.26; Wed, 21 Oct 2020 13:15:54 +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 13:15:54 +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 V2 4/5] clk: imx8mn: fix bus critical clk registration Date: Wed, 21 Oct 2020 21:10:19 +0800 Message-Id: <1603285820-30196-5-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> References: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 13:15:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9e7610d9-ed8b-4f9b-59e6-08d875c3709a X-MS-TrafficTypeDiagnostic: DB7PR04MB5995: 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: usRcTucXWYA+Kc4KLtZpalq0IXr4eS7ZMmMS3WlPK/NIQfdb3u87CQOZjtB+3tIZyw8mXa0vJGeZaG3PsaV4ZBDMWetgdNX/uVQHBKGJHxmm+IzE7R+oqofge0LRAYrU6AAzWROP6XbTm6QEWYunUQoEtssF6IB6jdCRSOQmhnUFz7miO67K0gB7DkFsxzsSOImH4qDW5vf3+cuWQ5fy8nuxRU8ZmjDZYhnlIQr1u41yYl3J8xwdCZs+2A9ZP8Jl00fuYLDjfQhHySxOuQs+hEZi+nhJXHYka9qQMC2UAP9nOormx90smHJR9H/y29NMV8WP6Y68OfBCJHIwbTcOqhREwyTQgBEE1zV0Wgz4ctq5mwCXTP2+5PagfumhD9C+LGaPl/789QmWSHT9cmkiG0B1+E5pABfUSbwHWdSs20A= 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)(346002)(136003)(39860400002)(366004)(8936002)(5660300002)(66946007)(4326008)(478600001)(316002)(8676002)(36756003)(66556008)(66476007)(52116002)(86362001)(6506007)(2906002)(2616005)(83380400001)(956004)(9686003)(6512007)(6666004)(186003)(16526019)(26005)(69590400008)(6486002)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: pqLlaIw6eodKONHoW37mYyOxfuiwlFnB0FDp8FbH/J6BpUk22TczjZkK51qh1SFRNyPm2hqz6BmhlClmG6PkazwAO1i/pgpfStVM78i24MiWlNpdF8gte5hyy8j7niY+ovmQhyQJoIBto1M24YsMKCU687Ed5vlDJ4s2VSoU/T2z3HVCruuRJwl4C3nVvIxYR62ZH26wFQcpW2uXj8k+OJXbcnndP8EckIkTRJ52a8Gt3/Rx5RD+ut33osFKbm8jwqE8Q1yncw3Rw7AZplcHRElRiVXW7qVTPKhSiYkUktru9hgDxe1QnJIMKrOSMTGenRpH4v7B8ZZ6zrWHTqV3sg7svynu7yFWY3DzOmGlWcugoZO2nxPJYutESPqLH61qr4p3VqhqRdB90BrxxLfCBHiM7ccCTIeg8LYXcVYYucOcDj6wnip/I63vmFu7kYBjGODhaRS0wqstDAedGi918qDxmHVX/WQt5r5yV7XFtcBrAvmnTlJ+QtrBnI23fIpHEzwaqSyf+xSm3sC18WTkAMq+U/z1t2ANY/YUnY9xXNI9ArUQ/ayqspiUx73SrwVXTrxFAppf0m77PJPlt0nc89xyGV54RiQAuYQ/0KAg9A62NwlJ3waFcg9oj0stwucogiXkOZm6A0M7fJhJfi0KNg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e7610d9-ed8b-4f9b-59e6-08d875c3709a X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 13:15:54.3910 (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: 5lOdLdtANWSiJast+iYdw0ISh0dKDm+80FXTAP2WnsjBT5Fi7delvGBKxKpwSXFJr4ud3YQSWP4ixWY+7XlQWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5995 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 13:10:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11849067 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 16CADC55178 for ; Wed, 21 Oct 2020 13:16:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A9AF220936 for ; Wed, 21 Oct 2020 13:16:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="ntlWMLKu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388975AbgJUNQE (ORCPT ); Wed, 21 Oct 2020 09:16:04 -0400 Received: from mail-vi1eur05on2059.outbound.protection.outlook.com ([40.107.21.59]:64352 "EHLO EUR05-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2442927AbgJUNQC (ORCPT ); Wed, 21 Oct 2020 09:16:02 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T+5zvQR8AIZfHrJjGH/KFUJ9ki2sn+q1gXmd50esG8QXo2EYTS38wE5UuEhXQtWlqfXzetfJEunk4H/KPY/MZKBoCricJgtZIYc3/6LJvIC/ZXlKw+rU2giuIsst5cPLVIsk70K0BARwTRfwjMEXDxy34XSGdql3aWoyKNcy06uUcuIU0U0DAg3nJkSna16lAiFGlAm92NWQJXFt+02Z9cJ4ShiyqkcGWdIkvuNfgbueAuTCDuHeXRb5WIKCWOwLzmIVnYOkACEhCfddliqVNwPqVDKcf2eUlUDrjJusSfrpDu8fK1/RGLsAxz3eCKiIDJv0+qL3u4xVv2DSPjU1XA== 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=AApUwBG0Bdhg26tx3Zcrd5AtDSfcyjYdxh/pRBQbdcSKXqTgMxUyYud5KxWpuLLzTSn3amOrt1jJwfeUSYKaRX/rtHWLrI1cX4JobwKmwAFTSdoZXVatPqpg2U8opPINf1I2BMLhrSLGowH/RJfDJe02AZ8Z3YN8rMjsUzJLzEjSQiVXFdT/UrThH4DaoF6+VfqTVssO/xYBzPO6jBH+fIfcgjc8S7e3TIo7vEQQiFhxlce2YQqAdkjlnX6VGIW8JkqF02i+fDra0SzZh2vjPG3PUFc1Kegk3BUOzO4f+siw+2Atpjqd9kMGlXxg3PD5rgCd8letjTAwtFOoj7ri/Q== 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=ntlWMLKuJsRtX5iRA3XE1yqvGnDl2k+KeMoMOO/vWXxnsTibk8+wjn3Fw4cQcL5Hsre7RbwnLx0VM5XlnmrVhfk1nnPiznWzriCCQllQ8TikrFIr8fWU5FSjozErNyPQYMoiq6oADDkaxKR7xHBm7+MwmONbzu7B9dRloof0o1U= 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 DB7PR04MB5995.eurprd04.prod.outlook.com (2603:10a6:10:8e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.26; Wed, 21 Oct 2020 13:15:59 +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 13:15:59 +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 V2 5/5] clk: imx8mp: fix bus critical clk registration Date: Wed, 21 Oct 2020 21:10:20 +0800 Message-Id: <1603285820-30196-6-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> References: <1603285820-30196-1-git-send-email-peng.fan@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 SG2PR03CA0133.apcprd03.prod.outlook.com (2603:1096:4:c8::6) 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 13:15:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 51980df7-d314-45c3-a7df-08d875c3731d X-MS-TrafficTypeDiagnostic: DB7PR04MB5995: 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: 2Zj3dUSGz8TQGeGVKO07HCIp7Y5G56urXmxj/+xQIaIhc+Sppbd4OfrLKe406cO94TuB4h/+MBXMlKJ5vkEPMeOaKcbFMGeJniPGAJ0UZwV3PlQG1tGPdoecXVhPPzJCjIvugsSLrh5irUCXHWV9uihqe5f49RWWNO1DVbysblVH1tmEm/r769ANyGRdR2IECWf08i78XU1c63WRyHvVcGUUaIk+3lg0ptfehdnFfH+pIVTmyPLnScDVhqIVGdhsFpPHwBZjIC3/MGjf+aDbteaWnJM2AsF9Ih/LZWgIRRoeEK78et3YdyQLSqKMumD4aKI9eKGCSAtHEtBshFZoCsEN1qo2SgaTqGfVfdbHY7pWRslFUVok/g9m8T3R5GEbnU9CwHEwYsjMSwKekiMcPpyFVna0/2e7W9PpXXWqVzs= 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)(346002)(136003)(39860400002)(366004)(8936002)(5660300002)(66946007)(4326008)(478600001)(316002)(8676002)(36756003)(66556008)(66476007)(52116002)(86362001)(6506007)(2906002)(2616005)(83380400001)(956004)(9686003)(6512007)(6666004)(186003)(16526019)(26005)(69590400008)(6486002)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 8Lroq1MhGyTaHt9BsRIxBe7qv6ry3uVW3mpu+q1KHX0ovwalkNGCiwnbxoSRdAqWmpzV1otLALHQ0ctsyG2V9luEch0JMMlU+IP04U2LLwAu+m18ph15rOenVHOufVw6PfTbFxEMKkV/O7+dUVindJDK9oJhViwylR9QfYIwgVQ45eDT2CHAK32uTQ6/XYRqBKqxNhSIvPNgCwzjhaPoIU//1YIt8umhtB4K9wOteQidYE9SMciZWN4X0p0qRdasH5IPZl1Y15bdx7MvzMTeIQfZn6Z0eoyvtLC06VsoPmu5uPEZMXyC0kfoCZU9viS/5xxvddSquT05uAssg4e3cUwtV0J0uS/TtybqjGssy8bx16mWWufru7VHwBN6L/V8j0PaRGDxP2PUcSW8jCZ5aMXNpfde/SpKKwYeBk3hviWzkdMDPdkmcWCC4sYHV4zyFJ1HIqIMHurGFzZjRQSEy1aDEWUA0AV65aZa6wbGZc1jZsKMiB+33BgPjJvhMLgh+dg7AcCnAK8Kmv5zkvhsMc5HM7tnONlCMx/6tC/+o1RY5ZTek6QUOB3j+llyTAcFl1BFrfTWNE4ERGO+ponIrv1ZmqjWKqCvIzuYEDscDA9huI+ivRCU3NljY/5aTM3O2CAC76gKjbgGDXb9/Z/fFQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51980df7-d314-45c3-a7df-08d875c3731d X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 13:15:58.9418 (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: YSLSyP6Qve0nUYlIg5Jsm6CedyKB64UXGaiPX5LY+aZyQ6NlhHVhGdyL42wl88soGeNLEVO4QShfhqRAEoNqew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5995 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);