From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8295C33CA9 for ; Tue, 14 Jan 2020 07:27:45 +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 B6DF6222C4 for ; Tue, 14 Jan 2020 07:27:45 +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 B6DF6222C4 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+infradead-linux-arm-kernel=archiver.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 1irGc4-0002x7-9W; Tue, 14 Jan 2020 07:27:44 +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-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" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.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 */ -- 2.16.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel