From patchwork Tue Jan 14 07:27:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11331461 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8AA214E3 for ; Tue, 14 Jan 2020 07:27:44 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 8B27E222C4 for ; Tue, 14 Jan 2020 07:27:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qeQeyLPX"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="ifgo6CAs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B27E222C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NH1MoWZkH27hZbwO5voPsOysyU3WUVSxxX4HNvjvNwc=; b=qeQeyLPXKFH1Dj pNHEf4ojEdZnEJVDwaPBbCuYtIjJuhly2YsD7C1q7SlP0elair8xgVp6YOUdr+TNyNYo5us1mqm+d BcET3q8Ls8AJEOP3Zk8dqIr5Am+92n1wGz07r+vyY5/T54J1bmf8XqFdGaxfm9tSkvoEdLjl09Sjf tizp1h1qIHAP5ptCy8r38LcMOI/jOL97ZLkn/ze7RelOqeNCQjBYcfy6roXK4PZVVKzM9Oo+2vpU1 VIvsd8ys7GqriQ2C1gBNFgXX9ZnDHw/uOa71Hm/THp6mDtgBhUtp2KeqViTDkmdBMnYGwAaeo72Fv q9bW2JG8kX0V8S8YGl9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1irGc3-0002x7-0C; Tue, 14 Jan 2020 07:27:43 +0000 Received: from mail-vi1eur04on061c.outbound.protection.outlook.com ([2a01:111:f400:fe0e::61c] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1irGbg-0002YQ-3y for linux-arm-kernel@lists.infradead.org; Tue, 14 Jan 2020 07:27:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RoYvyVcYglt3u3wiDZ99xqayudNInRyTGNrlunih+3fN06SWpViXkytXN7SwnzxR6JsSMhjYZzviuNGQ/33FBDdIVHRoQLZXR4yhTbe+NMrXLKaRnziwD94y1oKaewsDQk+ME0bSbHVgdtCvlWffIRw3IHvej+bzp2BBZI4jlQ/8+KiEqBb6gk6GcWeFFOl2WqNomjZisCOCypFsqRZ5jNelNl8qfWrBIjTHSy6fbIs/oZdMsRyAoubafPcGGupelLp5keXJ3YP+O7YC9q9xDa9LYiXabj8W4OsuR85go5B+3Y46SsZoOiyJ59ClT09MKWlFVNEwizivVjgqrrKYXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RVBsOrrIJtM8aBTF6ArFlPCxdqS2xZkxNEwG4+vr0xE=; b=Ii9L6jKL27tNLkp2IWnuWHXG1xVTKFGn0hcwNxl748G3VvWkXjaV9P7W4CwlwrVXwfH0d+6ks6eDEbSGFdiB+RpV3QeR3WsD7BgmZ8kkE6ydI5HJJt86b8Mp0Ytfk/w/SijgyeGQ9l1/MnEsi0fuxLYcjwVuWlFMzdEqwJtZppOrRTILJXE8e+X6thQh9tAlEAtDpgItO4stl0W2WAjxiL0tAhKFjAzWIliBTEPR5hGG6LSZz2GW4K78jOWn988ydnO78zDrKI0jw+l1ShuzCclX3/ASyyia7I10foVq76+iO8YSDBKM8DOcqugxoUa0LknUB3DZSe5/ZQXWXxdcow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RVBsOrrIJtM8aBTF6ArFlPCxdqS2xZkxNEwG4+vr0xE=; b=ifgo6CAs2muuOKV/HadNbJxD5VNZZgPe6zxWVvnE9sNEvJzUg8GmXiA7xum5LKYS9VAEefVok2tUyU5+D5GD+1iEANCA9l+BJMINRj982FJh9/CCJ+aZul+qefFf49fc+/tIm8t4miHy2dV+u5wT91P3DQTCVFZd+BKHYdi1SIU= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5490.eurprd04.prod.outlook.com (20.178.115.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.10; Tue, 14 Jan 2020 07:27:16 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422%3]) with mapi id 15.20.2623.015; Tue, 14 Jan 2020 07:27:16 +0000 Received: from localhost.localdomain (119.31.174.66) by SGXP274CA0009.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2623.9 via Frontend Transport; Tue, 14 Jan 2020 07:27:11 +0000 From: Peng Fan To: "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "festevam@gmail.com" , Abel Vesa , Leonard Crestez Subject: [PATCH V2 1/4] clk: imx: imx8mq: fix a53 cpu clock Thread-Topic: [PATCH V2 1/4] clk: imx: imx8mq: fix a53 cpu clock Thread-Index: AQHVyqwL+gJCbLkXRk231KEqZiOAVg== Date: Tue, 14 Jan 2020 07:27:15 +0000 Message-ID: <1578986576-6168-2-git-send-email-peng.fan@nxp.com> References: <1578986576-6168-1-git-send-email-peng.fan@nxp.com> In-Reply-To: <1578986576-6168-1-git-send-email-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: SGXP274CA0009.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::21) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: bca1712f-342a-436e-07c0-08d798c32e11 x-ms-traffictypediagnostic: AM0PR04MB5490:|AM0PR04MB5490: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3173; x-forefront-prvs: 028256169F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(366004)(136003)(396003)(376002)(346002)(189003)(199004)(66476007)(478600001)(66946007)(2906002)(66446008)(66556008)(6506007)(64756008)(52116002)(186003)(2616005)(26005)(44832011)(16526019)(8936002)(71200400001)(69590400006)(956004)(81166006)(8676002)(36756003)(81156014)(86362001)(5660300002)(4326008)(6486002)(6636002)(110136005)(6512007)(316002)(54906003)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5490; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: bf6MGMW76oDH69aRPnhzy9NoX3AvrdvP4U69aKP1AUu4iRMR6VIApSzI/VRbBLHeP2w/2cYTW/xxYNmJcECcS/vk83Y58QI3YiV2KlEGGhsn7KsyGGCvww9bN7fcJt0OmculQ6BVag10zdtvvCBdmVC4Oty+jHXpbeCfp7YvCSjnj++nPmg8ZJObgELqHOGV3IzArvqsQZvAdQJkgmc6swKXVRKRXllPukaGNGRy+Ob1SL58sFgAoNavRi3a/l03zTk2DKDAP/OfHkchYrH8txlHBcdAuZz+hhL7OtRiKRmXOvUHMvSCsIpSAVN25t9FSSYyQV2TjZffWIGbyVIVESs90pyx3GbJ+XppvbJtuMmVeXgmkUp77S7wR2XemDqCANRRPG9wCCJ7CQyxPybmPTc/s1/qB/bUVRG98mHz9WmnGCjFoKTnUc7xL2m2IMG+jITvRKq8DdI0YgC+W4WmEnig7SLTJqxddZ6in+LVG0J/YPA/t8Ydj7eUxpY5FkDk2nu4UVbUdVeL/ApgDInM4g== MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bca1712f-342a-436e-07c0-08d798c32e11 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jan 2020 07:27:15.7455 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: SlF7qNrSdtGeJL+YR0KYLPE40ROGXtUUGeP/SQVhPfxxo3fOqyViK84ktSPh56CebtaMGwjO91VGeArP37INwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5490 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200113_232720_168055_52A6F878 X-CRM114-Status: GOOD ( 13.28 ) X-Spam-Score: 0.8 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a01:111:f400:fe0e:0:0:0:61c listed in] [list.dnswl.org] 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 1.0 FORGED_SPF_HELO No description available. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aisheng Dong , Peng Fan , Jacky Bai , Anson Huang , "linux-kernel@vger.kernel.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "l.stach@pengutronix.de" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Peng Fan The A53 CCM clk root only accepts input up to 1GHz, CCM A53 root signoff timing is 1Ghz, however the A53 core which sources from CCM root could run above 1GHz which voilates the CCM. There is a CORE_SEL slice before A53 core, we need configure the CORE_SEL slice source from ARM PLL, not A53 CCM clk root. The A53 CCM clk root should only be used when need to change ARM PLL frequency. Add arm_a53_core clk that could source from arm_a53_div and arm_pll_out. Configure a53 ccm root sources from 800MHz sys pll Configure a53 core sources from arm_pll_out Mark arm_a53_core as critical clock Fixes: db27e40b27f1 ("clk: imx8mq: Add the missing ARM clock") Reviewed-by: Jacky Bai Signed-off-by: Peng Fan --- V2: None drivers/clk/imx/clk-imx8mq.c | 16 ++++++++++++---- include/dt-bindings/clock/imx8mq-clock.h | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c index b031183ff427..82a16b8e98a9 100644 --- a/drivers/clk/imx/clk-imx8mq.c +++ b/drivers/clk/imx/clk-imx8mq.c @@ -41,6 +41,8 @@ static const char * const video2_pll_out_sels[] = {"video2_pll1_ref_sel", }; static const char * const imx8mq_a53_sels[] = {"osc_25m", "arm_pll_out", "sys2_pll_500m", "sys2_pll_1000m", "sys1_pll_800m", "sys1_pll_400m", "audio_pll1_out", "sys3_pll_out", }; +static const char * const imx8mq_a53_core_sels[] = {"arm_a53_div", "arm_pll_out", }; + static const char * const imx8mq_arm_m4_sels[] = {"osc_25m", "sys2_pll_200m", "sys2_pll_250m", "sys1_pll_266m", "sys1_pll_800m", "audio_pll1_out", "video_pll1_out", "sys3_pll_out", }; @@ -411,6 +413,9 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) hws[IMX8MQ_CLK_GPU_CORE_DIV] = imx8m_clk_hw_composite_core("gpu_core_div", imx8mq_gpu_core_sels, base + 0x8180); hws[IMX8MQ_CLK_GPU_SHADER_DIV] = imx8m_clk_hw_composite("gpu_shader_div", imx8mq_gpu_shader_sels, base + 0x8200); + /* CORE SEL */ + hws[IMX8MQ_CLK_A53_CORE] = imx_clk_hw_mux2_flags("arm_a53_core", base + 0x9880, 24, 1, imx8mq_a53_core_sels, ARRAY_SIZE(imx8mq_a53_core_sels), CLK_IS_CRITICAL); + /* BUS */ hws[IMX8MQ_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mq_main_axi_sels, base + 0x8800); hws[IMX8MQ_CLK_ENET_AXI] = imx8m_clk_hw_composite("enet_axi", imx8mq_enet_axi_sels, base + 0x8880); @@ -574,11 +579,14 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) hws[IMX8MQ_GPT_3M_CLK] = imx_clk_hw_fixed_factor("gpt_3m", "osc_25m", 1, 8); hws[IMX8MQ_CLK_DRAM_ALT_ROOT] = imx_clk_hw_fixed_factor("dram_alt_root", "dram_alt", 1, 4); - hws[IMX8MQ_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_div", - hws[IMX8MQ_CLK_A53_DIV]->clk, - hws[IMX8MQ_CLK_A53_SRC]->clk, + clk_hw_set_parent(hws[IMX8MQ_CLK_A53_SRC], hws[IMX8MQ_SYS1_PLL_800M]); + clk_hw_set_parent(hws[IMX8MQ_CLK_A53_CORE], hws[IMX8MQ_ARM_PLL_OUT]); + + hws[IMX8MQ_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_core", + hws[IMX8MQ_CLK_A53_CORE]->clk, + hws[IMX8MQ_CLK_A53_CORE]->clk, hws[IMX8MQ_ARM_PLL_OUT]->clk, - hws[IMX8MQ_SYS1_PLL_800M]->clk); + hws[IMX8MQ_CLK_A53_DIV]->clk); imx_check_clk_hws(hws, IMX8MQ_CLK_END); diff --git a/include/dt-bindings/clock/imx8mq-clock.h b/include/dt-bindings/clock/imx8mq-clock.h index 3bab9b21c8d7..ac71e9e502b8 100644 --- a/include/dt-bindings/clock/imx8mq-clock.h +++ b/include/dt-bindings/clock/imx8mq-clock.h @@ -424,6 +424,8 @@ #define IMX8MQ_SYS2_PLL_500M_CG 283 #define IMX8MQ_SYS2_PLL_1000M_CG 284 -#define IMX8MQ_CLK_END 285 +#define IMX8MQ_CLK_A53_CORE 285 + +#define IMX8MQ_CLK_END 286 #endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */ From patchwork Tue Jan 14 07:27:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11331463 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5AFCE13A0 for ; Tue, 14 Jan 2020 07:28:02 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 35A95207E0 for ; Tue, 14 Jan 2020 07:28:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Y3wvBaB3"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="YIQ1uJSV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 35A95207E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wXQ4BZltsPxZ4HMJu0OQwpu2LPcOaYBsc6axQTkvTMM=; b=Y3wvBaB3bSt4a5 zWvxPZRKx9pJdgEofs8IzLfHOoI6qLKGrjY/D9yX8s+447J8KtNFkWpnKZ1YdtBX3HSlME48Tv3dU Gb8K5tlLBY6qSF5c50xJZjzxNBF9X+aKMe7ix7T4oOZZHIS2W1p3VVCXJURktLpA3jfXeKKCto4Me Yeh4bIvUqxIX6XNN1Jr+J7KmcewpDA3pq/bZl277O5m9dVFixEBlEBxf+nDl+541PKGC1YDOMQNCD jUaBnqq8TMgM87MTJShX+qCYN+kOnvHOIiWAkopNiagGbkLOJNQqX7d8k3eHWT46EZfq4mjnQ+8NI n/4z4J75wOBRRKQMFazQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1irGcJ-0003DT-BH; Tue, 14 Jan 2020 07:27:59 +0000 Received: from mail-eopbgr70053.outbound.protection.outlook.com ([40.107.7.53] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1irGbk-0002bd-Q6 for linux-arm-kernel@lists.infradead.org; Tue, 14 Jan 2020 07:27:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m8ySUvudvXwcIDO6UPC7vY9AGhAydOxAEuBbNzkennfDgK/Yhb5pDdvoS3YNi/8UHcOWvgNoaR3ft1bYeVyEFBeIS3CPABO8rLLpSG3gJKnqLrD0OO0YRNRw9prj9juiZifLt/UC+TrM/SX0L1h/Fjmdd0k6Ecdtpd4Lcxy6Et1QdOE3RqDMZZ2B5sqrRs2oii1997PBhOCTQau2bg6v13AwSNdT9MAWHtRcjwS4UYN8+Ma0hICYxbXct/h1xyf/+zZ98jronnzfaO/F0Wi05Vo3Gyx38gfZmKVNllyzEYhtyGc7wrwZPQq4+ttr6+dG5xhlWKnNwASXKcfswV5BeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A20Xl+PTW4KlQYSpQ5Kx0Mu9QL0bg+HUF+jbGVQYkk0=; b=ig92TyuGiaReh68mVt0h+EcSTNzBXuiTNBH9TWIM6fx449IR5HmgCU/Yai/OuyUkXVo3iluMsGyOIc9CiKoZkxNyJizAIujNi9pkZLcVbe7py673GnEzggSCS2Z7YnhXTeJMnBiBU2jdujiYUAH2T7ihzu+NrYZJwZM8VcVag9qLTfWcvL0xnr/dCqvIhEhJvU8sK1LgWHpuDu43Bk1PV/2mw+cFqj4iUHjYLn+ZbZ3JNZ6b7zpoBuZQ9CLI1NEdwmMP4C9MEK9yojVHjAlYDEGSGIVhTuPRUuALpoovL/IRfFu8DzSqfWbq/g2QWp4YdgByOe7VpZSfZJJdYukvnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A20Xl+PTW4KlQYSpQ5Kx0Mu9QL0bg+HUF+jbGVQYkk0=; b=YIQ1uJSV6duD0xMzbjtZYCjLXU+Je4DH38vTyd8KjE79av/MWRcohA2aIF2OyiqwGSRZNhggpd9kQ+e2hI6ReBQV0liqG2HW0YZ9XHICrSExobttbAt3l0zqBdvsbSF7L2N4QqkvQjJ1typ86hmXoXFXj3YGnR4yLAlkT+vtUj8= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5490.eurprd04.prod.outlook.com (20.178.115.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.10; Tue, 14 Jan 2020 07:27:21 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422%3]) with mapi id 15.20.2623.015; Tue, 14 Jan 2020 07:27:21 +0000 Received: from localhost.localdomain (119.31.174.66) by SGXP274CA0009.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2623.9 via Frontend Transport; Tue, 14 Jan 2020 07:27:16 +0000 From: Peng Fan To: "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "festevam@gmail.com" , Abel Vesa , Leonard Crestez Subject: [PATCH V2 2/4] clk: imx: imx8mm: fix a53 cpu clock Thread-Topic: [PATCH V2 2/4] clk: imx: imx8mm: fix a53 cpu clock Thread-Index: AQHVyqwOq4fuxmFDc0W4slntRANDBQ== Date: Tue, 14 Jan 2020 07:27:21 +0000 Message-ID: <1578986576-6168-3-git-send-email-peng.fan@nxp.com> References: <1578986576-6168-1-git-send-email-peng.fan@nxp.com> In-Reply-To: <1578986576-6168-1-git-send-email-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: SGXP274CA0009.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::21) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 0149c7a8-b3af-4115-8a57-08d798c33146 x-ms-traffictypediagnostic: AM0PR04MB5490:|AM0PR04MB5490: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6790; x-forefront-prvs: 028256169F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(366004)(136003)(396003)(376002)(346002)(189003)(199004)(66476007)(478600001)(66946007)(2906002)(66446008)(66556008)(6506007)(64756008)(52116002)(186003)(2616005)(26005)(44832011)(16526019)(8936002)(71200400001)(69590400006)(956004)(81166006)(8676002)(36756003)(81156014)(86362001)(6666004)(5660300002)(4326008)(6486002)(6636002)(110136005)(6512007)(316002)(54906003)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5490; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VLoF/zVohCBARVE4ISiqSsXyei9lZaft3Wu9jOuwmApMvPMpCdS1PqZlJ+RHSG4CxhBRiaXpGLZzk44VV/eg6ho1Rm/b4QPSf/t9nqQ98eWC0PRNAOQIUNxkoix21y3veUziTYxAPTl71dOtdYvAgheaW3fVB+VEvvbQ/s7+wzTgZU3nG1nHkVuvUB6ivexgOicwYyJmD9Rjmnx0YCQfb1Culatu4gF2cQiD8f9tS7ITxXZydwfbL+Wj34Q2+VAQbwPXC+pKwjhHWAGBTNMI6xdOM1nMIkNsXwXkpGfvC+Obv1LyLn2FVI9SOerfhUAU4vIwMN8426WaXW5pCSiZusrpVq1UpTQueyWUAsc7B0gdgI+NytVvYCNopHCViFqLrWYl/2pUJT1LcxD4/Bi13w5cMINY5A6sTF7HdIF1jgy3Ff0crROAISZGEOv5WpF01x0/C96GQsdjMy5wQoMd9wSCuH/VrICBv1ZQOmwO+OmV//cBM46CQcXO1Lwqn7py/B8Nx/FALrFB4gr3FCbNbw== MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0149c7a8-b3af-4115-8a57-08d798c33146 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jan 2020 07:27:21.1923 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: UsT9DTYxOqZ/xWIZm+wUtEFoKGyW96W7TIahE/oK4lEFsddB+cchqCAlnDXBLvLTpEQJ5ohl9IOf1P9kQvmFjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5490 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200113_232724_907375_3C3D9FFE X-CRM114-Status: GOOD ( 13.69 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.7.53 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aisheng Dong , Peng Fan , Jacky Bai , Anson Huang , "linux-kernel@vger.kernel.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "l.stach@pengutronix.de" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Peng Fan The A53 CCM clk root only accepts input up to 1GHz, CCM A53 root signoff timing is 1Ghz, however the A53 core which sources from CCM root could run above 1GHz which voilates the CCM. There is a CORE_SEL slice before A53 core, we need configure the CORE_SEL slice source from ARM PLL, not A53 CCM clk root. The A53 CCM clk root should only be used when need to change ARM PLL frequency. Add arm_a53_core clk that could source from arm_a53_div and arm_pll_out. Configure a53 ccm root sources from 800MHz sys pll Configure a53 core sources from arm_pll_out Mark arm_a53_core as critical clock Fixes: ba5625c3e272 ("clk: imx: Add clock driver support for imx8mm") Reviewed-by: Jacky Bai Signed-off-by: Peng Fan --- V2: None drivers/clk/imx/clk-imx8mm.c | 16 ++++++++++++---- include/dt-bindings/clock/imx8mm-clock.h | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index 197ba2cdab7d..ad7a77e3276c 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -41,6 +41,8 @@ static const char *sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; static const char *imx8mm_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_pll2_500m", "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", "audio_pll1_out", "sys_pll3_out", }; +static const char * const imx8mm_a53_core_sels[] = {"arm_a53_div", "arm_pll_out", }; + static const char *imx8mm_m4_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_250m", "sys_pll1_266m", "sys_pll1_800m", "audio_pll1_out", "video_pll1_out", "sys_pll3_out", }; @@ -422,6 +424,9 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) hws[IMX8MM_CLK_GPU3D_DIV] = imx8m_clk_hw_composite_core("gpu3d_div", imx8mm_gpu3d_sels, base + 0x8180); hws[IMX8MM_CLK_GPU2D_DIV] = imx8m_clk_hw_composite_core("gpu2d_div", imx8mm_gpu2d_sels, base + 0x8200); + /* CORE SEL */ + hws[IMX8MM_CLK_A53_CORE] = imx_clk_hw_mux2_flags("arm_a53_core", base + 0x9880, 24, 1, imx8mm_a53_core_sels, ARRAY_SIZE(imx8mm_a53_core_sels), CLK_IS_CRITICAL); + /* BUS */ hws[IMX8MM_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mm_main_axi_sels, base + 0x8800); hws[IMX8MM_CLK_ENET_AXI] = imx8m_clk_hw_composite("enet_axi", imx8mm_enet_axi_sels, base + 0x8880); @@ -587,11 +592,14 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) hws[IMX8MM_CLK_DRAM_ALT_ROOT] = imx_clk_hw_fixed_factor("dram_alt_root", "dram_alt", 1, 4); hws[IMX8MM_CLK_DRAM_CORE] = imx_clk_hw_mux2_flags("dram_core_clk", base + 0x9800, 24, 1, imx8mm_dram_core_sels, ARRAY_SIZE(imx8mm_dram_core_sels), CLK_IS_CRITICAL); - hws[IMX8MM_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_div", - hws[IMX8MM_CLK_A53_DIV]->clk, - hws[IMX8MM_CLK_A53_SRC]->clk, + clk_hw_set_parent(hws[IMX8MM_CLK_A53_SRC], hws[IMX8MM_SYS_PLL1_800M]); + clk_hw_set_parent(hws[IMX8MM_CLK_A53_CORE], hws[IMX8MM_ARM_PLL_OUT]); + + hws[IMX8MM_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_core", + hws[IMX8MM_CLK_A53_CORE]->clk, + hws[IMX8MM_CLK_A53_CORE]->clk, hws[IMX8MM_ARM_PLL_OUT]->clk, - hws[IMX8MM_SYS_PLL1_800M]->clk); + hws[IMX8MM_CLK_A53_DIV]->clk); imx_check_clk_hws(hws, IMX8MM_CLK_END); diff --git a/include/dt-bindings/clock/imx8mm-clock.h b/include/dt-bindings/clock/imx8mm-clock.h index edeece2289f0..8b585a910ddb 100644 --- a/include/dt-bindings/clock/imx8mm-clock.h +++ b/include/dt-bindings/clock/imx8mm-clock.h @@ -265,6 +265,8 @@ #define IMX8MM_SYS_PLL2_333M_CG 244 #define IMX8MM_SYS_PLL2_500M_CG 245 -#define IMX8MM_CLK_END 246 +#define IMX8MM_CLK_A53_CORE 246 + +#define IMX8MM_CLK_END 247 #endif From patchwork Tue Jan 14 07:27:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11331465 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69E3813A0 for ; Tue, 14 Jan 2020 07:28:14 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 45F53207E0 for ; Tue, 14 Jan 2020 07:28:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="n1QTi179"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="AkhE2Axo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45F53207E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NT+QPHHuxLX2OAU+9KNOFZSnNsHknAlKwbbOT2r7gAY=; b=n1QTi179ZxThle H40qRMqm6nFi4Cz+nxVRDnPlstFoWQNQwUsoYIfTmLUkXXJ3fxx80hu5Db3o0UHr0KL3w3+5kNZd2 2Q4QthvsMKw4ceu8fF3MPYulMTuoynD8EcEJfXyMPVAsF9MJ49Bi37HkpLUYYiE2m7+RBU0ieTK4q xMxhveFILmNbBQvOcSCQsCHpctbwPKH27nIRyYumDgdPKT49jeCIAjzsjxknNau8qh+gpw2L9E7ZP t2J7Ftpq5sTL0JRbRSWxHjgjT1gF+rbbU0HvlAFnqNM63DA2cpmi6RPMXoBOo7RgM63ZxwnEpnQpM Y8ylRNYUocWvCPyYfXEQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1irGcW-0003RV-TJ; Tue, 14 Jan 2020 07:28:12 +0000 Received: from mail-ve1eur01on0615.outbound.protection.outlook.com ([2a01:111:f400:fe1f::615] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1irGbq-0002mg-RY for linux-arm-kernel@lists.infradead.org; Tue, 14 Jan 2020 07:27:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=goUWKkEJ6drdYvd4PMPI9pAyiHy9qurZjyCfIGkzD+kKNvWPpSnW9FxwPzFPbHlLTno2NfqUoXLYedHbODdHDcsEb4QDkShKfa+KK5jKW+OotGfMFnizAW+nBbmWQBe1nB9Y+4tu495OsPOSxFO9zNxHmfTA19ZRlEGqlict/kvvxmsy3zb7hYh0jginoj3/acRk/rxA4DLfecJYMsMiBammvnpjOKO8K09iuD3E3mKS1Wd2Sh60hjuViamPsWbqozKmysY7iJN7IqIaCPNBM536Ufk6Ytmz8XQLKdWtjF7WEF0xQCiO+9QgwYvoHSxncRo8wlCHRosuceRnU6FKhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GK6yFKoFbv0aXo0ZRn+ZGh/E6xI672a2cOacdy+wb08=; b=S7NFtcCHt8koW5UEG7MPBrLZnTuKhiNwOyHqNSkzQQoj7aaIqABQtCFZifbZlmCMp78p6KtHrfvMJBgmuDunsXtgKD0B92JCgVAqw9rfGjokvOYR8sQf7FIjcAXKIrnPCTtduRufnDNBD3gI3hCyUXRFlZ4doreQHiP7lHMB5Z7XXZSyjTKBhMwqr6aCPv9KR1Wbx3lSG1mX+44x6dnqgTXHMl8k+ONvbpI5Nds5Xmi6HvBg3H4UxAnIwDGBuOgzpxs+LRIoZJLPqjIn3jc9KZKvqGgntaM2ve/nUNAssEoLZE8FtHTiEco27AUv1vh/de5+5n8BW1EpYnCEmUtHOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GK6yFKoFbv0aXo0ZRn+ZGh/E6xI672a2cOacdy+wb08=; b=AkhE2Axohwp/QBh0T0hu394qPcH+qvGQEpP9yYIGh7fTolSUytAY/Vev47Zhf4MsjkJ0k8EatAp0WXYXoE7MNdvPeIIEXmKdjOrUFUUSfGLYg/QkOIWLln6CaEZRFR6N1bJw0QKB0bzoiEuVF4JSTr97NoI64bQMTl+/e7HwPy0= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6211.eurprd04.prod.outlook.com (20.179.34.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18; Tue, 14 Jan 2020 07:27:27 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422%3]) with mapi id 15.20.2623.015; Tue, 14 Jan 2020 07:27:26 +0000 Received: from localhost.localdomain (119.31.174.66) by SGXP274CA0009.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2623.9 via Frontend Transport; Tue, 14 Jan 2020 07:27:21 +0000 From: Peng Fan To: "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "festevam@gmail.com" , Abel Vesa , Leonard Crestez Subject: [PATCH V2 3/4] clk: imx: imx8mn: fix a53 cpu clock Thread-Topic: [PATCH V2 3/4] clk: imx: imx8mn: fix a53 cpu clock Thread-Index: AQHVyqwSB+4Euu8GwkSELrq47uqCZA== Date: Tue, 14 Jan 2020 07:27:26 +0000 Message-ID: <1578986576-6168-4-git-send-email-peng.fan@nxp.com> References: <1578986576-6168-1-git-send-email-peng.fan@nxp.com> In-Reply-To: <1578986576-6168-1-git-send-email-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: SGXP274CA0009.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::21) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 83580931-c581-4b51-d87d-08d798c33481 x-ms-traffictypediagnostic: AM0PR04MB6211:|AM0PR04MB6211: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-forefront-prvs: 028256169F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(39860400002)(376002)(346002)(396003)(136003)(199004)(189003)(64756008)(66446008)(6512007)(26005)(66946007)(6486002)(956004)(2616005)(66556008)(52116002)(66476007)(6506007)(86362001)(110136005)(316002)(54906003)(2906002)(36756003)(44832011)(5660300002)(4326008)(478600001)(6636002)(186003)(16526019)(8676002)(81156014)(71200400001)(8936002)(69590400006)(81166006)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6211; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3vzYrGz/p5hznGH8rwd570iP7DPFMau1llCUPJdo9BJ+dQIh4ALEraArAikklT0851Cg+eKfOBfVKQeb6/rKxmX5Pl6enKzodBo2QgLOJWaUSv8AIIk3FGSLqHxfDFOq9G4CZ8tRyyQGLbO721wm+Cay+zkv85aeoN9U/b7qy0NgIIn6Goe1Bp55VS/pFdiXCufQNkLNsyARgPpAvYStLvoSYldDbD+cPkC3C9dBjnIw91xpYan/v50BM6xSE1YPf51z0Hjawo67aEt6wBP5FK/V0LqoQ9QcEJL1WAa/M2wX4lmYPRG5IQ2V1HyrXIudiJAQBgFDS965w/jyHIrBbEZLOpjohNlhuuYSwHc92Uxz0Puhb+RxbBUWaEDAYvcgWK9/SjfAytHGPST/KovgXuqts9vPLWfguYAwzYlOaDxKDugOpScayfz5prn5kw1uWXMMecLZDNxnNd+MniYKHQZIaxn1FIKBMskd30XSnKRdfEb15our4ild0Atf69zebBWju62hkW1E9WanH87GlA== MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83580931-c581-4b51-d87d-08d798c33481 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jan 2020 07:27:26.9370 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: MkZIcpGDEoD5HdVN3tUgF0TLzYj1OemOJPPLdUJS4Yrg2zjq9F+bqwx5v+K3+LG3P4hzSPWPC++G6I2R5gZ3tA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6211 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200113_232730_903087_7A1824D1 X-CRM114-Status: GOOD ( 13.99 ) X-Spam-Score: 0.8 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a01:111:f400:fe1f:0:0:0:615 listed in] [list.dnswl.org] 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 1.0 FORGED_SPF_HELO No description available. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aisheng Dong , Peng Fan , Jacky Bai , Anson Huang , "linux-kernel@vger.kernel.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "l.stach@pengutronix.de" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Peng Fan The A53 CCM clk root only accepts input up to 1GHz, CCM A53 root signoff timing is 1Ghz, however the A53 core which sources from CCM root could run above 1GHz which voilates the CCM. There is a CORE_SEL slice before A53 core, we need configure the CORE_SEL slice source from ARM PLL, not A53 CCM clk root. The A53 CCM clk root should only be used when need to change ARM PLL frequency. Add arm_a53_core clk that could source from arm_a53_div and arm_pll_out. Configure a53 ccm root sources from 800MHz sys pll Configure a53 core sources from arm_pll_out Mark arm_a53_core as critical clk. Fixes: 96d6392b54db ("clk: imx: Add support for i.MX8MN clock driver") Reviewed-by: Jacky Bai Signed-off-by: Peng Fan --- V2: None drivers/clk/imx/clk-imx8mn.c | 16 ++++++++++++---- include/dt-bindings/clock/imx8mn-clock.h | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index ce2ba3dce483..01c1034834fc 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -40,6 +40,8 @@ static const char * const imx8mn_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_pl "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", "audio_pll1_out", "sys_pll3_out", }; +static const char * const imx8mn_a53_core_sels[] = {"arm_a53_div", "arm_pll_out", }; + static const char * const imx8mn_gpu_core_sels[] = {"osc_24m", "gpu_pll_out", "sys_pll1_800m", "sys_pll3_out", "sys_pll2_1000m", "audio_pll1_out", "video_pll1_out", "audio_pll2_out", }; @@ -419,6 +421,9 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_CLK_GPU_CORE_DIV] = imx8m_clk_hw_composite_core("gpu_core_div", imx8mn_gpu_core_sels, base + 0x8180); hws[IMX8MN_CLK_GPU_SHADER_DIV] = imx8m_clk_hw_composite_core("gpu_shader_div", imx8mn_gpu_shader_sels, base + 0x8200); + /* CORE SEL */ + hws[IMX8MN_CLK_A53_CORE] = imx_clk_hw_mux2_flags("arm_a53_core", base + 0x9880, 24, 1, imx8mn_a53_core_sels, ARRAY_SIZE(imx8mn_a53_core_sels), CLK_IS_CRITICAL); + /* BUS */ hws[IMX8MN_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mn_main_axi_sels, base + 0x8800); hws[IMX8MN_CLK_ENET_AXI] = imx8m_clk_hw_composite("enet_axi", imx8mn_enet_axi_sels, base + 0x8880); @@ -547,11 +552,14 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_CLK_DRAM_ALT_ROOT] = imx_clk_hw_fixed_factor("dram_alt_root", "dram_alt", 1, 4); - hws[IMX8MN_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_div", - hws[IMX8MN_CLK_A53_DIV]->clk, - hws[IMX8MN_CLK_A53_SRC]->clk, + clk_hw_set_parent(hws[IMX8MN_CLK_A53_SRC], hws[IMX8MN_SYS_PLL1_800M]); + clk_hw_set_parent(hws[IMX8MN_CLK_A53_CORE], hws[IMX8MN_ARM_PLL_OUT]); + + hws[IMX8MN_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_core", + hws[IMX8MN_CLK_A53_CORE]->clk, + hws[IMX8MN_CLK_A53_CORE]->clk, hws[IMX8MN_ARM_PLL_OUT]->clk, - hws[IMX8MN_SYS_PLL1_800M]->clk); + hws[IMX8MN_CLK_A53_DIV]->clk); imx_check_clk_hws(hws, IMX8MN_CLK_END); diff --git a/include/dt-bindings/clock/imx8mn-clock.h b/include/dt-bindings/clock/imx8mn-clock.h index 0f2b8423ce1d..7ec4c24d6e06 100644 --- a/include/dt-bindings/clock/imx8mn-clock.h +++ b/include/dt-bindings/clock/imx8mn-clock.h @@ -228,6 +228,8 @@ #define IMX8MN_SYS_PLL2_333M_CG 209 #define IMX8MN_SYS_PLL2_500M_CG 210 -#define IMX8MN_CLK_END 211 +#define IMX8MN_CLK_A53_CORE 211 + +#define IMX8MN_CLK_END 212 #endif From patchwork Tue Jan 14 07:27:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11331467 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 306AD13A0 for ; Tue, 14 Jan 2020 07:28:37 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 066F1207E0 for ; Tue, 14 Jan 2020 07:28:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hWKx1cqQ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="oWUZ0yx/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 066F1207E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jIyLFnNXr2r/nMqNcIw26eu8Z5AnFX4otm6/bZLDRhs=; b=hWKx1cqQeAdGZD uTZV+Ml25HYHVJbuRUyG0AYM8zBwX8bHzPxQ+bnekzl2xSWyYSbImGrlNTqzv840QyECKpg5443Zh 8lJyLxTxsT/VmTQ/xhm+4UEhcxCHK4DRhProKpyx8IWVike2z/0zOYieBWFaCQRfiXZkIFMizTNp0 mxdvyWZsk7i4NHa235qVB2acYQPYdun0kxCejAPmKAusBeSoNzYdj5b7MsOhTx3Jqpa6wmnZbBn4v YMNFw1hhXAF83E1Ey6iK1FfK9whIyX09i5IR4vgHab1TDdFAB1HsfQZbdYrQdxyFA0f5PWH1sSxUI biX0/dw2zpZgMt7QBFUA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1irGct-0003lW-0B; Tue, 14 Jan 2020 07:28:35 +0000 Received: from mail-ve1eur01on0615.outbound.protection.outlook.com ([2a01:111:f400:fe1f::615] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1irGbv-0002mg-B4 for linux-arm-kernel@lists.infradead.org; Tue, 14 Jan 2020 07:27:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FkQJEKBOf60BxppePpUtPzMDhzD8/HBmeAveVwpgBXeiKLwMzvMoT3gMgQo0bJVp9bmxkzj0JceJ7xp+igUKJiRZmPWTVShMQac9V6PdtOLb2pShIvE6eHA9nrytIKAl+u/1RJnO+2Duobbt5pNmbBrmgT9L7hJYOxWjWFjxxyi8D/Z6zL8mGGkaL6VSt6kRnCc36RKDWQzyFqXlVPezMUeaxEouAP3WbseHQPqNiVDKOjm6Lxx3zDEAHbtQqTkxR7nFSabHPdtzWf2bl8xI16m3C9Gs/gLrh4RHQNX9NqFsrL2L33g8wzGZIJMBsG7x5bOZDersWR4971EqhZzfWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bjg/P8ZE54mEmXQrCAZ3IcfFh6AgOTtACWGF/NSzCBg=; b=lSBIBafpoqmqBy5e+h8Dd+uResb5h0GZniuNp6sRLMsxB2GfM2U531YGppBkReWrLP3K4JptB8HeRmz/HCrrt2sj22wMtX4wNED5J5+ex13lotBiQ0uCpbVGrMbuHmY02ktefg9LAOWaETc7d3U8rP47nhZihT840TMmhZW0Ss0+0bL7ksVQCfXQVZrDVwBZjxgvbA2sxTxep/J4KcRO+/4r6uj2a9UqEeV3XL6EGALZrFI8Wd7qf9FaheY2Il0RxR7OhAtSwuGzNZo/eXk4PATSUZuf9NX8t3QaqcuOi57sf1je9RcisPEA1/+XRRYL6N+0wlVBYLsBn5Uw5zkEvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bjg/P8ZE54mEmXQrCAZ3IcfFh6AgOTtACWGF/NSzCBg=; b=oWUZ0yx/ehYGBr5zLt/zI1gSAIuXlrLCIjCk/0+/Qxy1D1WEIyv6rZe/HyROXAlAPy+CsOfdXkQC7pKKXCRS/+0UNb6RMTYbgt1enYijK515TmVQvsBf8hc+AZ/SFrKZmysBap4dRJCo8jy18JtgYe6Vn61utV5XSAhW3JTz7a8= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6211.eurprd04.prod.outlook.com (20.179.34.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18; Tue, 14 Jan 2020 07:27:33 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422%3]) with mapi id 15.20.2623.015; Tue, 14 Jan 2020 07:27:33 +0000 Received: from localhost.localdomain (119.31.174.66) by SGXP274CA0009.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2623.9 via Frontend Transport; Tue, 14 Jan 2020 07:27:27 +0000 From: Peng Fan To: "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "festevam@gmail.com" , Abel Vesa , Leonard Crestez Subject: [PATCH V2 4/4] clk: imx: imx8mp: fix a53 cpu clock Thread-Topic: [PATCH V2 4/4] clk: imx: imx8mp: fix a53 cpu clock Thread-Index: AQHVyqwVgLXhQDIHI0mgOwyl4endfg== Date: Tue, 14 Jan 2020 07:27:32 +0000 Message-ID: <1578986576-6168-5-git-send-email-peng.fan@nxp.com> References: <1578986576-6168-1-git-send-email-peng.fan@nxp.com> In-Reply-To: <1578986576-6168-1-git-send-email-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: SGXP274CA0009.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::21) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 4087361c-97ac-4e23-5005-08d798c33813 x-ms-traffictypediagnostic: AM0PR04MB6211:|AM0PR04MB6211: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3173; x-forefront-prvs: 028256169F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(39860400002)(376002)(346002)(396003)(136003)(199004)(189003)(64756008)(66446008)(6512007)(26005)(66946007)(6486002)(956004)(2616005)(66556008)(52116002)(66476007)(6506007)(86362001)(110136005)(316002)(54906003)(2906002)(36756003)(44832011)(5660300002)(4326008)(6666004)(478600001)(6636002)(186003)(16526019)(8676002)(81156014)(71200400001)(8936002)(69590400006)(81166006)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6211; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: XDpLXpM4hTxecuYDsrNdgTeMaEMg82KjuMD83wt8fEuMekRzWtTwWTEVAAi+0gmdU9kz5WHqWS7PsnQAjm8YTCQrqZzhwM7NTWjtViPz6DNehxs7KtMO4Vv2PCMARdTXxN6twxIC82/a10dVVNByP4qlbo4JsE1abvd3gVCvH43XDVKOuqX+117xYt0KvUwHrplQY5K2oewjCDMssucWR8jPe23CSi7wrQs01+wVWfJUxy54G/crOUKU3UKOZAsoNLMudn5ifDExM43o9jCX1BUmJxQB5ErwvOMImWYEncVd02hEs2EeKXN0DxzKDB+7Y1n4XWbancufDuz7cZ5Sh7yX1o/XcG77dijPfEzRHB6HknvyXGRT1Ejkf2rR+eZSMlYyKTlGXiIbPeTLYD3+EuhkuGdkgooO2wIOsWWoTRP2QVfbvwfphj2pMIpE7bum6sfeeAemEfiIBriAaGYGqBMmnEP86n19Nu6wKlWVENXEh1Daq08/9xLpYYsksAO1u1QrTmJemGaxU3lQBWxnuw== MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4087361c-97ac-4e23-5005-08d798c33813 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jan 2020 07:27:33.0284 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 8uY0LVuvijDwofxcY/4f1gWjVQq8Oc93gK95xyr0Kgb+iqohsssfm521OdonDhDjcpNgdWg0L5w7GV7GAIMSVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6211 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200113_232735_431434_A80249D7 X-CRM114-Status: GOOD ( 13.88 ) X-Spam-Score: 0.8 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a01:111:f400:fe1f:0:0:0:615 listed in] [list.dnswl.org] 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 1.0 FORGED_SPF_HELO No description available. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aisheng Dong , Peng Fan , Jacky Bai , Anson Huang , "linux-kernel@vger.kernel.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "l.stach@pengutronix.de" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Peng Fan The A53 CCM clk root only accepts input up to 1GHz, CCM A53 root signoff timing is 1Ghz, however the A53 core which sources from CCM root could run above 1GHz which voilates the CCM. There is a CORE_SEL slice before A53 core, we need configure the CORE_SEL slice source from ARM PLL, not A53 CCM clk root. The A53 CCM clk root should only be used when need to change ARM PLL frequency. Add arm_a53_core clk that could source from arm_a53_div and arm_pll_out. Configure a53 ccm root sources from 800MHz sys pll Configure a53 core sources from arm_pll_out Mark arm_a53_core as critical clk Reviewed-by: Jacky Bai Signed-off-by: Peng Fan --- V2: Fix build drivers/clk/imx/clk-imx8mp.c | 16 ++++++++++++---- include/dt-bindings/clock/imx8mp-clock.h | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index f6c120cca0d4..6ac4746898cb 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -34,6 +34,8 @@ static const char * const imx8mp_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_pl "sys_pll2_1000m", "sys_pll1_800m", "sys_pll1_400m", "audio_pll1_out", "sys_pll3_out", }; +static const char * const imx8mp_a53_core_sels[] = {"arm_a53_div", "arm_pll_out", }; + static const char * const imx8mp_m7_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_250m", "vpu_pll_out", "sys_pll1_800m", "audio_pll1_out", "video_pll1_out", "sys_pll3_out", }; @@ -553,6 +555,9 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_HSIO_AXI_DIV] = imx_clk_hw_divider2("hsio_axi_div", "hsio_axi_cg", ccm_base + 0x8380, 0, 3); hws[IMX8MP_CLK_MEDIA_ISP_DIV] = imx_clk_hw_divider2("media_isp_div", "media_isp_cg", ccm_base + 0x8400, 0, 3); + /* CORE SEL */ + hws[IMX8MP_CLK_A53_CORE] = imx_clk_hw_mux2_flags("arm_a53_core", ccm_base + 0x9880, 24, 1, imx8mp_a53_core_sels, ARRAY_SIZE(imx8mp_a53_core_sels), CLK_IS_CRITICAL); + hws[IMX8MP_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mp_main_axi_sels, ccm_base + 0x8800); hws[IMX8MP_CLK_ENET_AXI] = imx8m_clk_hw_composite("enet_axi", imx8mp_enet_axi_sels, ccm_base + 0x8880); hws[IMX8MP_CLK_NAND_USDHC_BUS] = imx8m_clk_hw_composite_critical("nand_usdhc_bus", imx8mp_nand_usdhc_sels, ccm_base + 0x8900); @@ -722,11 +727,14 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_VPU_ROOT] = imx_clk_hw_gate4("vpu_root_clk", "vpu_bus", ccm_base + 0x4630, 0); hws[IMX8MP_CLK_AUDIO_ROOT] = imx_clk_hw_gate4("audio_root_clk", "ipg_root", ccm_base + 0x4650, 0); - hws[IMX8MP_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_div", - hws[IMX8MP_CLK_A53_DIV]->clk, - hws[IMX8MP_CLK_A53_SRC]->clk, + clk_hw_set_parent(hws[IMX8MP_CLK_A53_SRC], hws[IMX8MP_SYS_PLL1_800M]); + clk_hw_set_parent(hws[IMX8MP_CLK_A53_CORE], hws[IMX8MP_ARM_PLL_OUT]); + + hws[IMX8MP_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_core", + hws[IMX8MP_CLK_A53_CORE]->clk, + hws[IMX8MP_CLK_A53_CORE]->clk, hws[IMX8MP_ARM_PLL_OUT]->clk, - hws[IMX8MP_SYS_PLL1_800M]->clk); + hws[IMX8MP_CLK_A53_DIV]->clk); imx_check_clk_hws(hws, IMX8MP_CLK_END); diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h index 2fab63186bca..c92d1f4117eb 100644 --- a/include/dt-bindings/clock/imx8mp-clock.h +++ b/include/dt-bindings/clock/imx8mp-clock.h @@ -294,7 +294,8 @@ #define IMX8MP_CLK_DRAM_ALT_ROOT 285 #define IMX8MP_CLK_DRAM_CORE 286 #define IMX8MP_CLK_ARM 287 +#define IMX8MP_CLK_A53_CORE 288 -#define IMX8MP_CLK_END 288 +#define IMX8MP_CLK_END 289 #endif