From patchwork Tue Jan 25 08:52:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 12723424 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E3AE3C433EF for ; Tue, 25 Jan 2022 08:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=If84BG10THBl7/Ux5DrP7n58JarCqh2zFzCjswBjPCk=; b=0RsmfOtsJRux1g YGmZxMLejEqll/TsuML8Whq+tW3tP30vszgWs/6U5d1aqQA3f77hqc63goKMnWFxoMkf9CgytKiNl 7aP352KUw7SlUNFxzLFQ1XUw1IwG022Flnar2SNCLXmaIyMV9LdT5DMdr0UiP5soHljtmEqOu+P5l qM0mdNlwh65vAsqpCwpgCK99VyM3wxJgKGLXjZFbabYCsf+LyhwvqnqPv1+aI1Plx9bftMSE4Sn9V EVGVdJtKvfy2RveNWOzfSfJHhIMMc9KHEC4nF8L/KR7VAfhPL7aUEk+beYPz8WtlRd1aog6I3RVNd ogws1jUA2hyJHWGmTYHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHZb-006u06-PA; Tue, 25 Jan 2022 08:53:08 +0000 Received: from mail-vi1eur05on2115.outbound.protection.outlook.com ([40.107.21.115] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHZY-006tzQ-0K for linux-arm-kernel@lists.infradead.org; Tue, 25 Jan 2022 08:53:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lE3leHl187t6NbQ7/vmX4qQcaYzLWN8W9jTAPHovcIhskS+5B7vUMqorWlEHpsWO3Gl50FNC0Ckl/PaJGx+Xgh2NnN12SNa6/JQU+BP5/GDutWILFg534yc9EySwpADeN1xofVsUlHIIjp90GUgahhJePpy8QVpFpy/wWHV00LK0+4f9ZY3fN6DoUTwvYk54RP+NmZK0mDRWXBidYdd95tMFnuv75hZcvxhavxsG/HmC60CBvr3y0hYg1i8FomDyoOJyvBOgNGBJD0bg6OAlKI0ujIZRoaEjoIVgteOVzf2UMN9AvgeKQIPgi0kHYUUJ8gEN9Mf7IReQisvrYaX6dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=95tvLBYtNx6EZinWxIaRXkWwHcP0exDvIX5U712Wm0U=; b=aK2NBrvsfCcjFRrJpqmd3PB59RoLpZSucnQRt9feAMPHd0m5CKP0J0kvJjE7jeBesoGW6uUayXYUurq0i8lk3SlPEDi0ZaoHZZcX0gpfPVqlpUjuXGjp25wvdTap0dELEy/vewGSX3K1+NYQgDiQ8IxKhA6wwj6TaIucB/TjUzi7rWmEbnR7zyms6z8uiCY1LPh/zx3kF3U9I7lmp/9jAQb+djVd6s9hLHsibKNUXV+nV9a0XruO2tUcGavKDbeOU+YOT8rOdUA8mZXvZkxvBoiDyMmvnMa0TSdI6TlCLL7UryV+2zdp4Dtz4Q2puItxwnMaDSgWa+xLga2qZ6aelg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 217.111.95.66) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=arri.de; dmarc=none action=none header.from=arri.de; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arrigroup.onmicrosoft.com; s=selector1-arrigroup-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=95tvLBYtNx6EZinWxIaRXkWwHcP0exDvIX5U712Wm0U=; b=VHNR+2WbSI5ULV6vIE/sc+9ioCpm/TbkDr0FneirIEwMaS9ePQ19DsIiFT69qrAwHxKFFeuRvMF7cWpMc7FcUkPQpAjyfAG8Iz8FCu1gtCxwHo139y8aGP1TA8rpJmXbkJ3YUkO6ZTPXzY/CyPThlNx/krN9vBFx1iBPJosjPoc= Received: from AM0PR03CA0031.eurprd03.prod.outlook.com (2603:10a6:208:14::44) by PR3PR07MB8066.eurprd07.prod.outlook.com (2603:10a6:102:14d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.6; Tue, 25 Jan 2022 08:53:00 +0000 Received: from VE1EUR02FT054.eop-EUR02.prod.protection.outlook.com (2603:10a6:208:14:cafe::43) by AM0PR03CA0031.outlook.office365.com (2603:10a6:208:14::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.19 via Frontend Transport; Tue, 25 Jan 2022 08:53:00 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 217.111.95.66) smtp.mailfrom=arri.de; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arri.de; Received-SPF: Fail (protection.outlook.com: domain of arri.de does not designate 217.111.95.66 as permitted sender) receiver=protection.outlook.com; client-ip=217.111.95.66; helo=mta.arri.de; Received: from mta.arri.de (217.111.95.66) by VE1EUR02FT054.mail.protection.outlook.com (10.152.13.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4909.7 via Frontend Transport; Tue, 25 Jan 2022 08:52:59 +0000 Received: from localhost.de (192.168.54.129) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.498.0; Tue, 25 Jan 2022 09:52:59 +0100 From: Christian Eggers To: Abel Vesa CC: Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , , , , Stefan Riedmueller , Christian Eggers Subject: [PATCH 1/6] clk: imx6ul: disable gpmi_io clock before changing parent clock Date: Tue, 25 Jan 2022 09:52:01 +0100 Message-ID: <20220125085206.8508-2-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125085206.8508-1-ceggers@arri.de> References: <20220125085206.8508-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33be8509-9ec0-499f-bb56-08d9dfe01705 X-MS-TrafficTypeDiagnostic: PR3PR07MB8066:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YIy3D42itvJOPS+P8n53vK2Hya3uHOqAknQvXVYqBAJQ1DgoJc3HO0v+ufD2T1w23rIdTyHXjAL5vUBLISmrbgjfCxKNkxaabKFLRMfzV0JPqNFKQA2fdaMiWilz6jqoszJHRRbglol4zOiyT763R75i5PzkuiFmfmbLhjwBVjHOrG1zwRUY7jxGw4t069L5SUDAoPwRpkFY52NyOaWhWBQ943RpqCwKXHJwa93oVWFY67WRRirHm4cCD47mHcrekG8yMvRHZQfia01RMSbOAcfUjHU13Cm7BzfgHObq1or5OSzt3+XuO/Onl+qwdagAD2qgAzEGFCn4fnP/41NbsE0lJQlF2hLYxiHo1fTrh6wa+KGMvJ21awr7mq6cVu3k0cejdSejzKS/qxyWdWkzRwKgRZVTOKijQUsSFtCxi9obYjwqQGqfVIBNcJe3zASvQfRD2Lcz7YXtwciWrCea+xe6V5ZIkhDLeb3/+zfITEtBUUB032WwdrRdpM23KehkthVz9YxFNft1h3ca2IvSdRy83WnxU4UpvGPNxBp52zYpV7fhLWbqaKUYvWiGBi93DE07fHM9O2MZDWVCWQphO0q50CC1GfpQ1XK4YRjYdyWQtnm5wTznqAyECAO26MQWgWbFSY1oExYIGHLvjOD9E3g5veJ+p72TfLutDmeoz43MkHWrG6lalpj3WvTErypjimGOvUV/2EsvuWOigxp5JQXvIYsWrjx4aBYr+Xnkn9s= X-Forefront-Antispam-Report: CIP:217.111.95.66; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mta.arri.de; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(426003)(36756003)(36860700001)(86362001)(70586007)(2906002)(6666004)(16526019)(336012)(4326008)(186003)(26005)(1076003)(70206006)(2616005)(6862004)(82310400004)(107886003)(8676002)(356005)(81166007)(83380400001)(8936002)(508600001)(316002)(40460700003)(47076005)(5660300002)(54906003)(32563001)(36900700001)(20210929001); DIR:OUT; SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 08:52:59.9056 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33be8509-9ec0-499f-bb56-08d9dfe01705 X-MS-Exchange-CrossTenant-Id: e6a73a5a-614d-4c51-b3e3-53b660a9433a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e6a73a5a-614d-4c51-b3e3-53b660a9433a; Ip=[217.111.95.66]; Helo=[mta.arri.de] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT054.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR07MB8066 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220125_005304_077774_629380BE X-CRM114-Status: GOOD ( 10.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org gpmi_io clock may have been enabled by the boot loader. All children of enfc_clk_root must be gated in order to prevent glitches during parent change. Signed-off-by: Christian Eggers --- drivers/clk/imx/clk-imx6ul.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index 520b100bff4b..f599ae50dd9f 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -514,6 +514,15 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) else if (clk_on_imx6ull()) clk_set_parent(hws[IMX6ULL_CLK_EPDC_PRE_SEL]->clk, hws[IMX6UL_CLK_PLL3_PFD2]->clk); + /* + * gpmi_io clock may have been enabled by the boot loader. All children of + * enfc_clk_root must be gated in order to prevent glitches during parent + * change. The task of re-enabling is left to the gpmi-nand driver. + */ + if (clk_hw_is_enabled(hws[IMX6UL_CLK_GPMI_IO])) { + clk_prepare_enable(hws[IMX6UL_CLK_GPMI_IO]->clk); + clk_disable_unprepare(hws[IMX6UL_CLK_GPMI_IO]->clk); + } clk_set_parent(hws[IMX6UL_CLK_ENFC_SEL]->clk, hws[IMX6UL_CLK_PLL2_PFD2]->clk); } From patchwork Tue Jan 25 08:52:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 12723425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 124A3C433EF for ; Tue, 25 Jan 2022 08:54:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ER+w+cGjpnQgw6cPIpDxfzBIKdqjtElS8pVUfbPsl+I=; b=txXKJ93FShLDvT q1czCO9QCFsxC7vWWIpD1+YssmZ6CYMHB7/cedCpi4bYG/bvsqD0zdzZdYbIx1soT5acKDaEOWK0k JvwqCCaKewGyKY7f9uHzu5p5329R+yy94mEfqK4Xk3BuJRGZXuYHPPq5vqyCIZ27m1O+F8IoDzr+J WXzLy2eNUX7WKjYYor7O96zY58kJ6/anJfvIivlO2OSoGcaYvhiDHEX+LCqOpyJLDtVpCaFw64e2m BMcVPmTtKkM6UZnzc5ACim2Qsj7RHn+limOPlOGd1hrSOdDf33m9P1F9MoHV+EPK60aXgzeCRQcR3 MY4a2j/QKUirwoP/xNEw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHZr-006u3j-Pg; Tue, 25 Jan 2022 08:53:24 +0000 Received: from mail-eopbgr80133.outbound.protection.outlook.com ([40.107.8.133] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHZa-006tzu-Rq for linux-arm-kernel@lists.infradead.org; Tue, 25 Jan 2022 08:53:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xn8cynacdXU81UpPhgUb8c9uMbeP2Ll/zAI7nmv79gVB828yG+q0z1OFGM3/hbIWfq0p2evQM6dYGz6USMGgWuA+DSV9hqle1Z2Bij5YcU0iLARt+OFtahb4QWECxUQru5jlZg1DACYV0qnV4j8ZUCWwIoa33/IUY+QNJ/VfrYu3wZONv9cYLH2P3TND03jV5OTenWLpdgoIgS9dRPALcoDIPahVT1q144YLS0FIOolMHNiSeWdAWTYC9CVD//ZTeK0Mbsu4mHR4wfer67P6yjOHm6KsWCwqajqFNSdItB+sO41FW7MAKkght8N8R0zN8X8OrlSaqn2B+dstdvx7hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=p57bgbqHsjsgGqk169a8KxqDwxH/DLCZD/O8vQZ+dL8=; b=FnWYROrMNbXn4IyvPqDADFnTJ8Y+KFG/9+qfFunMIpEw4CwTJBqPpbMtHodC7VeE6H1YN+8ftDn7qPwPv73jGjKbC5WDT+KIYrIYgJomzGzvpMlac9OKlUiog3iVc6IfmliFpaBHx30iETlmQxn5/hjaCuMEoWRYDiGkq5fAOM1mesU4O+1dSIjjXskyPP2MVfbYmoWkgHmreiTTDA4hx6gIuNNFdLiw/4xVIIi3Vxd0rqmDoa8y6DSx+ndPlyDHOn/h9hyeWFVAfjEnq5lSLUfWDe3daE6BzR6nBvO1h/xVsTnZ4SrTxWC2yk66MysDqbZeF0wcJs28FF7ZkcDu4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 217.111.95.66) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=arri.de; dmarc=none action=none header.from=arri.de; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arrigroup.onmicrosoft.com; s=selector1-arrigroup-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p57bgbqHsjsgGqk169a8KxqDwxH/DLCZD/O8vQZ+dL8=; b=AfK50w4D5fjR4WgNAlYLle3mt7mylQniDtdYhEmDFkLR8wWZNz3dZclsgPKl3uxXGd/6jwSZHteOn262KQLySp06PflHwUTSMXaQMRk+oHK8xPt81M6QKpPTugGvwu8DwTC5D4z+4uozemoAAfSvjLfmsuTeH75id2I+i0UkM4Q= Received: from AM6PR10CA0085.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:8c::26) by AM0PR07MB5505.eurprd07.prod.outlook.com (2603:10a6:208:104::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Tue, 25 Jan 2022 08:53:04 +0000 Received: from VE1EUR02FT034.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:8c:cafe::3d) by AM6PR10CA0085.outlook.office365.com (2603:10a6:209:8c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.12 via Frontend Transport; Tue, 25 Jan 2022 08:53:04 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 217.111.95.66) smtp.mailfrom=arri.de; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arri.de; Received-SPF: Fail (protection.outlook.com: domain of arri.de does not designate 217.111.95.66 as permitted sender) receiver=protection.outlook.com; client-ip=217.111.95.66; helo=mta.arri.de; Received: from mta.arri.de (217.111.95.66) by VE1EUR02FT034.mail.protection.outlook.com (10.152.12.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4909.7 via Frontend Transport; Tue, 25 Jan 2022 08:53:03 +0000 Received: from localhost.de (192.168.54.129) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.498.0; Tue, 25 Jan 2022 09:53:02 +0100 From: Christian Eggers To: Abel Vesa CC: Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , , , , Stefan Riedmueller , Christian Eggers Subject: [PATCH 2/6] clk: imx6ul: enforce gating of gpmi_io clock Date: Tue, 25 Jan 2022 09:52:02 +0100 Message-ID: <20220125085206.8508-3-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125085206.8508-1-ceggers@arri.de> References: <20220125085206.8508-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e36446f1-c0a3-413d-6849-08d9dfe01926 X-MS-TrafficTypeDiagnostic: AM0PR07MB5505:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:854; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dQumSZfduxv/gVIusJefYFJXKPAgSumcbevPkZ0aQQsIDlYQgOeK2zDn/MD8zEsjwy3NywRv3ZbALNA5TwdtltZFlk4tOsvqe591/g6KFA9bIaPyIwH1d+L114LVYoAv9bsNinkDOcFkhynG3fPCltPpxOImnYJL2eMUntto8sebrcPTt92UdWmvTYd54aQP0SLvo7VbnMZbj4yjGK3QjcCgaM9UTZedeW3k3wJ1dxv5Brj0JhH7pb3XqLhaagKHuznI5bkEg+SdD9NjPWPveGOHa4iegszorLStdS0hPi7+s9kwzcYllQ58KtuPqFV/dAcZh9WBQcaxIzOGD56o85/yfsgIbnHIamjUoIktR7gTY2In3GgOAidMVezSxHNEdZsqkgKxVh/PqpvtYgIdNvaRG5heoRcPjgK+5HZOk+QAkHzO83R7HpRpIW8+3jRcMIIouEA9puExBqvsuMmzbrTYlz78fpkFfoJH198nO2deg+ZuyEi/xL4s55ejmUJEfnWBIPu1uEuKn3UotHYce2ZWsVLU4PexkSxRX5VZnewKoob0rxfQZdXvKD9W7gQXy/rn4Q3QKHNYxG2JhF+eZttmHQJQWVkeljkk90CTHOo4E5HVgGC6YwY6yTn12OnoszTl0G+xexRaszPLUh1qvOxxyE5NBP05EcSqNQxbXBYDBPN4dgDGrFA0QYC7YXuT9EPIYG5LDyryAg1J2jbT60BIBklgM5O0FfiZ7cca3BJ8E7EIJPcGEy/lYpi3vY7Qa1ZtgbCYYIyE4LbWHjhDIzp/gQfgWVliOtkNNDzAoYo= X-Forefront-Antispam-Report: CIP:217.111.95.66; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mta.arri.de; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(36756003)(107886003)(2616005)(426003)(1076003)(186003)(336012)(16526019)(26005)(86362001)(5660300002)(40460700003)(2906002)(83380400001)(508600001)(47076005)(82310400004)(36860700001)(8676002)(6862004)(4326008)(8936002)(54906003)(70206006)(81166007)(70586007)(356005)(316002)(32563001)(36900700001)(20210929001); DIR:OUT; SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 08:53:03.4595 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e36446f1-c0a3-413d-6849-08d9dfe01926 X-MS-Exchange-CrossTenant-Id: e6a73a5a-614d-4c51-b3e3-53b660a9433a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e6a73a5a-614d-4c51-b3e3-53b660a9433a; Ip=[217.111.95.66]; Helo=[mta.arri.de] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT034.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR07MB5505 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220125_005306_932083_7EA5B1E8 X-CRM114-Status: GOOD ( 11.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Clock parent and divider changes are both glitchy for enfc_clock_root. Enforce that the child clock is gated. Signed-off-by: Christian Eggers --- drivers/clk/imx/clk-imx6ul.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index f599ae50dd9f..5443b5a0dc75 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -256,7 +256,7 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) if (clk_on_imx6ull()) hws[IMX6ULL_CLK_ESAI_SEL] = imx_clk_hw_mux("esai_sel", base + 0x20, 19, 2, esai_sels, ARRAY_SIZE(esai_sels)); hws[IMX6UL_CLK_UART_SEL] = imx_clk_hw_mux("uart_sel", base + 0x24, 6, 1, uart_sels, ARRAY_SIZE(uart_sels)); - hws[IMX6UL_CLK_ENFC_SEL] = imx_clk_hw_mux("enfc_sel", base + 0x2c, 15, 3, enfc_sels, ARRAY_SIZE(enfc_sels)); + hws[IMX6UL_CLK_ENFC_SEL] = imx_clk_hw_mux_flags("enfc_sel", base + 0x2c, 15, 3, enfc_sels, ARRAY_SIZE(enfc_sels), CLK_SET_PARENT_GATE); hws[IMX6UL_CLK_LDB_DI0_SEL] = imx_clk_hw_mux("ldb_di0_sel", base + 0x2c, 9, 3, ldb_di0_sels, ARRAY_SIZE(ldb_di0_sels)); hws[IMX6UL_CLK_SPDIF_SEL] = imx_clk_hw_mux("spdif_sel", base + 0x30, 20, 2, spdif_sels, ARRAY_SIZE(spdif_sels)); if (clk_on_imx6ul()) { @@ -424,7 +424,7 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) hws[IMX6UL_CLK_PWM4] = imx_clk_hw_gate2("pwm4", "perclk", base + 0x78, 22); hws[IMX6UL_CLK_GPMI_BCH_APB] = imx_clk_hw_gate2("gpmi_bch_apb", "bch_podf", base + 0x78, 24); hws[IMX6UL_CLK_GPMI_BCH] = imx_clk_hw_gate2("gpmi_bch", "gpmi_podf", base + 0x78, 26); - hws[IMX6UL_CLK_GPMI_IO] = imx_clk_hw_gate2("gpmi_io", "enfc_podf", base + 0x78, 28); + hws[IMX6UL_CLK_GPMI_IO] = imx_clk_hw_gate2_flags("gpmi_io", "enfc_podf", base + 0x78, 28, CLK_SET_RATE_GATE); hws[IMX6UL_CLK_GPMI_APB] = imx_clk_hw_gate2("gpmi_apb", "bch_podf", base + 0x78, 30); /* CCGR5 */ From patchwork Tue Jan 25 08:52:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 12723426 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 050DCC433FE for ; Tue, 25 Jan 2022 08:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7RyO4Q5dW/PjcJMY5DZwCkI6ztOXgC7bK2lJ38T+/vM=; b=nVDoJKB/wUPI81 hbmV53vVxR9QYN5PQj+crr5dvX4/jwukXNQWNMC+D6Je09uGDoqn3UL2GTAcwQT2lh1rUc8138znm t2ZvQUtqHdLJBg9UfWZw47laSR8ReYPusZghn1kuSDcPHdLfMxVS9XKTxTyl8rWA/W3BoikEUu54i AAWjk3h2/CrL9ZVDobwHw+Q8vQm60FCBqtXpVcMHP1N6zYITROPsX//8yaNNuYkUDdh72VaDJl2H0 omvnklc4seXMyAHigWO3UmXO5dGJduOEp4ZNr3UCG99IJXt7EpwYFb+0aZnE9OrrHNT/A28vdLuxS AcqzBuvwaMWK1FfLzTRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHa4-006u7n-Le; Tue, 25 Jan 2022 08:53:37 +0000 Received: from mail-eopbgr80138.outbound.protection.outlook.com ([40.107.8.138] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHZe-006u0f-9N for linux-arm-kernel@lists.infradead.org; Tue, 25 Jan 2022 08:53:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ktz3DAs/B7FtCHnU1zzn93bDtXWluBCSKblrWFZRdsG5EVfJ/UdnGzc9nLa4jVfRmqZ0hmCs0bXZQk+Tcb+iX4SCbJ7qoofsz4QE30eG2GcyLewD9YQlWlGPS/500x62A0/0KaXPs4rwR30CveQdKWsffFuIHhMhEVGPajCajpMzw2B3dId2bUOksTbslwj2RKifLDYAPPGcgVWpQxpLIc/YydSlvHqFq69ls+ZHLFsaTS1+jYPACSFzGR+agyKdsoGoVAPSaO687AIozw4A+MNkT8p4SzSu11T8QfrcDC/0Nra94FJOdbBKOKbV0bpuzBpdY3tSnJlTUvSSIgVBgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wvCIEDy7zITFx2byS8YSNhKS1oqfqrc1QYpvQ5k/QlI=; b=gN7Exk+Kb93Tow0h/rtV1t0E0U1OMhMU+uCpAYJs02bcQ30bmkFvXxyhHmHxpRaD9kd2ZE96O4iHA9Bmn0ZxApZf+ny2Hp9IZegAFJG/5drWdQGKS1e0581EfGxcKyLtN3r9GZWIDQZzwyKT8hWqvPjjb0bMxSRkVyLeumnGKhulOGYztt9D6HMmL1YucaIUycbAbxKWQ3vMsjk6pkxrS3fs+SfFekAcj1B0F2EV68DKDJ1cGbQvvYQlh/8suF6kJqJT2rH/fp0VZuHumuAF+n/jeuGkzSs8T3d2u0eYwOeCxb7KCw2lYHguWAeKrSDXL4VS0GiIw1we6FB3OQtJsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 217.111.95.66) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=arri.de; dmarc=none action=none header.from=arri.de; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arrigroup.onmicrosoft.com; s=selector1-arrigroup-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wvCIEDy7zITFx2byS8YSNhKS1oqfqrc1QYpvQ5k/QlI=; b=M8NPkG6u8CyfnEoD6AWTbUthGArXq6ab3nbSp23J7aiaRRwf9ivYielyzWKJqyssW4SadyEvZFxDl3p4XsJ5IuinNNOViKHgB9GRmT1o1Q4b30am9d08UWy8zS6lNCPjZ/i60+DYwE06jhIgH3sRUnDm6b/eWWOykXQX4r64sJo= Received: from AS9PR06CA0346.eurprd06.prod.outlook.com (2603:10a6:20b:466::21) by DB7PR07MB5835.eurprd07.prod.outlook.com (2603:10a6:10:8c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Tue, 25 Jan 2022 08:53:06 +0000 Received: from VE1EUR02FT030.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:466:cafe::fe) by AS9PR06CA0346.outlook.office365.com (2603:10a6:20b:466::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.8 via Frontend Transport; Tue, 25 Jan 2022 08:53:06 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 217.111.95.66) smtp.mailfrom=arri.de; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arri.de; Received-SPF: Fail (protection.outlook.com: domain of arri.de does not designate 217.111.95.66 as permitted sender) receiver=protection.outlook.com; client-ip=217.111.95.66; helo=mta.arri.de; Received: from mta.arri.de (217.111.95.66) by VE1EUR02FT030.mail.protection.outlook.com (10.152.12.127) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4909.7 via Frontend Transport; Tue, 25 Jan 2022 08:53:05 +0000 Received: from localhost.de (192.168.54.129) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.498.0; Tue, 25 Jan 2022 09:53:04 +0100 From: Christian Eggers To: Abel Vesa CC: Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , , , , Stefan Riedmueller , Christian Eggers , Stefan Riedmueller Subject: [PATCH 3/6] clk: imx6q: disable gpmi_io and ipt_io clocks before changing parent Date: Tue, 25 Jan 2022 09:52:03 +0100 Message-ID: <20220125085206.8508-4-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125085206.8508-1-ceggers@arri.de> References: <20220125085206.8508-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35d1cbe1-4d77-405e-fc56-08d9dfe01a62 X-MS-TrafficTypeDiagnostic: DB7PR07MB5835:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b+JibGlAPZecFn6OqoJ+bkYFhW51qwHWP6o0l3oqowCUMr2kgZ9UDnqQ7ybMrkJZXeeeeKETco0NokDKcg4gXrHdLYjxNr3YGEAWWR1ti2vFhAAdhH87QaIqaVYSYxGUD2bqipQjF5g7oghuRSx2uYid3p/tH/DrJVuTsjeJiU75ABalUOJu/9EPcEZbdZBwS+Y9WlgqypeLnd1fytd8gqkp6oRhWOzMcmc7Dg5x5a5QrTOxKDlrnH+2eBdffvuhjKIH9iX7K1UG0foJ1Q99owo9Uc3mtwwjrRxXMEYqiGXmcZH7QR0dXkVfRHHo8J09/1h1Bgwe1UnX7IRCMOB1upY3Q0QC+X2bVSPdsUG7/zUv0yWGJrWkOoWTYdzm7ZYH7XQwxLrdfkHZo/IE3rDy2BALamoxmYJArZVnKwuLN8PJjssEe6PEWgAsd0PD139FECJQG8XPiV1DaQBo44YyXhRtrB5bi35AjK4bTWyeJ//cx2yryqkZMDiG5ndKvS2OzUZH9gZT/6Ih0x1vKmHNXbfpbwT3Y0RcBs+2EepboR2RQr/9cIFpwzOaC4Xwkphphz7RGw/Vih2Knd+hFXZvHxA4G2x9VC8l31mRQ3v9sPSK5oFdybnglUtrAJupLXnGg2c4F1LVR4Rg2O2qfauAT/XHuR0ah/jT64c4BTRG3jSmR/6CyZrg/Lp/lNtpFOxQrKwbwxtL5NhwiVFpasihiS+j5g/D3/py6lfLwQ0HT2I= X-Forefront-Antispam-Report: CIP:217.111.95.66; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mta.arri.de; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(86362001)(82310400004)(6862004)(8936002)(4326008)(8676002)(5660300002)(2616005)(1076003)(186003)(54906003)(316002)(70586007)(70206006)(426003)(16526019)(508600001)(336012)(83380400001)(47076005)(36860700001)(356005)(81166007)(107886003)(40460700003)(2906002)(36756003)(26005)(32563001)(36900700001)(20210929001); DIR:OUT; SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 08:53:05.5499 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35d1cbe1-4d77-405e-fc56-08d9dfe01a62 X-MS-Exchange-CrossTenant-Id: e6a73a5a-614d-4c51-b3e3-53b660a9433a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e6a73a5a-614d-4c51-b3e3-53b660a9433a; Ip=[217.111.95.66]; Helo=[mta.arri.de] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT030.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR07MB5835 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220125_005310_393896_7FAF3162 X-CRM114-Status: GOOD ( 13.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org gpmi_io and ipt_io clocks may have been enabled by the boot loader. All children of enfc_clk_root must be gated in order to prevent glitches during parent change. Reparenting of enfc_clk_root may disable pll3_usb_otg. In order to avoid immediately re-enabling it in imx_register_uart_clocks(), the whole section has been moved to the bottom of imx6q_clocks_init(). Signed-off-by: Christian Eggers Co-developed-by: Stefan Riedmueller Signed-off-by: Stefan Riedmueller --- drivers/clk/imx/clk-imx6q.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c index de36f58d551c..fd5c37095ed0 100644 --- a/drivers/clk/imx/clk-imx6q.c +++ b/drivers/clk/imx/clk-imx6q.c @@ -927,13 +927,6 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk_set_parent(hws[IMX6QDL_CLK_IPU2_DI0_SEL]->clk, hws[IMX6QDL_CLK_IPU2_DI0_PRE]->clk); clk_set_parent(hws[IMX6QDL_CLK_IPU2_DI1_SEL]->clk, hws[IMX6QDL_CLK_IPU2_DI1_PRE]->clk); - /* - * The gpmi needs 100MHz frequency in the EDO/Sync mode, - * We can not get the 100MHz from the pll2_pfd0_352m. - * So choose pll2_pfd2_396m as enfc_sel's parent. - */ - clk_set_parent(hws[IMX6QDL_CLK_ENFC_SEL]->clk, hws[IMX6QDL_CLK_PLL2_PFD2_396M]->clk); - if (IS_ENABLED(CONFIG_USB_MXS_PHY)) { clk_prepare_enable(hws[IMX6QDL_CLK_USBPHY1_GATE]->clk); clk_prepare_enable(hws[IMX6QDL_CLK_USBPHY2_GATE]->clk); @@ -975,5 +968,25 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) } imx_register_uart_clocks(2); + + /* + * The gpmi needs 100MHz frequency in the EDO/Sync mode. We can not get + * the 100MHz from the pll2_pfd0_352m. So choose pll2_pfd2_396m as + * enfc_sel's parent. + * + * gpmi_io and ipt_clk_io clocks may have been enabled by the boot + * loader. All children of enfc_clk_root must be gated in order to + * prevent glitches during parent change. The task of re-enabling + * gpio_io is left to the gpmi-nand driver. + */ + if (clk_hw_is_enabled(hws[IMX6QDL_CLK_GPMI_IO])) { + clk_prepare_enable(hws[IMX6QDL_CLK_GPMI_IO]->clk); + clk_disable_unprepare(hws[IMX6QDL_CLK_GPMI_IO]->clk); + } + if (clk_hw_is_enabled(hws[IMX6QDL_CLK_ENFC])) { + clk_prepare_enable(hws[IMX6QDL_CLK_ENFC]->clk); + clk_disable_unprepare(hws[IMX6QDL_CLK_ENFC]->clk); + } + clk_set_parent(hws[IMX6QDL_CLK_ENFC_SEL]->clk, hws[IMX6QDL_CLK_PLL2_PFD2_396M]->clk); } CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init); From patchwork Tue Jan 25 08:52:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 12723565 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B785BC433EF for ; Tue, 25 Jan 2022 09:31:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V6ZmS3vXUDNNMh6d5MLQnSNsTq6mDt5a+o2/WqVMfz4=; b=oLgjQQsl8WUm6f bIe7P30Fk9ZyPlwd2JSzEoX/6zXDeK6FEbHyJik8zzuovWHPxMBfTQJ2KmG39g+VpuQUDmD3aC1vb K/+2f1NVxAtgKfl5FY4WvFnbLvMXGj2OOXYavbj4C/5OnarcK76CAivEBIHC+A+O8L+KXaLQW9kZ4 iXjHlN/9CfdJJ/F4k2ghCmtbiFb3DIM2g1ANiklFxTd7FGn3Iv0/jOQtNsuf/ah71uWH42wZw4b+y hVn4PVUBCawipsKKDeCNuPB4fuzVELVnPBNfjc3yfkKBKtrSEtlK9bDzC+e/BXa/sntHPbmJR7+5L ZLLSqmTmGygw+mTF/c6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCI93-0079iu-Ov; Tue, 25 Jan 2022 09:29:46 +0000 Received: from mail-am6eur05on2112.outbound.protection.outlook.com ([40.107.22.112] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHot-0070Zl-Vx for linux-arm-kernel@lists.infradead.org; Tue, 25 Jan 2022 09:08:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e1zjE538EDv9gxupGIJJgqDIMPO3WnSPDezKQoQpMBAVARofYyjYy7trL2lwxY4fh9oI2q+FIqws+iFd+xNcPqlvL7fVL++HA0Is9AgIdACUHtdeX14ujoUcnY3ZXPTOp85t7J9N2e5lgHLmHtBV3vwXywMfq6HWaA/5WRMMIEQjT/Jql7XfUGsYqpzubXgzvOnmJ2G1tcXb7lKe/V0jvhS/KQBqFzhopDENAZthFXPT/1goAJG4yP5ha4NEErgIQSaUlCRLdRptgjvcZ8B89TSb/mvNTC5ly1dMALK7nDaB+cjRoFcyV2zvsESlsKQAu1auq4DhIJEgIPjR6qwa1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ByWN0Qk3Ljn5cedVXgSfce3ekHQs1g4SygzOZcN87rM=; b=ch571LYBhFbohsV4j5BdR1FuIt3xpc07JodL8E0+a5ZHP9VXTn3mzQVVFeDLrC4UmQ9SBEIoS9zqYOPJcHvRw7aCDSuqJiH3JTQjgw9nhFydoA/R+aQVziNsD00lvlH7VYkRfDZJDFpAMHgBSCUES3Sc+xNbr8/RwIvq7ULBY559NAhSYySwz3sad6pX1ZxDwcLVONYIBSHWEyhkYL6/YuFWntwvO4jRqfMhLIzUUO5KV8eqaKXc2Q1ZICY8dch0RtjE+j5mO3Wv/Y6vGxnItefmhIqIoEVSgjEkpmbSizNOILla5GX4ysNzvRnyNf+se8X6xV6MvhPZkomf5YcxqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 217.111.95.66) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=arri.de; dmarc=none action=none header.from=arri.de; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arrigroup.onmicrosoft.com; s=selector1-arrigroup-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ByWN0Qk3Ljn5cedVXgSfce3ekHQs1g4SygzOZcN87rM=; b=BDSild98m+Jycxejpf/bntoOg2ntD8Lr1F2GUIMaA1mwjVWq8/l8LczVSCrmeaSWtWBhubRBpHvgCZR7s7VJ3ZsLw3YFiaVkuKL+06wQEbe9k8xFGt8xkRGCd2sO0vjDMwCa6elzBF92vJKrNYjbZ/wcN2JFzPaPRbflTNb3RAM= Received: from AS8P250CA0005.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::10) by AM0PR0702MB3697.eurprd07.prod.outlook.com (2603:10a6:208:18::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.4; Tue, 25 Jan 2022 08:53:08 +0000 Received: from VE1EUR02FT007.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:330:cafe::45) by AS8P250CA0005.outlook.office365.com (2603:10a6:20b:330::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.19 via Frontend Transport; Tue, 25 Jan 2022 08:53:08 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 217.111.95.66) smtp.mailfrom=arri.de; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arri.de; Received-SPF: Fail (protection.outlook.com: domain of arri.de does not designate 217.111.95.66 as permitted sender) receiver=protection.outlook.com; client-ip=217.111.95.66; helo=mta.arri.de; Received: from mta.arri.de (217.111.95.66) by VE1EUR02FT007.mail.protection.outlook.com (10.152.12.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4909.7 via Frontend Transport; Tue, 25 Jan 2022 08:53:07 +0000 Received: from localhost.de (192.168.54.129) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.498.0; Tue, 25 Jan 2022 09:53:06 +0100 From: Christian Eggers To: Abel Vesa CC: Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , , , , Stefan Riedmueller , Christian Eggers Subject: [PATCH 4/6] clk: imx6q: enforce gating of gpmi_io clock Date: Tue, 25 Jan 2022 09:52:04 +0100 Message-ID: <20220125085206.8508-5-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125085206.8508-1-ceggers@arri.de> References: <20220125085206.8508-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee5c9276-81db-4932-3b55-08d9dfe01b87 X-MS-TrafficTypeDiagnostic: AM0PR0702MB3697:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:190; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sIRLTqctqu4/Q3ufd/A8ZefpMsIEjEhRNu2KeZvN89Jy8b9Df3KtyyBXkN7h3NZV09SM292GkwtU+1DSWwaDW/7hb3diyC7b+v3FrglrBI9MKddAyw9WxvQ5t01gQcNMGFfv7byt40hUIuNVaBb1dKHsG9jrTuuoJEBqF7QQkiHAqZjAwPpb/z3LxzNYoUyIOHkmiZ582Bp7bTgYEfttt1nZkohhAom7D27PlYMGwdef0aS8WNyNTGYAOzAtbrn5rRA9hrzLzm9UFMMuDRfShc7DkUKD+bcylyq3XmP/p223py+yN4ni+5KEpn+egUv06ejyJqKBWQPpBjyo4e6n4jnqFeRhDX/0kdV0vEA9c2MJOuXW87GDjo17kbIAfRk5X4JgOqE+VI2xPtczegrTPWHJyFkaRyGMvF07oxbdjqena7LzBHKouX3T0viMFg12IxWDnn3H12HvdcmYIChRNYmhyRBJep72FWeBrooBvyJjy12OVngHndpKuuW3bMs0ibqzcx8qB2zVjE1e6ZiLbVod4PdmL//+L74ieXSnE0cZTIvOP2A8H8jSthtfvosQvarn9mwF2L9wFMoaA++JoC6VM3oPS4z7PPDp1ogYC8mydv5+h1NRwQ1kCxKMj3ZapNIOlmQQ02WuA+y0UvJ4x/POZjczIBiiho6O8LnuHWd7NDhEgI5l7Lr0ZHP6+u9KfU1qAab56jfxU1hSKdaw+T/eeyJWAYeSsCWOFczXHUv1OnTsrzBwiP+TviXYF2xmqgw7ILZUO0AnO9dxciJUT01T2uEc+aQyUTk+A2sEZhM= X-Forefront-Antispam-Report: CIP:217.111.95.66; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mta.arri.de; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(4326008)(83380400001)(36756003)(5660300002)(316002)(86362001)(70586007)(107886003)(26005)(82310400004)(426003)(186003)(336012)(8676002)(16526019)(6862004)(70206006)(54906003)(2906002)(2616005)(1076003)(8936002)(47076005)(40460700003)(508600001)(356005)(36860700001)(81166007)(32563001)(36900700001)(20210929001); DIR:OUT; SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 08:53:07.4665 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee5c9276-81db-4932-3b55-08d9dfe01b87 X-MS-Exchange-CrossTenant-Id: e6a73a5a-614d-4c51-b3e3-53b660a9433a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e6a73a5a-614d-4c51-b3e3-53b660a9433a; Ip=[217.111.95.66]; Helo=[mta.arri.de] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT007.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0702MB3697 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220125_010856_052148_49FECCBE X-CRM114-Status: GOOD ( 11.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Clock parent and divider changes are both glitchy for enfc_clock_root. Enforce that the child clock is gated. Signed-off-by: Christian Eggers --- drivers/clk/imx/clk-imx6q.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c index fd5c37095ed0..390566fca054 100644 --- a/drivers/clk/imx/clk-imx6q.c +++ b/drivers/clk/imx/clk-imx6q.c @@ -674,7 +674,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) hws[IMX6QDL_CLK_USDHC2_SEL] = imx_clk_hw_mux("usdhc2_sel", base + 0x1c, 17, 1, usdhc_sels, ARRAY_SIZE(usdhc_sels)); hws[IMX6QDL_CLK_USDHC3_SEL] = imx_clk_hw_mux("usdhc3_sel", base + 0x1c, 18, 1, usdhc_sels, ARRAY_SIZE(usdhc_sels)); hws[IMX6QDL_CLK_USDHC4_SEL] = imx_clk_hw_mux("usdhc4_sel", base + 0x1c, 19, 1, usdhc_sels, ARRAY_SIZE(usdhc_sels)); - hws[IMX6QDL_CLK_ENFC_SEL] = imx_clk_hw_mux("enfc_sel", base + 0x2c, 15, 3, enfc_sels_2, ARRAY_SIZE(enfc_sels_2)); + hws[IMX6QDL_CLK_ENFC_SEL] = imx_clk_hw_mux_flags("enfc_sel", base + 0x2c, 15, 3, enfc_sels_2, ARRAY_SIZE(enfc_sels_2), CLK_SET_PARENT_GATE); hws[IMX6QDL_CLK_EIM_SEL] = imx_clk_hw_mux("eim_sel", base + 0x1c, 27, 2, eim_sels, ARRAY_SIZE(eim_sels)); hws[IMX6QDL_CLK_EIM_SLOW_SEL] = imx_clk_hw_mux("eim_slow_sel", base + 0x1c, 29, 2, eim_slow_sels, ARRAY_SIZE(eim_slow_sels)); hws[IMX6QDL_CLK_PRE_AXI] = imx_clk_hw_mux("pre_axi", base + 0x18, 1, 1, pre_axi_sels, ARRAY_SIZE(pre_axi_sels)); @@ -864,7 +864,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) hws[IMX6QDL_CLK_PWM4] = imx_clk_hw_gate2("pwm4", "ipg_per", base + 0x78, 22); hws[IMX6QDL_CLK_GPMI_BCH_APB] = imx_clk_hw_gate2("gpmi_bch_apb", "usdhc3", base + 0x78, 24); hws[IMX6QDL_CLK_GPMI_BCH] = imx_clk_hw_gate2("gpmi_bch", "usdhc4", base + 0x78, 26); - hws[IMX6QDL_CLK_GPMI_IO] = imx_clk_hw_gate2("gpmi_io", "enfc", base + 0x78, 28); + hws[IMX6QDL_CLK_GPMI_IO] = imx_clk_hw_gate2_flags("gpmi_io", "enfc", base + 0x78, 28, CLK_SET_RATE_GATE); hws[IMX6QDL_CLK_GPMI_APB] = imx_clk_hw_gate2("gpmi_apb", "usdhc3", base + 0x78, 30); hws[IMX6QDL_CLK_ROM] = imx_clk_hw_gate2_flags("rom", "ahb", base + 0x7c, 0, CLK_IS_CRITICAL); hws[IMX6QDL_CLK_SATA] = imx_clk_hw_gate2("sata", "ahb", base + 0x7c, 4); From patchwork Tue Jan 25 08:54:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 12723427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2280EC433EF for ; Tue, 25 Jan 2022 08:56:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bEP87vmuN2MG+VXfNOGvk4IlqOC3wok+Lp3loPepu+I=; b=tbGytSBCJXQVRv OgZt2yYAgIk/aX4yliGrfoDyBFD/kf3WHcCfk+Um4P/UPaLcIYVku7EbR4F4y39f582ZQVc20OVmi A2kZAY9Y/MN1GDMfX5rYoceWk4A0Kp+CncSFfMMX3A7fE9L5OKJ/2JETqjjRqAc7Ofhv3c7IW6d5I H6cm2LrDJlci+bq0519gxrcJNpoHsbBk8q6Ni10c696QnTBrfRGb9vu7rWenMacWR1IsvMqL+bAEq uehU7j337e/xnUGjH+F//RGZw0KNSNUH4wWii/88mesrTySAyjdhrKSRRAllO9UpFxc1mSBtTqgoa uq/+Odcsc9MzpNrtTgQQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHba-006uiw-Nv; Tue, 25 Jan 2022 08:55:10 +0000 Received: from mail-eopbgr140105.outbound.protection.outlook.com ([40.107.14.105] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHbX-006ufk-4o for linux-arm-kernel@lists.infradead.org; Tue, 25 Jan 2022 08:55:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nr5lWzYbEooJlDd8iImmNYSKLEQlYmwvtDyLLYzWht9Bq2oln30kifsUaxztC7yRodfAOd5xANUiQXYx0ZLRk7rb4T8vCKiNnftTAHbYvMYQXn4x8WdUM2GA66jW7QtCdLTbnffo6Myq6Bu3EuGI5BS10OtSniERm2s/4Gq+o86DGVQuF6insDnaEw36+SdXYxAWK3T28tKD5sYei4CMXNtn0YF5aLWax9qSzjYXblBxeqJaf84mU6uc76iYQontN4M59rgAN+RhycNhGbtHMiOeW14X/gDJei16JYpGwXwwRC6YQZFmHYDzTQqbPRKiP7QDbSND2gHATtYrXsIdmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tblyRKADO9du4XsWnSMGOoyEq3SULBJGzRcqQ9gqb7E=; b=TAJhcBaHkS7yzyyM64lNpDsrrvKZyqr4QFapNT77bAKjSec4OSJmUjj8x+046sgRDmKFUSD7adOSMuerAnQn4CMrMNe/xHG9eEc+CMP5oLXFXRcmkU4c8g1DMA31dVvIbZ2NBrlkVoD+Daje9cjDf45ztm6MUo9U3Gg0WhULYkVG8mK2VFe0ERLeIKN2buMqrgI5pl2+RklhxFXRgSrP46XNrF3BQ7YSblDzqvLWTJBj8I1hwX8zg8u/sSOuBMRXxJcGtD/tuZj9yHWcLLbxYaKjIfOrk9uVQgsMi+21rH+366/wy9Gr3JBSvje6v01ZUVtkuFMY318IMl/dCEcJUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 217.111.95.66) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=arri.de; dmarc=none action=none header.from=arri.de; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arrigroup.onmicrosoft.com; s=selector1-arrigroup-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tblyRKADO9du4XsWnSMGOoyEq3SULBJGzRcqQ9gqb7E=; b=I6nXsLzWwfCIN54xrLTaLhYgLmVlRfs6DfQmptmbmGsmCQ+G7Fnwi+eH9ORSa+rbHfGCqCWLdRCq3S3HQUFSkxElV51YbjmsPjeVGvgzpsTIyJsWcw4YSX/dO/la59a773vimS5/T0vFw4PMjuWRcsubOyEomdQ7nRSw9xELr3E= Received: from AM6P193CA0123.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:85::28) by DU2PR07MB8287.eurprd07.prod.outlook.com (2603:10a6:10:279::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.6; Tue, 25 Jan 2022 08:55:00 +0000 Received: from VE1EUR02FT062.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:85:cafe::e1) by AM6P193CA0123.outlook.office365.com (2603:10a6:209:85::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.10 via Frontend Transport; Tue, 25 Jan 2022 08:55:00 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 217.111.95.66) smtp.mailfrom=arri.de; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arri.de; Received-SPF: Fail (protection.outlook.com: domain of arri.de does not designate 217.111.95.66 as permitted sender) receiver=protection.outlook.com; client-ip=217.111.95.66; helo=mta.arri.de; Received: from mta.arri.de (217.111.95.66) by VE1EUR02FT062.mail.protection.outlook.com (10.152.13.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4909.7 via Frontend Transport; Tue, 25 Jan 2022 08:54:59 +0000 Received: from localhost.de (192.168.54.129) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.498.0; Tue, 25 Jan 2022 09:54:59 +0100 From: Christian Eggers To: Abel Vesa CC: Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , , , , Stefan Riedmueller , Christian Eggers Subject: [PATCH 5/6] clk: imx6sx: disable gpmi_io clock before changing parent clock Date: Tue, 25 Jan 2022 09:54:39 +0100 Message-ID: <20220125085440.8768-1-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125085206.8508-1-ceggers@arri.de> References: <20220125085206.8508-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eb9a6737-be89-4134-cb35-08d9dfe05e7e X-MS-TrafficTypeDiagnostic: DU2PR07MB8287:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +xURhriQ+p0xQLZypQZCF3456+brP67WBfPHXUVXvpRnuzT5TakEUTp2PCVj0piWFuCyCU0L9zcevOxv1T5u/NdZBzZXc1gPCoIx1pnK2kRE54nbWl6s9Otr2JksKEz6bdC4LEZ47zqV5w8kVj81fYb10IQvXttmVJ1c0xGRaG773TVbGIb1Qd0nEpovwUnFxowqyX+g0EvDU0sZz2QqD/vnAgMYr5Aw5awRDNQ3e1j1qmppuUVReT4tiH2PEmhurrwhsl1G9FBrguveGOa4hdnjoI3Mtt6Gp18QyQTpkF41QVpCP6TfBdQKJlvG6oKZ2epwJQilR7X4DyGH7x5x5Sd5vWficQXQFIX09lcFWIh/Ax5711cSXYDYKdRgh6YzEflwbp2BnwI6RuePqLgMBjUYAeXt5Nm2gzgYxHlYOTwJoc3I436mIny/c9uAAGDx70yxDNXA3/HJhDtwg8xNfxKBMamkeY6IuTFER4kulCSwh4VOvd88ONoSF+hRFHNTcwRZk1f6YRC31CwHLkYegYTZaJFEM9cpvTEcFfnFDfNgKL53mt/1l8Scm++slNu1WBwLcXNvIVTByaxXs3yN0WaZ1CQ8XRTmkfFUj3e/kQuolFjvYllRVQ90Mbo6pkZufOTkV7wyAs1BM2s2dlrJwA8F2N2gcGeVK3TfHO9+j2aobjDBs27JzOuaHtIjFTqwN3Hcrd0U+Zz5NzZWVdYTwWW2/LLQcUGvy2gMq3BtrhViNGaCZxAPBHQuwYf4OSHr4h8+s33a+vmEgxeohz0Na94qycXCF1xqJvBB99Z29JI= X-Forefront-Antispam-Report: CIP:217.111.95.66; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mta.arri.de; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(40460700003)(81166007)(2616005)(508600001)(16526019)(1076003)(336012)(2906002)(36860700001)(5660300002)(86362001)(26005)(186003)(426003)(107886003)(36756003)(356005)(54906003)(47076005)(316002)(6862004)(4326008)(8676002)(70586007)(8936002)(82310400004)(70206006)(6666004)(83380400001)(32563001)(36900700001)(20210929001); DIR:OUT; SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 08:54:59.8172 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb9a6737-be89-4134-cb35-08d9dfe05e7e X-MS-Exchange-CrossTenant-Id: e6a73a5a-614d-4c51-b3e3-53b660a9433a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e6a73a5a-614d-4c51-b3e3-53b660a9433a; Ip=[217.111.95.66]; Helo=[mta.arri.de] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT062.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR07MB8287 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220125_005507_220301_8C8D4EBE X-CRM114-Status: GOOD ( 11.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org gpmi_io clocks may have been enabled by the boot loader. All children of qspi2_clk_root must be gated in order to prevent glitches during parent change. Signed-off-by: Christian Eggers --- drivers/clk/imx/clk-imx6sx.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c index fc1bd23d4583..cf1c1fad45f9 100644 --- a/drivers/clk/imx/clk-imx6sx.c +++ b/drivers/clk/imx/clk-imx6sx.c @@ -546,8 +546,19 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) clk_set_parent(hws[IMX6SX_CLK_GPU_AXI_SEL]->clk, hws[IMX6SX_CLK_PLL3_PFD0]->clk); clk_set_parent(hws[IMX6SX_CLK_QSPI1_SEL]->clk, hws[IMX6SX_CLK_PLL2_BUS]->clk); - clk_set_parent(hws[IMX6SX_CLK_QSPI2_SEL]->clk, hws[IMX6SX_CLK_PLL2_BUS]->clk); imx_register_uart_clocks(2); + + /* + * gpmi_io clock may have been enabled by the boot loader. All children + * of qspi2_clk_root must be gated in order to prevent glitches during + * parent change. The task of re-enabling is left to the gpmi-nand + * driver. + */ + if (clk_hw_is_enabled(hws[IMX6SX_CLK_GPMI_IO])) { + clk_prepare_enable(hws[IMX6SX_CLK_GPMI_IO]->clk); + clk_disable_unprepare(hws[IMX6SX_CLK_GPMI_IO]->clk); + } + clk_set_parent(hws[IMX6SX_CLK_QSPI2_SEL]->clk, hws[IMX6SX_CLK_PLL2_BUS]->clk); } CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init); From patchwork Tue Jan 25 08:54:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 12723428 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 95534C433EF for ; Tue, 25 Jan 2022 08:57:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lBE7wZIaVZ3mkGg5D6y66dwBEY7nw6Kg5g7xmTbTfJQ=; b=YwUMjaM+ODVQHn qsr0MWpuTbGZnDYRaGCA1gj70lTK93BpSDrACLadijSdlWudEiJ0PHnsp1DOsEVfYxb89lTDG29GZ 8eBEAHArzpRVXJ8a/C+KbT3pHzpaBAvOGJVVECro7FFZnr3CVmKlIeZyUc2/IcVSc+fbGK9UEDsyk 9JescdwQAI5cwpEkZ6fyP+STrIylxcFmmaNl6sMtrVm7UxMpH10F5J/hdZkCMrk97yCOTVuUm7fHf W7qsf0GEhlqSs4gOnr/IVj1GutLi1J5olfF8RGdk6bKyc/AhUPoLvv0hPcvU36EZ6goLn21HE8q7t cOh+3Fuu+3xtdtC+T+jQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHbs-006uqg-SL; Tue, 25 Jan 2022 08:55:29 +0000 Received: from mail-eopbgr20137.outbound.protection.outlook.com ([40.107.2.137] helo=EUR02-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCHbb-006ujB-T8 for linux-arm-kernel@lists.infradead.org; Tue, 25 Jan 2022 08:55:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZEAAjj0jEJU1sbZsRpmtfNDPoTPXJYYJIcA1N2Js8PEhGLjx18a+fWMcSOP3xxnegxm1E9U2tS0+JTB8qUl3u32th9FRLRnhXOLIS/qTF6gF5zfKVz9/6WX+B6X8X+c2MsSqzBow8NUCJtSb3oPszaG+dBpQJEOujqTdKAndMjJtBiZxKcmOhew/8Aab6nKaxHEgPlkJlqS0epcZkd5z+IID2AAbB95kkpEq2ytXDe+x0dKF3w+tn9/nJeDURqSkfhB04RbifL9fXUvHWD0msUnWRek8aDClm8mTEaO8a10SLOjll8RgVeOOTdqd5cPduxixesmllsNyrKeVEGrGew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4MUXi3GP3jwU117h9vbCj7WYECEimyoTDiQdzXMRMSY=; b=N+MKCx8Mo5VX2kSBdojR4XRDPVjE5VEOy7RuSzZgqg5x+nAxAU/XgA9c9fEFdDzc2e7UrtFp9btazIVVxzHParO+0n1KApA9W/OzCIAwxwkWVOTF+3uhmK+gEKJt4wFgl6yj61RjOVAeEPxKPLljr537sITs/IwAZAQRJ+BTILt0N+6MhRsw4ZJtCUZaTikX5bFxSlH59EkSIXbXUZMCIvQ0dLpf6FoCTa5bRP1ZM1rdZKsPYOqHWaCdJ5Mu5tw6Og0au1Cii5ARCnjB+/jJ1Z0GxHE4UaPGKK0Z7T/JX9jetFPXcFBzS0EdTbX36EhE+fei+VSOMag2Cl7GhKnufQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 217.111.95.66) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=arri.de; dmarc=none action=none header.from=arri.de; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arrigroup.onmicrosoft.com; s=selector1-arrigroup-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4MUXi3GP3jwU117h9vbCj7WYECEimyoTDiQdzXMRMSY=; b=g4nSll5o/t9im+Y9+lV/h1gyNjd52ImNQk5Cm489ch50vrVBsBkOPQP3FXRpxJkTuFVlZz24KwUBOIxX0z8e8pc2VLChg787cUwG+xJK1t5Fw5gfeVl/kR03O0nGi2fg8MKabyzNTANzSwpnX3T3lWAXdRTQmjHrsVQu6POOrBk= Received: from AS8PR04CA0120.eurprd04.prod.outlook.com (2603:10a6:20b:31e::35) by VI1PR07MB5936.eurprd07.prod.outlook.com (2603:10a6:803:be::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Tue, 25 Jan 2022 08:55:07 +0000 Received: from VE1EUR02FT033.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:31e:cafe::bf) by AS8PR04CA0120.outlook.office365.com (2603:10a6:20b:31e::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.19 via Frontend Transport; Tue, 25 Jan 2022 08:55:07 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 217.111.95.66) smtp.mailfrom=arri.de; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arri.de; Received-SPF: Fail (protection.outlook.com: domain of arri.de does not designate 217.111.95.66 as permitted sender) receiver=protection.outlook.com; client-ip=217.111.95.66; helo=mta.arri.de; Received: from mta.arri.de (217.111.95.66) by VE1EUR02FT033.mail.protection.outlook.com (10.152.12.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4909.7 via Frontend Transport; Tue, 25 Jan 2022 08:55:06 +0000 Received: from localhost.de (192.168.54.129) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.498.0; Tue, 25 Jan 2022 09:55:06 +0100 From: Christian Eggers To: Abel Vesa CC: Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , , , , Stefan Riedmueller , Christian Eggers Subject: [PATCH 6/6] clk: imx6sx: enforce gating of gpmi_io clock Date: Tue, 25 Jan 2022 09:54:40 +0100 Message-ID: <20220125085440.8768-2-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125085440.8768-1-ceggers@arri.de> References: <20220125085206.8508-1-ceggers@arri.de> <20220125085440.8768-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f6c8192-9676-45de-f4be-08d9dfe062bd X-MS-TrafficTypeDiagnostic: VI1PR07MB5936:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:655; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CH1XQ8GLBGsna/xHp8l+Kw1moy9rT8/DU7zwhk+u8Dz5Vv4+MSeLSJLEEVZgR5hAEe1H08yQk3cJ6JXqm+z7+SmUgqG32SBLsQ/Yr8SWWHwE+keT8N9J3azyMYGNqXWyTBdZsblhAOEAbE+FWY3eoMBCryWeQuy+EIe7zfywkNBrCrieyEyx4AO08XjJnrFLvIs8NW26qaElOuav0xtektgegfzvEip0uvrbLGtLZhAUJfO4cxry1NBIintdCZWAA702ZlM0vymaP1A5QD93P+u1nQPTAgk37fxdr+xYu1S333dlc0s+uGKdetC45e4ZWqZxsaMuSeQ+67QoAgvFRRjg9tnTNYaGGe4jKjYTJ4bppOCi5QdnbIVSEO/A1s7apNM7M0P9kannwofqnUIOYJBJC+ySwuuPVHNZ1dBN6N5hMsQGJvbh8wbpZ4PUu13LhSPJc5mogT6fsrFIe+WtJIdVZ5F7ieVdC/Vx+wELd9PjYQKGcnkRX++D6WR5LlHbTzjAJBaLRW6qvk4YUdUc4FPSvAqelA1zGJWD0Kgt1Sn5u76pKhLYU2ISjFkhAbY5/3TvS0+xwm5lOmqibHCx3ndqRdmXOxoNbZ0elQWv/y2jJ5oJnf95SkeCsWSq8Z8ge9XsKwEzoJckVORoyMiIsX8reGPzfGymJXB/I/1JE536eUv8yuHSNcm9FlPiPO9v6DdyB7XYg58sROBQDTKeOeLpQpxgqUwjfTGCn/mf3jo= X-Forefront-Antispam-Report: CIP:217.111.95.66; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mta.arri.de; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(16526019)(5660300002)(426003)(1076003)(36756003)(82310400004)(47076005)(2616005)(2906002)(186003)(26005)(336012)(107886003)(36860700001)(508600001)(54906003)(6666004)(6862004)(4326008)(70206006)(356005)(70586007)(86362001)(40460700003)(8936002)(316002)(8676002)(81166007)(83380400001)(32563001)(36900700001)(20210929001); DIR:OUT; SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 08:55:06.9420 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5f6c8192-9676-45de-f4be-08d9dfe062bd X-MS-Exchange-CrossTenant-Id: e6a73a5a-614d-4c51-b3e3-53b660a9433a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e6a73a5a-614d-4c51-b3e3-53b660a9433a; Ip=[217.111.95.66]; Helo=[mta.arri.de] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT033.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB5936 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220125_005511_983702_EE606D4C X-CRM114-Status: GOOD ( 11.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Clock parent and divider changes are both glitchy for qspi2_clock_root. Enforce that the child clock is gated. Signed-off-by: Christian Eggers --- drivers/clk/imx/clk-imx6sx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c index cf1c1fad45f9..023a18594ebe 100644 --- a/drivers/clk/imx/clk-imx6sx.c +++ b/drivers/clk/imx/clk-imx6sx.c @@ -286,7 +286,7 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) hws[IMX6SX_CLK_ESAI_SEL] = imx_clk_hw_mux("esai_sel", base + 0x20, 19, 2, audio_sels, ARRAY_SIZE(audio_sels)); hws[IMX6SX_CLK_CAN_SEL] = imx_clk_hw_mux("can_sel", base + 0x20, 8, 2, can_sels, ARRAY_SIZE(can_sels)); hws[IMX6SX_CLK_UART_SEL] = imx_clk_hw_mux("uart_sel", base + 0x24, 6, 1, uart_sels, ARRAY_SIZE(uart_sels)); - hws[IMX6SX_CLK_QSPI2_SEL] = imx_clk_hw_mux_flags("qspi2_sel", base + 0x2c, 15, 3, qspi2_sels, ARRAY_SIZE(qspi2_sels), CLK_SET_RATE_PARENT); + hws[IMX6SX_CLK_QSPI2_SEL] = imx_clk_hw_mux_flags("qspi2_sel", base + 0x2c, 15, 3, qspi2_sels, ARRAY_SIZE(qspi2_sels), CLK_SET_RATE_PARENT | CLK_SET_PARENT_GATE); hws[IMX6SX_CLK_SPDIF_SEL] = imx_clk_hw_mux("spdif_sel", base + 0x30, 20, 2, audio_sels, ARRAY_SIZE(audio_sels)); hws[IMX6SX_CLK_AUDIO_SEL] = imx_clk_hw_mux("audio_sel", base + 0x30, 7, 2, audio_sels, ARRAY_SIZE(audio_sels)); hws[IMX6SX_CLK_ENET_PRE_SEL] = imx_clk_hw_mux("enet_pre_sel", base + 0x34, 15, 3, enet_pre_sels, ARRAY_SIZE(enet_pre_sels)); @@ -441,7 +441,7 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) hws[IMX6SX_CLK_PWM4] = imx_clk_hw_gate2("pwm4", "perclk", base + 0x78, 22); hws[IMX6SX_CLK_GPMI_BCH_APB] = imx_clk_hw_gate2("gpmi_bch_apb", "usdhc3", base + 0x78, 24); hws[IMX6SX_CLK_GPMI_BCH] = imx_clk_hw_gate2("gpmi_bch", "usdhc4", base + 0x78, 26); - hws[IMX6SX_CLK_GPMI_IO] = imx_clk_hw_gate2("gpmi_io", "qspi2_podf", base + 0x78, 28); + hws[IMX6SX_CLK_GPMI_IO] = imx_clk_hw_gate2_flags("gpmi_io", "qspi2_podf", base + 0x78, 28, CLK_SET_RATE_GATE); hws[IMX6SX_CLK_GPMI_APB] = imx_clk_hw_gate2("gpmi_apb", "usdhc3", base + 0x78, 30); /* CCGR5 */