From nobody Tue Jun 30 04:49:39 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5872AC433EF for ; Tue, 25 Jan 2022 14:50:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1580475AbiAYOuR (ORCPT ); Tue, 25 Jan 2022 09:50:17 -0500 Received: from mail-eopbgr60092.outbound.protection.outlook.com ([40.107.6.92]:23918 "EHLO EUR04-DB3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1579949AbiAYOpB (ORCPT ); Tue, 25 Jan 2022 09:45:01 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ixNNiH+nd1DE1b51Y4Dg47/fk53b0z2TfJfEkp633CCj384ZFi1EXKigw2XEmpRUKMizkF0fAv128taNy23tvZ8Yr+wzEGENu5M/N6K2EB9+kTLkdd9b+uFFJApgi4hrd0W/C5QmOCpwT4W7Tu5mv9OrRTeFS5PtOfmPNzpVAyMyDY4MaA8GTNw8X79Ip9CFCJSoRY9GHq+5Gs7CA9NuNC71CilHFgko44M5irkih7fo4rR7zoiJSlmpIL/CfCYqLd08yl3v9Y7NrruJASQktOlD1L+0f9esYjsmkWnrecvN3gnP1+861jkzuoJSZ62beo9O3RT3NFhQntnLej26YQ== 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=baVB8Z6tQlRjIKBhTdqm95Viz/ImxtQy2ZTQ58J53DVPS9oW4cSS0Bqjmzu+gm9TDXlqE03+TnwgivE0Sq+5R9IOwYdj/lK4iZTV8Tzb7IOUysNVKGRm+OpehVhGAZK0hzaAeUVGnFmqzv815N9cfU7gG9wPCW2h/Wg4G1V4qwnAZtK8eXrj/Da9vtucjQrv1WFDpYQBWnSD0aLgL7k9Qu8JsdqDI8skeRkbu0QsG+D2hzxPSq3DUV0ry5k2wdMpSrALZSSFN9fNIeKMeAw62kj3eS29KFQ/p6nPo0cBMXNs87jRRvoemVZ7t/y+NevVr+xey1nhQ8kcu9azbXNQTA== 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=s5jgq3EkR1rcsnWU5oq7YCF+zc9J+0HnBeKRJFkVbB7eCdtMwANRioyP+apUtgIleWKcoSiP41GNuUsXxy3UanFcr7RLrqNuqOKQGmFNRiAujw8aFBhZ8i3INi2qIRB81BjI4ezf6ZkpOb2JflMQF5J2svPzvwngLjQCzQp80t8= Received: from AM5PR0701CA0013.eurprd07.prod.outlook.com (2603:10a6:203:51::23) by PR3PR07MB8097.eurprd07.prod.outlook.com (2603:10a6:102:170::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.9; Tue, 25 Jan 2022 14:44:52 +0000 Received: from VE1EUR02FT018.eop-EUR02.prod.protection.outlook.com (2603:10a6:203:51:cafe::f7) by AM5PR0701CA0013.outlook.office365.com (2603:10a6:203:51::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15 via Frontend Transport; Tue, 25 Jan 2022 14:44:52 +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 VE1EUR02FT018.mail.protection.outlook.com (10.152.12.67) 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 14:44:51 +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 15:44:50 +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 , Subject: [PATCH RESEND 1/6] clk: imx6ul: disable gpmi_io clock before changing parent clock Date: Tue, 25 Jan 2022 15:44:36 +0100 Message-ID: <20220125144441.17750-2-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125144441.17750-1-ceggers@arri.de> References: <20220125144441.17750-1-ceggers@arri.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9ef2385d-fe42-4621-b69a-08d9e0113e98 X-MS-TrafficTypeDiagnostic: PR3PR07MB8097: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: 8Kvn5/hRFSHxHYn15kkvMty9n6pkyfCnh4UINWNaHK5Gcr705fhFQK2iS7WpjFfB+YY7PrfjVRv8gk5d64c5ZTJLt9ssYhMBBgDQH77PAHrjwV1ZP+yYBtjCwuBc08LD6/SiZHxQTmzyjTELI64bsiZQEtB1P+pn3KHXT6gedvEDb/xOQb57ZFovNA+AgATP/uBQZN6xJ/FaSsv7aGCspSEDpYXbwkTH+saAG3PmVOxnp4j8tvoP9XaEY1+2JytKnMs7Q60XmeJVM+7bEqYW7OdM0dh2RaNZ0LWVEnHeeNUgtKMUtsp1WhYHi5+RmbJ710FPa8NXdU7gMZpsHxrHkP8J6H+elhT3YG4F65kuZWdY2XPLT7y7xWOc1lKI6i8ClkH7Taorj0nomsZyDdvNBawmb61q9Vzgd7p8VVuBA9N7fAMqfkvoRMfdU+qQ53MgEQpgEKdkDhOkbzU0NdQx+gTQcbkbLQwZcJAVAhAtx8iaEiuw2AD1Tv37K6j+8GSMH6OPHUII2rwWAtOcqxN6kHUYMVYewpDtgqXmTsZGaZ5DfcKotF5D5ADetMzuq/FSZ917Za3LupHK6zsU68OOd2jCY8u9GRXuN56yS5aqUOd6ARiX22wfQtA9tjE4NmTmwdVTCHo/mXRwsvun8dLDHM4Gf6gZU7uaqHXq8tzz3J+rs1KVvd+KtAJbSw2l4xqC77lsmWSPbu7ooGXkUMWf75GgV0iNqOC3ZepiVUtwlcAJTrpn8F733RPuHhS85K5zRuEwMMEUZauWJgVdcMQ3bg== 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)(316002)(6666004)(86362001)(81166007)(2906002)(356005)(82310400004)(26005)(36756003)(4326008)(1076003)(40460700003)(83380400001)(508600001)(8676002)(70586007)(70206006)(36860700001)(54906003)(426003)(186003)(2616005)(6862004)(336012)(8936002)(47076005)(16526019)(107886003)(5660300002)(32563001)(36900700001)(20210929001);DIR:OUT;SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 14:44:51.6397 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9ef2385d-fe42-4621-b69a-08d9e0113e98 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: VE1EUR02FT018.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR07MB8097 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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_no= de *ccm_node) else if (clk_on_imx6ull()) clk_set_parent(hws[IMX6ULL_CLK_EPDC_PRE_SEL]->clk, hws[IMX6UL_CLK_PLL3_P= FD2]->clk); =20 + /* + * 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); } =20 --=20 Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninge= r; Markus Zeiler From nobody Tue Jun 30 04:49:39 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0799CC433F5 for ; Tue, 25 Jan 2022 14:50:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1580495AbiAYOu2 (ORCPT ); Tue, 25 Jan 2022 09:50:28 -0500 Received: from mail-vi1eur05on2110.outbound.protection.outlook.com ([40.107.21.110]:48836 "EHLO EUR05-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1579934AbiAYOpB (ORCPT ); Tue, 25 Jan 2022 09:45:01 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n4Ehsa8DTOVCbm1CCspIjCdCTggRPxQ3T0T55bFQ0wKRWuUjpeM7uPaTnZgzJIawGdvy4Fi1iPb3Xa2F6b5yaQZrmzB8k0nCUClDzJun/1NSGhkKxfVnOX+fqdmTwhYPHI70ef2AwC8L6uVpsYpk34CYa2lJdgqlr4+kPCPubw8PqXEXWYfgoKOOUdl1yt985e8B65/HYPLl1lVFuXmKkKpGWozfSxr7NRvmDaQpxbWt8YIDzbRb6Xd2zdHe2X9Hx33at9/A1iCR0UDI4jUIbL5Lks6B+tr8/a2YH84Eoq5drJPw32A0a2eZApsM/MThUJNrvoi2gAF/UMuncV4S4w== 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=W/ti5G8O/nktDh8cMcmTGeyAmPslF6ASeEWTykUvIGlB3pSQ7Cy35C3LJngBoU6Pi3tmcF8TeHqi2wCz4oGUB4vQ6X/gs1ZOqojEJC5NBVQwlCyJlE0JzrxCNxW4H9V8+KdX1hbf4RHMJRJOcMPM7K3NL/zSgtAQrH6bUMZGk/37vxR0JAP9LcqNJ3Hl9+AHcCN0CRSpv4c/ZYD18A800I/t9fpmn1ZDkXMyRU3Q7nLIvEGy5s6r5jxIv184VAzjqU4ugATCyhd2BDf1l/IX7E5V0orq6DyD36mLugEXsfSGVZnDkajQWqWoe7zzsnO5xZvX5IddgQPrzGkPxqV19Q== 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=cfvlO64LdPWMZ60QaFJaxoGtZ4i+s+Jgmu5KWGFPaxGt+aFA6M2iNOOl8vpk85ts/Ed7BP5MbC7x1AwKRdYAgzbGVkRvQxWpFDb3guSp8ZyLUMno2vSDw/yY8hYvT5UMfpPRx5N3FOT2P+yhdN5rze+kcnWLiL+wnPas3qN3kVA= Received: from AS8PR04CA0016.eurprd04.prod.outlook.com (2603:10a6:20b:310::21) by AM0PR07MB5841.eurprd07.prod.outlook.com (2603:10a6:208:118::33) 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 14:44:54 +0000 Received: from VE1EUR02FT007.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:310:cafe::10) by AS8PR04CA0016.outlook.office365.com (2603:10a6:20b:310::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17 via Frontend Transport; Tue, 25 Jan 2022 14:44:54 +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 14:44:53 +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 15:44:52 +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 , Subject: [PATCH RESEND 2/6] clk: imx6ul: enforce gating of gpmi_io clock Date: Tue, 25 Jan 2022 15:44:37 +0100 Message-ID: <20220125144441.17750-3-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125144441.17750-1-ceggers@arri.de> References: <20220125144441.17750-1-ceggers@arri.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c739e69-60f2-4e98-595e-08d9e0113fc3 X-MS-TrafficTypeDiagnostic: AM0PR07MB5841: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: 6iFKuXdVXx/L2AsSn3qTFZurKn8rlJhsf44heoApHfv/S2Lk+ZuaoL2KTCXd+39Ag1VY4gWFNEEOCeteYRbBtz3GPy+cagQamIg0dnKA9bfAf4WOW6dEMXfu/3rx679hRzjjaY3kThjLrJXwOqSVb+gR4npekSHl3WwRkk5ffSAe+Fvx+IfN9shQG462WccgXs7d0sisQHqnChPUx1sPuO+JUwVRdkPMw6Y+pO+ulEXLqK1hgdZquLm6ZfLKLVFKyGlgHbQNY0LwOhDJg8DvQDzfM1UyWAmt5KXMrDtktcGcL+VJmQv1J7QRFdi4bx8gQQK3I0ELGturTAZWyjdKoEZHTzDdELm1Sxx/EFW6Yz8svc0fs3eJ4xfFsaa+gZVR1/Qju3gSoVhHegcXWoGqSfcR8IO+EFlcVUGXgV2W5VfyyPeC/tGNOFWIN/mlfpEi7hO1ypOsW1MI/BxwT3T51a6dXnET73Y8ofq82c2/7IZUENkgvPjqKJKa5SaPe3dCL9nuzNOk0l650kAhOAx1zg1Q63Ersq7LFeR7p9D6wybMKHj02qkhWDEgL/iJ0JF0c6GSNE1uZWfBHCFH/buMj9DcH77llUtbDBm/hh7jTQHo1hbw4pTa97abt6UPBhfk986nY9CeawlftNKjWk7Qj8aI1ogakT0LmPpyk4KB6dBx2xlaUOFsoziZUaNrbSCrqALoGvSRa/P6aPAkHGO2zHMsdD0bIQdG8SO4HturqJ8= 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)(36840700001)(40470700004)(46966006)(5660300002)(83380400001)(2906002)(4326008)(82310400004)(8936002)(70586007)(6862004)(8676002)(70206006)(86362001)(356005)(81166007)(40460700003)(1076003)(107886003)(36860700001)(54906003)(336012)(2616005)(36756003)(26005)(16526019)(186003)(426003)(316002)(508600001)(6666004)(47076005)(32563001)(36900700001)(20210929001);DIR:OUT;SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 14:44:53.5993 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c739e69-60f2-4e98-595e-08d9e0113fc3 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: AM0PR07MB5841 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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_nod= e *ccm_node) if (clk_on_imx6ull()) hws[IMX6ULL_CLK_ESAI_SEL] =3D imx_clk_hw_mux("esai_sel", base + 0x20, = 19, 2, esai_sels, ARRAY_SIZE(esai_sels)); hws[IMX6UL_CLK_UART_SEL] =3D imx_clk_hw_mux("uart_sel", base + 0x24, 6,= 1, uart_sels, ARRAY_SIZE(uart_sels)); - hws[IMX6UL_CLK_ENFC_SEL] =3D imx_clk_hw_mux("enfc_sel", base + 0x2c, 15= , 3, enfc_sels, ARRAY_SIZE(enfc_sels)); + hws[IMX6UL_CLK_ENFC_SEL] =3D imx_clk_hw_mux_flags("enfc_sel", base + 0x= 2c, 15, 3, enfc_sels, ARRAY_SIZE(enfc_sels), CLK_SET_PARENT_GATE); hws[IMX6UL_CLK_LDB_DI0_SEL] =3D imx_clk_hw_mux("ldb_di0_sel", base + 0x= 2c, 9, 3, ldb_di0_sels, ARRAY_SIZE(ldb_di0_sels)); hws[IMX6UL_CLK_SPDIF_SEL] =3D 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_nod= e *ccm_node) hws[IMX6UL_CLK_PWM4] =3D imx_clk_hw_gate2("pwm4", "perclk", base + 0x78= , 22); hws[IMX6UL_CLK_GPMI_BCH_APB] =3D imx_clk_hw_gate2("gpmi_bch_apb", "bch_po= df", base + 0x78, 24); hws[IMX6UL_CLK_GPMI_BCH] =3D imx_clk_hw_gate2("gpmi_bch", "gpmi_podf", ba= se + 0x78, 26); - hws[IMX6UL_CLK_GPMI_IO] =3D imx_clk_hw_gate2("gpmi_io", "enfc_podf", base= + 0x78, 28); + hws[IMX6UL_CLK_GPMI_IO] =3D imx_clk_hw_gate2_flags("gpmi_io", "enfc_podf"= , base + 0x78, 28, CLK_SET_RATE_GATE); hws[IMX6UL_CLK_GPMI_APB] =3D imx_clk_hw_gate2("gpmi_apb", "bch_podf", bas= e + 0x78, 30); =20 /* CCGR5 */ --=20 Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninge= r; Markus Zeiler From nobody Tue Jun 30 04:49:39 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D5A8C433EF for ; Tue, 25 Jan 2022 14:51:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1580681AbiAYOvq (ORCPT ); Tue, 25 Jan 2022 09:51:46 -0500 Received: from mail-vi1eur05on2116.outbound.protection.outlook.com ([40.107.21.116]:26080 "EHLO EUR05-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1580091AbiAYOpG (ORCPT ); Tue, 25 Jan 2022 09:45:06 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m/OGwhw8YtyWn2O6wVhk3XA7MDfQ2NmR3aXYH+v1N4n+DqbEZqtaDWU3j+mVFW3+6fPjUO6N4FT8MhhXlQ+5WuLNSaZ9YGiw2p+uRxSQWqKYbLALVcA6GcUhENu8dF8yxFPlKSDPc0cYhdiVQjrIy5OHNrjbdR1yDqqKEuoq2Z/F9nmXGTNYy1NNeABgSzcLhhFlEnSoeIu5xCbDso3mWYgLnYYbfk+UWgv2hfzGSwoLUT7ac/7QmffXPOP6XUC0FJ6DSEDUJ1FkSafNDcpxlgKMhO1DF6EN0k5UTnDcd9PS/6RAVLdACbEo6RGNRAPqgRewPp7d8EmBNgC6N6RQhg== 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=nhLClu2L6bpIk/hCdEgmxwpr18B2kr/IYe+e+rTu5KGqnjHBC6JUO/KA7PqYitqjLhU1gY6deTjzvmFEjp1kH8Ep9dn8bHNte50XBIL7Li0GbZiQhgaMhL3vtATwHQ7ZJrXbI88nS+RgDyHTvyf9xCZ9MuHiArt6meBUiih6kI8+getYMcH3QjE8znIQ8Bhok0Dv1tseyCz2xotckBci4b9kpAmLnCdRXtHH0RSgPX93AUuVn7qlsiYxmLYshDhvJsKNrpoxdAB38b93YL1nps7VtXRKifhw+Q4IVdoKLmb7HuRxc5kBILS1iJnZbfCM4sgNyur+/ZeQo0UBst5aPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (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=MEePc4rBV3OYIDMFIOMOU7AoahaNa5zLzN2S0vex5w38n/8KrYqi7H9LzyeKyyjuCgrg0ZupGT5QXaZ89MlmJlTmE05Ofz8xBErBEYuUelTsNttF6IIuZGIx16y44UYdRNHJS/3i6+vbIZXEW/yXdHT6kPL9dKYGHoo/s2JVsJc= Received: from AM6P191CA0065.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:7f::42) by AM6PR07MB4501.eurprd07.prod.outlook.com (2603:10a6:20b:24::24) 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 14:44:57 +0000 Received: from VE1EUR02FT015.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:7f:cafe::29) by AM6P191CA0065.outlook.office365.com (2603:10a6:209:7f::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15 via Frontend Transport; Tue, 25 Jan 2022 14:44:57 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (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: TempError (protection.outlook.com: error in processing during lookup of arri.de: DNS Timeout) Received: from mta.arri.de (217.111.95.66) by VE1EUR02FT015.mail.protection.outlook.com (10.152.12.147) 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 14:44:56 +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 15:44:55 +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 , , Stefan Riedmueller Subject: [PATCH RESEND 3/6] clk: imx6q: disable gpmi_io and ipt_io clocks before changing parent Date: Tue, 25 Jan 2022 15:44:38 +0100 Message-ID: <20220125144441.17750-4-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125144441.17750-1-ceggers@arri.de> References: <20220125144441.17750-1-ceggers@arri.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b4dff9e2-0b75-4dd4-9fc8-08d9e0114145 X-MS-TrafficTypeDiagnostic: AM6PR07MB4501: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: FznDAkh4sNjEFM/jEMDSo/bqVhr/hZXabn5cuXglc9atBbGAhGf7/Kcbq7kklYv+uPwOtXq+FRP+h1/R9VuJLCM7O/JgrT0PxFp5dgEdM3ceZ1OoxZDjdJVsxyk2VOjR3sIdOZdTySedTVQuo28OaKhvHPjgYb//VAZFJWNPW5FSaWSyPfx9rydsmqK8OEACsPiwhka5mfArd7MRASavALcwGEu2A27bTrOP/7yeJs2o/xv4p6T/+3FYpG6rkh/vOZUT0fj/chtY2PgbvHnhH8u51WCo2fIDXsMkM1RYNHUJUZbGYTQjKR4l9Ivb2CU3WhAQ84Q2u3lmRlyAZhR7dy3CLVVtez34daCsgzhvB+Nf5jKGy9EVuwonSA5ZTq0hDfysEOO10gZsLXUdemg4p+aBTjKR45314fNBXvyPjDMNCQtkHEpEEKLiy07dZu7JgBmKRze1+9vAYWc8kUgsNJ3dskH+z4bVcpApCts0ChkYKqMVis1rMtbP/GGjdzaGaPdu/OmRbHAUUxr29Hk1irGyxGJqqguPY4ns28cny6TEuey40h+Zq/TJOWleo0/dOLPAbV6WTDo9tkJRvvNgfSvR/3t1sgp4wjueqeGypw5rNLylYkMVdUw92YHM2LgfUGAQLHPdHgiFS1Ngiir7+1XtULp5OePlMU1WyiG49vCa83YoBvpWix7yW4eeQNft1PUOmfXvulBKkkcsuIFLCe3Sq8JMyYc2cqEOiR+DvHo= 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)(2906002)(86362001)(54906003)(81166007)(70586007)(5660300002)(2616005)(70206006)(4326008)(6862004)(47076005)(82310400004)(316002)(356005)(8936002)(8676002)(426003)(508600001)(36860700001)(1076003)(186003)(16526019)(63350400001)(40460700003)(83380400001)(336012)(107886003)(26005)(6666004)(36756003)(32563001)(36900700001)(20210929001);DIR:OUT;SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 14:44:56.1283 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4dff9e2-0b75-4dd4-9fc8-08d9e0114145 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: VE1EUR02FT015.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR07MB4501 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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_nod= e *ccm_node) clk_set_parent(hws[IMX6QDL_CLK_IPU2_DI0_SEL]->clk, hws[IMX6QDL_CLK_IPU2_D= I0_PRE]->clk); clk_set_parent(hws[IMX6QDL_CLK_IPU2_DI1_SEL]->clk, hws[IMX6QDL_CLK_IPU2_D= I1_PRE]->clk); =20 - /* - * 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_nod= e *ccm_node) } =20 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); --=20 Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninge= r; Markus Zeiler From nobody Tue Jun 30 04:49:39 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A2DBC433F5 for ; Tue, 25 Jan 2022 14:51:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1580658AbiAYOvf (ORCPT ); Tue, 25 Jan 2022 09:51:35 -0500 Received: from mail-am6eur05on2137.outbound.protection.outlook.com ([40.107.22.137]:32563 "EHLO EUR05-AM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1580149AbiAYOpH (ORCPT ); Tue, 25 Jan 2022 09:45:07 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SJRMHZ+s+QC4qozTfa7Frq9WZ3Jw8zkEBRmZzxWmIxIK3GoYZF85hC8+NvZ/OCID2wAXfBiXNuGW+zKOoTrcnEUdUTkcYc1CGAnaoXDDvGnxGHFUi9Pd/VKVskFG/inNt31mRNr3qbQawUvHNnEEX1o8drvWxRsJGCmiSTsHVJ2FpOArdjmnZOTy2SF1cZAW3zWVvcRhxBBH8KGERFdiP5bFUDJY0Aa/vsQM+NyZpOZtEkun3ev8pHRvaTvfMzfwYu3Y0eFO45WkVa0BGS3FUiG4yyrwwVA4CPIP2wlcwvv4zqjoWcWQJczP7BN3fX1Ebm8NOgUAi8A3mB79+cwAbg== 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=aeL5f0KDOtwDVaeRrVjUGYrN9VE/ydYb3o5XtcMU15+2Lmk86SIjevxJTtC3wSkV/D4UZxfZfhBSF1GWFEVXXIq63jo0xxv3cXgRtML4vs9egGn52PWGCWhK5+t9CkvNzaXBig6axM85xK4OpmGHVY6FOVe+sRdNktXRr+waBwdsYZPc3fWgJ09hcuPFH+x/Ux2q9hRoaSBjLILyeWrGXJB7b502qtR7OFULXNMBrVTNYOYgwxLXUYM224wGvcun7yESgkKHWQxulKlO2rN6YS6LZWCEDhFZUNOXf7jPqy+c2+GVgN6k+7D7dLYGrFIVIwgJXuMlvvs3Q0kmGkfVNw== 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=tu5lTRR3qcKo+J5unULDzg5Ui/wol7n8WETld9tWu+SMtxU7V5+50dq1bza9sqYmN0d1i8xUM8qPS1mj4rPf33J1bScduc8392gjfBsy1lwweT5AxN8m4U8D2j/yYOyNqLBXCQh14EmWpPL2WIU0NGl1bmQHvC/f5Zx6Mu6EAhk= Received: from AS9PR06CA0372.eurprd06.prod.outlook.com (2603:10a6:20b:460::26) by VI1PR07MB5679.eurprd07.prod.outlook.com (2603:10a6:803:da::12) 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 14:45:00 +0000 Received: from VE1EUR02FT017.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:460:cafe::dc) by AS9PR06CA0372.outlook.office365.com (2603:10a6:20b:460::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 14:45: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 VE1EUR02FT017.mail.protection.outlook.com (10.152.12.98) 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 14:44: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 15:44:58 +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 , Subject: [PATCH RESEND 4/6] clk: imx6q: enforce gating of gpmi_io clock Date: Tue, 25 Jan 2022 15:44:39 +0100 Message-ID: <20220125144441.17750-5-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125144441.17750-1-ceggers@arri.de> References: <20220125144441.17750-1-ceggers@arri.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c2037096-983d-49b5-682f-08d9e0114343 X-MS-TrafficTypeDiagnostic: VI1PR07MB5679: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: AYMpaKmmSapYTKeg1vbexEcYCuJNV41OtpBOVHHxnBS/ToLQUdkfNyQ5l2RoOyjJ/bMU5Fev5wUzf4ZOIn5tglJKfTJtar8MaeDOYaSxZ4zhRFsQ3CJFPvS+tyRVSG+BEyS1DE48NVonKU2CRhkZmb7zfvEPPqvvBE3uRDNVpia7uAy/Xw9ekpSqk97Tm6xvauTCb4kFQX9WK9l/zcUPp54+H/b5xtTtBLHzcbqES9QqV2QD186SEbxAfyhAde5ngAUcR1QVP0tJBk0XUpLW/nBQVyVPN0E2ehMq1tZpfv+sLBUTehbI9+4FAK4HZ7M9Nexa+WZsFnrqoaJlJUpXXbDdmPdVzlZP6UJoLs7SPAzghJYbTxnwNygYsOnla9Z5rR4fFtYToCNnxio3OuhEapvjSVhm7boMPooMF3rXjKzleDp+xv9sfYqUro3D7mQZyLbyKxSIns/ZsxNoYMDsj2gpyfg8jwMPsThnwGnZ1Ltn6uuqD5Wq4zpyx6hy7VriQHLo/Q+Xys/0vD/XKtLzJRwx0srlJfj1KjZDvTF0n7WBZ3rSfLdeyj6glyMIkX4vbMUc+q7FmOK+KDOwQxRtoywmGtrWnL43HDMYmuE273STY8WqJE2Sz9wCK2WBynbThrWDWm9PEdhUf44/feP1licZUjSe9eUeQY0sFl2K5+n5ixT9RFVEDQLBTjb0GEx/URfMSeMpbW0/343l2dxQgp+0w0JZSYtLzl+rdAOUtBRjhkGTtxSpoKnTS40mJFldI7iqYSBLE6saMAp1AkhFFxklOL8jempsb17LlkHmGXk= 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)(508600001)(426003)(186003)(2616005)(2906002)(86362001)(336012)(26005)(82310400004)(1076003)(36860700001)(6666004)(81166007)(356005)(16526019)(8936002)(316002)(36756003)(5660300002)(70586007)(83380400001)(107886003)(70206006)(4326008)(8676002)(6862004)(47076005)(54906003)(40460700003)(32563001)(36900700001)(20210929001);DIR:OUT;SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 14:44:59.4536 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2037096-983d-49b5-682f-08d9e0114343 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: VE1EUR02FT017.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB5679 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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] =3D imx_clk_hw_mux("usdhc2_sel", base = + 0x1c, 17, 1, usdhc_sels, ARRAY_SIZE(usdhc_sels)); hws[IMX6QDL_CLK_USDHC3_SEL] =3D imx_clk_hw_mux("usdhc3_sel", base = + 0x1c, 18, 1, usdhc_sels, ARRAY_SIZE(usdhc_sels)); hws[IMX6QDL_CLK_USDHC4_SEL] =3D imx_clk_hw_mux("usdhc4_sel", base = + 0x1c, 19, 1, usdhc_sels, ARRAY_SIZE(usdhc_sels)); - hws[IMX6QDL_CLK_ENFC_SEL] =3D imx_clk_hw_mux("enfc_sel", = base + 0x2c, 15, 3, enfc_sels_2, ARRAY_SIZE(enfc_sels_2)); + hws[IMX6QDL_CLK_ENFC_SEL] =3D imx_clk_hw_mux_flags("enfc_sel", = base + 0x2c, 15, 3, enfc_sels_2, ARRAY_SIZE(enfc_sels_2), CL= K_SET_PARENT_GATE); hws[IMX6QDL_CLK_EIM_SEL] =3D imx_clk_hw_mux("eim_sel", bas= e + 0x1c, 27, 2, eim_sels, ARRAY_SIZE(eim_sels)); hws[IMX6QDL_CLK_EIM_SLOW_SEL] =3D imx_clk_hw_mux("eim_slow_sel", bas= e + 0x1c, 29, 2, eim_slow_sels, ARRAY_SIZE(eim_slow_sels)); hws[IMX6QDL_CLK_PRE_AXI] =3D 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] =3D imx_clk_hw_gate2("pwm4", "ipg_= per", base + 0x78, 22); hws[IMX6QDL_CLK_GPMI_BCH_APB] =3D imx_clk_hw_gate2("gpmi_bch_apb", "usdh= c3", base + 0x78, 24); hws[IMX6QDL_CLK_GPMI_BCH] =3D imx_clk_hw_gate2("gpmi_bch", "usdh= c4", base + 0x78, 26); - hws[IMX6QDL_CLK_GPMI_IO] =3D imx_clk_hw_gate2("gpmi_io", "enfc= ", base + 0x78, 28); + hws[IMX6QDL_CLK_GPMI_IO] =3D imx_clk_hw_gate2_flags("gpmi_io", = "enfc", base + 0x78, 28, CLK_SET_RATE_GATE); hws[IMX6QDL_CLK_GPMI_APB] =3D imx_clk_hw_gate2("gpmi_apb", "usdh= c3", base + 0x78, 30); hws[IMX6QDL_CLK_ROM] =3D imx_clk_hw_gate2_flags("rom", "ahb"= , base + 0x7c, 0, CLK_IS_CRITICAL); hws[IMX6QDL_CLK_SATA] =3D imx_clk_hw_gate2("sata", "ahb"= , base + 0x7c, 4); --=20 Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninge= r; Markus Zeiler From nobody Tue Jun 30 04:49:39 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C255EC433F5 for ; Tue, 25 Jan 2022 14:52:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1580492AbiAYOw3 (ORCPT ); Tue, 25 Jan 2022 09:52:29 -0500 Received: from mail-eopbgr20111.outbound.protection.outlook.com ([40.107.2.111]:47233 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1580325AbiAYOr7 (ORCPT ); Tue, 25 Jan 2022 09:47:59 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BlRzzS5rhYQOVq/64vf6uYcHBChddIvpU6ZS0kiqEpVDLxPzPHdthyi6JOHKo4r/WJ1E+5j0ikwqf5eAFpt4uNK6SMI3bfHWflG+MATIG7Wj9SB2NIdo4ipoKQYT1fOGPSjXkxetIQJIwijpvc6r6pdBM9n7b7W3IwKKL7YSilFfFxuu9Xp31fYEzqbVuF5jiOXKVYu/gtaJ+vsXBIQhhKLL+y7jrQqEHiu2GG3oE8amMSR++ODwydrnESskZAl390z+djt/eoaI/UyNyrLgrPsTfi3bmGLjPEImy6NvipUaDFrQeJWNs6IM+l4TAHxjLljXyGozjO3lcmS88WqSgA== 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=n53ED9uE/kGPQgr3gQFsVf0ym2e2zag+9daxXCHJjFKYPfsoMH68+UHSD24xOCHL6uHNy4Ynu2nhqb4mzz2RjzrP4Zp+EFM76PRYISgE0Fy/dHnnVGN0u/ra2lnCJ2d+bf8rsmmT801fQlfFJENCZYlcYWrf+Ics/quEnCpRISL2BMUjhA5b3ijv8YPKMr+EEN1Dutm47SZDMyoCFUR8MqQKgiFmUuWDBZe52C0pwyLvil9TOP/ZYCP82LtpK7DjoBQHGcdSPxeyjET+RYWLkY5U1d4tVLxO8qj4SnYZngZAVr7pJURMv0pz42mqqJun4usrW2fE1M8yJQS+JGvCtA== 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=OkgXCL1fBrJcujpYCSrHtrMgqbbd3OgZRGCi6KrbNMdDDZQNUA6B3E0Q7lYoDgRNN8/mvRh4Iz7Ny4kEMxITQ+w68I2Yl22jvCGajKJi+ZRAoaIuhp48S28btx3JwYC7Xj2qT8Ej8aXBp2Xeq5s2+q8nbK1VzK5IUwbHznR1Gv0= Received: from AM6PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:20b:c0::31) by DB9PR07MB7881.eurprd07.prod.outlook.com (2603:10a6:10:2a9::21) 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 14:47:52 +0000 Received: from VE1EUR02FT041.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:c0:cafe::64) by AM6PR08CA0043.outlook.office365.com (2603:10a6:20b:c0::31) 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 14:47:52 +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 VE1EUR02FT041.mail.protection.outlook.com (10.152.13.33) 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 14:47:51 +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 15:47:50 +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 RESEND 5/6] clk: imx6sx: disable gpmi_io clock before changing parent clock Date: Tue, 25 Jan 2022 15:47:35 +0100 Message-ID: <20220125144735.18091-1-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125144441.17750-1-ceggers@arri.de> References: <20220125144441.17750-1-ceggers@arri.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c876eaa-c37b-4eb0-8eec-08d9e011a9a7 X-MS-TrafficTypeDiagnostic: DB9PR07MB7881: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: Aa+qblL5BtDAFmfgUQ6Plv2UiX+veTc6nwnMxkF3OrHBM4dCHnqmy8RG2OQvLv2v1XUcaZbrjWfSzKnWbSVEHla1qtSRJDqd7WtXLDSFMVdfs6WxzDGrnGBoVSBAg0bLt4uv1920kAjwh426W5jG8tMKEJrJkU/2T/P/hXu7J94ZadoqvDBtWSj89Cop3QxVAlOXeAFLCnZ6V30RkY610iNvHuVFUOARp58IP6cEsSn6u8meHGz4GiyjTHFe2R44dNdU0cIHdNPHap06Tx1FKJVToZfSQfVvdnEVY+2ugoTSAiPuHKyt0hH+NO+TuQeBAvEhg6K0tPCI93QwoekFvnjOyTnK0AhKjPqETAJBAQ0lGueNsIvdRJV/T4bzfMx2sQ8drHSQKEnoksWW66OvVqtl5Ufh1mHihrOCldSy5JxO9PYTYJ+rlTnwj43A32oAUxgiaKe0EWGGG1DGP12/NJn61X4IXgC6W5JJvrceDu6zHDx70Z+N5811ccLbpQEBtIoaBFG3m0lRUxJKjxoN2Wk0wznw3gEE23X9QytAILBaxIIF+EFU0238PYE5tTDqu4sFgG92+2kqxGp3NWZmQjPmTN58IMsX0jLD3Asw2zIHPGvtGGa3DZDxOeaQ01boKab1dGupmdIDKVSlauyVFuAKKVqArATkTn8SvGmbXu6pY9ng/g6J7VEyJe4e57pgUQNAuixV5Z4rnQ7SJqup7mmYKsCpa3AZWYre9aCyRJl43WoT0w9hFCHSvfbt0SP5VkGq7K962lgaCj0Deh66LBpV7YnHN5BDpZOJptVBVVc= 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)(81166007)(40460700003)(83380400001)(4326008)(70206006)(8936002)(2616005)(70586007)(6862004)(5660300002)(8676002)(508600001)(86362001)(356005)(2906002)(426003)(186003)(54906003)(26005)(107886003)(82310400004)(316002)(47076005)(36860700001)(16526019)(1076003)(6666004)(36756003)(336012)(32563001)(36900700001)(20210929001);DIR:OUT;SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 14:47:51.2511 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c876eaa-c37b-4eb0-8eec-08d9e011a9a7 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: VE1EUR02FT041.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR07MB7881 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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_no= de *ccm_node) clk_set_parent(hws[IMX6SX_CLK_GPU_AXI_SEL]->clk, hws[IMX6SX_CLK_PLL3_PFD0= ]->clk); =20 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); =20 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); --=20 Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninge= r; Markus Zeiler From nobody Tue Jun 30 04:49:39 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E70CC4332F for ; Tue, 25 Jan 2022 14:53:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1580971AbiAYOxd (ORCPT ); Tue, 25 Jan 2022 09:53:33 -0500 Received: from mail-db8eur05on2110.outbound.protection.outlook.com ([40.107.20.110]:53501 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1580353AbiAYOs1 (ORCPT ); Tue, 25 Jan 2022 09:48:27 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CFTaCluS5o8rQnfeRpl9GPolXaajW+sck2f05H8MwGAid9FAhXV4jL2yB3E0fg7upKO7+2U9RoAIRQrOinBMl1O6+h3iHDdLO7HtY+XiseQk0PWzQCicoK4wU6VvSdb9wGnWC19oSSMzh3C3IZWq0yDk0RxdL6//mwoUUlcrRbXBQyzGWDRGKnwZzypop+laus1B5q06QlOofQVit7yG7bU59tsEHEhKueWRsCrlPtDdEii7T85rgE8o258PdeduXf7mXEvvE7O6R0bCPSdxRFoT4hLT+zkL45KM1F6CezNXdwhlC8sp9KZS0u1r9DkfY9V11lIQ6Xnbjho4Et+qBA== 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=NPrgocyYrdkX36sJALUUf0ksFymvKvEFNV6Lyg9sWJSGzzrGGWuFQzGBM4QujQ2zcfSgYGttk5LolyRnJSaeVfi93LXDBWOz/Tt35ihGo9jmP1d9y1fLwm0MbzPOdEyZaj23D10MMX+nV1ne6j4rKm0QW7Ctx3eZ7MJewOsYLryB1gsRYDjDlyH0lsDL8eKBIfUp/SF67HggB0qlVBF52VG6u5DVNbmd03aZWz3xMwUFukOtpdzGEYz8wgvIXIn5IUOyvkcI4Q8p+TvJE/Tv/ZTs3x7LmMHrubdk17jGlju71OYPvsIg+4w0rKUf1J+hsCvuG2TRNPoxxPlRWKeWZw== 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=mZDW33RNafee50b+cSL30S3DRNlbBGVhiZylKELWr9S/84xjjhCgH27Q9PwXyO0dawFf38U4vR7bBsZ4t6YFFbDCKpchISRgrNptejcexbcinKY3NZQ6Og7e5AolPmgpiR5Ftr0hNH7ox1BAzCIAIgqbcutSJ9WEnvagSPbjIlU= Received: from AS8P250CA0006.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::11) by AS8PR07MB7687.eurprd07.prod.outlook.com (2603:10a6:20b:25d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.2; Tue, 25 Jan 2022 14:48:18 +0000 Received: from VE1EUR02FT050.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:330:cafe::fc) by AS8P250CA0006.outlook.office365.com (2603:10a6:20b:330::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17 via Frontend Transport; Tue, 25 Jan 2022 14:48:18 +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 VE1EUR02FT050.mail.protection.outlook.com (10.152.13.198) 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 14:48:18 +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 15:48:09 +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 RESEND 6/6] clk: imx6sx: enforce gating of gpmi_io clock Date: Tue, 25 Jan 2022 15:48:01 +0100 Message-ID: <20220125144801.18158-1-ceggers@arri.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220125144441.17750-1-ceggers@arri.de> References: <20220125144441.17750-1-ceggers@arri.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.54.129] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 29754e65-6799-4362-dd80-08d9e011b9a6 X-MS-TrafficTypeDiagnostic: AS8PR07MB7687: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: u/gctByeXbyyScdxoOIpSDoMN+n7UR6OSDN8p9W0rSujNjqIapoTr8stzN9gOBUbzqZnFVobf1nF/Islm8HoTYMgfop7ZEmRL/1OLQypsk8RnFJ7qOaW0jgwIboGbtYYcNZKlzP7FmjN0ue3iQjFO5FKl8Vjg+GhiRbV+i567AIKyRJuFMF86NLOszOWhknBFlqxNeIMxWhuGdKzQcw4jTzysoq9oS1Mygf3ijfC7p/dl757fSLnf5zlumbGb8bqFYB05m7w2Af+vpKPpLhTtuUMYXjSE8eEJ+M2N64I/7hR4IxIYdnut5A8sn4pr+nIXPBrPJ54KN/sqDOn0AcC10khT3TP3JegQPF5XBqOZpD1GmgV/jIUyfi+j3ykNrxwqeQkCpZwzRHPb7KpWUKliEojpW+ZwBKME62lPLCASwauecnaicoI0509jyExcNE+DeEpq7YVpbVZ9CtZmEOtvcHoTpQoZNVBnMHTlyhmiwi1T7UDsfMDmeZkfEQSx0S0JMQ64AhuzudZhk5a9jr/zKBBkqpFSznmOlhDdtPzCcLSP2ea6vWB7LJv9yCDYrFbnE5lRHqnifdhOPzH14BWpH287eliN50/MWuN74uUSGrRWLngjTw0lMmC5kggxxS4HAPHDr3+rK55DR6UeUeDsnVDcOKF4qFun9DFvR2BMakBLiQlziMRcQYyqgte9S5CQkmfNMKQB0IlNHVN9aqnNikb2p4pKOFEtQ5es0p+0TA0cjvN4oktvv+uX6ysKUmDBCkynN/Hsu7Q1FlBWBoqcLU5f/XlO2i3R06Yrx71jeA= 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)(36840700001)(40470700004)(46966006)(316002)(86362001)(186003)(54906003)(36860700001)(426003)(336012)(16526019)(5660300002)(107886003)(2616005)(1076003)(8936002)(82310400004)(26005)(6862004)(47076005)(83380400001)(2906002)(8676002)(4326008)(70206006)(70586007)(6666004)(81166007)(356005)(40460700003)(508600001)(36756003)(32563001)(36900700001)(20210929001);DIR:OUT;SFP:1102; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 14:48:18.0766 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 29754e65-6799-4362-dd80-08d9e011b9a6 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: VE1EUR02FT050.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7687 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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_nod= e *ccm_node) hws[IMX6SX_CLK_ESAI_SEL] =3D imx_clk_hw_mux("esai_sel", = base + 0x20, 19, 2, audio_sels, ARRAY_SIZE(audio_sels)); hws[IMX6SX_CLK_CAN_SEL] =3D imx_clk_hw_mux("can_sel", = base + 0x20, 8, 2, can_sels, ARRAY_SIZE(can_sels)); hws[IMX6SX_CLK_UART_SEL] =3D imx_clk_hw_mux("uart_sel", = base + 0x24, 6, 1, uart_sels, ARRAY_SIZE(uart_sels)); - hws[IMX6SX_CLK_QSPI2_SEL] =3D 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] =3D 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] =3D imx_clk_hw_mux("spdif_sel", = base + 0x30, 20, 2, audio_sels, ARRAY_SIZE(audio_sels)); hws[IMX6SX_CLK_AUDIO_SEL] =3D imx_clk_hw_mux("audio_sel", = base + 0x30, 7, 2, audio_sels, ARRAY_SIZE(audio_sels)); hws[IMX6SX_CLK_ENET_PRE_SEL] =3D 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_nod= e *ccm_node) hws[IMX6SX_CLK_PWM4] =3D imx_clk_hw_gate2("pwm4", "percl= k", base + 0x78, 22); hws[IMX6SX_CLK_GPMI_BCH_APB] =3D imx_clk_hw_gate2("gpmi_bch_apb", "usdhc= 3", base + 0x78, 24); hws[IMX6SX_CLK_GPMI_BCH] =3D imx_clk_hw_gate2("gpmi_bch", "usdhc= 4", base + 0x78, 26); - hws[IMX6SX_CLK_GPMI_IO] =3D imx_clk_hw_gate2("gpmi_io", "qspi2= _podf", base + 0x78, 28); + hws[IMX6SX_CLK_GPMI_IO] =3D imx_clk_hw_gate2_flags("gpmi_io", = "qspi2_podf", base + 0x78, 28, CLK_SET_RATE_GATE); hws[IMX6SX_CLK_GPMI_APB] =3D imx_clk_hw_gate2("gpmi_apb", "usdhc= 3", base + 0x78, 30); =20 /* CCGR5 */ --=20 Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternum= mer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninge= r; Markus Zeiler