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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AFDDCA9ED3 for ; Mon, 4 Nov 2019 05:46:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA1B722468 for ; Mon, 4 Nov 2019 05:46:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="MGpBW+d1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727868AbfKDFqq (ORCPT ); Mon, 4 Nov 2019 00:46:46 -0500 Received: from mail-eopbgr40079.outbound.protection.outlook.com ([40.107.4.79]:19450 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726248AbfKDFqp (ORCPT ); Mon, 4 Nov 2019 00:46:45 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EJdzXtzELNXmzanweXL69pM7c9R4SvMU/KEDTBtjGQ2YRCaZaZ26fBx/qnmHhEKxmZqlj5GN7H1plu74+Ni9vqG2EpVLVQqlc2M5CMjVltjzhf7RhCBLjlmUlDt6IuLSOI3lXwMye15W/o8AfxvJYT8D3LmLwjkBFwpXykFv5aKuwg3U9KiwGs2Yfjf3BUVbiIXQ7/DHY7cnLL9GxSxmoLQkdgKuuJJ27VpygQD3H9RdVcDwgtW7QQDadom8mbaTImULV2p18l3VisR8iFlEcLQExEPUOQLP582Qy/xg6v7Oog+ii8MFWFc7l9kxMWm4hxz3wiZ6Td0UfDUQK3/yAA== 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=lxmdfI+Xfvmi11kBlWiPqO+apd3k0g052y09nk9zp3g=; b=MpxZHj+LtLgpW/FFfMPye2NHavJOtJnbT1xibIMi7IocDkSKGiHFeepy9GiflLpAOzd+axSYMwzGPduXctKgZDTJ3XAbATNUgaUt917npnPFz/UeTrUdXj9JGNLSkK/WgJM685ZXKFoeXnA1KKnUyLevJ0O+BUXn+lr+SFkAwsV9oKbqfcK9uEAdTsrncSPBbIW6X0IfCxv/b8To54Cvdr/qohR+h9+tKja8SNuHHyaxbuotMlZy2y+2SxQezcTK8K7YR0lXuDSHJdwHJwSBsQoK8OkYaibJBTW1E3BzyfDI+uo2Ap/Lw+UOURg/b/eQv25sMFCMyCh6BBdq6UhYWA== 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=lxmdfI+Xfvmi11kBlWiPqO+apd3k0g052y09nk9zp3g=; b=MGpBW+d1yoSI7knOqYNBi6cNylQWCMl3WxlWm4WZ88OHjKxSn5PPxZ3Tpz6V417aExYP9o15e5wGUnJ6ky8LCuW/x/jBhnFKrQbu9geeksfNeshw0ndzQrbARiFDj/gdDlKm+K1/YbEs2IOA+lU3d4cJ67q4i//VZztxhyj4RgU= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6451.eurprd04.prod.outlook.com (20.179.252.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Mon, 4 Nov 2019 05:46:23 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::f16d:a26a:840:f97c]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::f16d:a26a:840:f97c%4]) with mapi id 15.20.2408.024; Mon, 4 Nov 2019 05:46:23 +0000 From: Peng Fan To: "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "festevam@gmail.com" , Abel Vesa CC: "kernel@pengutronix.de" , dl-linux-imx , Anson Huang , Jacky Bai , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Leonard Crestez , Peng Fan Subject: [PATCH V2 4/4] clk: imx: imx8mq: Switch to clk_hw based API Thread-Topic: [PATCH V2 4/4] clk: imx: imx8mq: Switch to clk_hw based API Thread-Index: AQHVktMxWsoTNv+4fUC6zdAKgdxwAg== Date: Mon, 4 Nov 2019 05:46:23 +0000 Message-ID: <1572846270-24375-5-git-send-email-peng.fan@nxp.com> References: <1572846270-24375-1-git-send-email-peng.fan@nxp.com> In-Reply-To: <1572846270-24375-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: HK0PR03CA0110.apcprd03.prod.outlook.com (2603:1096:203:b0::26) 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: 05494ea8-ae35-4fda-17c7-08d760ea5341 x-ms-traffictypediagnostic: AM0PR04MB6451:|AM0PR04MB6451: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:519; x-forefront-prvs: 0211965D06 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(346002)(366004)(136003)(396003)(376002)(189003)(199004)(386003)(6486002)(36756003)(66446008)(476003)(6512007)(2501003)(8676002)(2616005)(256004)(26005)(50226002)(316002)(30864003)(2201001)(6116002)(6636002)(3846002)(14454004)(6436002)(64756008)(11346002)(66946007)(71190400001)(71200400001)(66556008)(66476007)(478600001)(4326008)(2906002)(102836004)(86362001)(76176011)(186003)(305945005)(7736002)(8936002)(25786009)(54906003)(66066001)(99286004)(486006)(44832011)(5660300002)(446003)(81156014)(81166006)(52116002)(110136005)(6506007)(32563001)(569006);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR04MB6451;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: yNn1BYuDfaF4fh+Ld06qrvbR2lPDZgoN95D626ZWL78fYaRPBz2znsHPjUl2DeAecR8uv07dOXgyQDuJlk0k7ak2lE7Fvl8ZsQ7rSNAtSARDEVHDS0EV7G9walQzm+5rqIMAd36L+f5TVQKiw0Uahrcxj+wPBvdvwF+Wme1OIivl+LpsMo8GevjD/vKeHJyTVbvJZsoEefL/hkCQogpD+bqnqOaBDc57Z6wnHFtbTgod/AMfYeg4yxou7pxaOt8aHZbGatZeNR8j7YWEoSSRyTok8Tu9/mkIfmjoD6zULLSnMJL3ZS5o4rWsICKCAjIgoFE/+DpA9dl2ip75zFd4U2fGnzMBn68eOkzcOv+ysnvEFvYnD8PRdxlj0DKuSCaEam/p/zVCxBL5wYL1t1dXDCLLcGHPuJVB7huEeyb/ymPzQUgsriKrhysVzZEJjkRS Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05494ea8-ae35-4fda-17c7-08d760ea5341 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Nov 2019 05:46:23.6230 (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: Q1H7uzkAchC2hSe81CmvTwX4Hik8ThiWEb+qSfSnKO+ZKF0IwawFzEHRagmcQHi6RZ+yIdp1MEhw1jXLQimapw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6451 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan Switch the entire clk-imx8mq driver to clk_hw based API. This allows us to move closer to a clear split between consumer and provider clk APIs. Signed-off-by: Peng Fan --- drivers/clk/imx/clk-imx8mq.c | 569 ++++++++++++++++++++++-----------------= ---- 1 file changed, 291 insertions(+), 278 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c index 5f10a606d836..d50942a6dc1f 100644 --- a/drivers/clk/imx/clk-imx8mq.c +++ b/drivers/clk/imx/clk-imx8mq.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include =20 @@ -24,8 +25,6 @@ static u32 share_count_sai6; static u32 share_count_dcss; static u32 share_count_nand; =20 -static struct clk *clks[IMX8MQ_CLK_END]; - static const char * const pll_ref_sels[] =3D { "osc_25m", "osc_27m", "dumm= y", "dummy", }; static const char * const arm_pll_bypass_sels[] =3D {"arm_pll", "arm_pll_r= ef_sel", }; static const char * const gpu_pll_bypass_sels[] =3D {"gpu_pll", "gpu_pll_r= ef_sel", }; @@ -269,124 +268,135 @@ static const char * const imx8mq_clko1_sels[] =3D {= "osc_25m", "sys1_pll_800m", "os static const char * const imx8mq_clko2_sels[] =3D {"osc_25m", "sys2_pll_20= 0m", "sys1_pll_400m", "sys2_pll_166m", "sys3_pll_out", "audio_pll1_out", "video_pll1_out", "ckil", }; =20 -static struct clk_onecell_data clk_data; +static struct clk_hw_onecell_data *clk_hw_data; +static struct clk_hw **clks; =20 -static struct clk ** const uart_clks[] =3D { - &clks[IMX8MQ_CLK_UART1_ROOT], - &clks[IMX8MQ_CLK_UART2_ROOT], - &clks[IMX8MQ_CLK_UART3_ROOT], - &clks[IMX8MQ_CLK_UART4_ROOT], - NULL +static const int uart_clk_ids[] =3D { + IMX8MQ_CLK_UART1_ROOT, + IMX8MQ_CLK_UART2_ROOT, + IMX8MQ_CLK_UART3_ROOT, + IMX8MQ_CLK_UART4_ROOT, }; =20 +static struct clk **uart_clks[ARRAY_SIZE(uart_clk_ids) + 1]; + static int imx8mq_clocks_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; struct device_node *np =3D dev->of_node; void __iomem *base; - int err; + int err, i; + + clk_hw_data =3D kzalloc(struct_size(clk_hw_data, hws, + IMX8MQ_CLK_END), GFP_KERNEL); + if (WARN_ON(!clk_hw_data)) + return -ENOMEM; + + clk_hw_data->num =3D IMX8MQ_CLK_END; + clks =3D clk_hw_data->hws; =20 - clks[IMX8MQ_CLK_DUMMY] =3D imx_clk_fixed("dummy", 0); - clks[IMX8MQ_CLK_32K] =3D of_clk_get_by_name(np, "ckil"); - clks[IMX8MQ_CLK_25M] =3D of_clk_get_by_name(np, "osc_25m"); - clks[IMX8MQ_CLK_27M] =3D of_clk_get_by_name(np, "osc_27m"); - clks[IMX8MQ_CLK_EXT1] =3D of_clk_get_by_name(np, "clk_ext1"); - clks[IMX8MQ_CLK_EXT2] =3D of_clk_get_by_name(np, "clk_ext2"); - clks[IMX8MQ_CLK_EXT3] =3D of_clk_get_by_name(np, "clk_ext3"); - clks[IMX8MQ_CLK_EXT4] =3D of_clk_get_by_name(np, "clk_ext4"); + + clks[IMX8MQ_CLK_DUMMY] =3D imx_clk_hw_fixed("dummy", 0); + clks[IMX8MQ_CLK_32K] =3D imx_obtain_fixed_clk_hw(np, "ckil"); + clks[IMX8MQ_CLK_25M] =3D imx_obtain_fixed_clk_hw(np, "osc_25m"); + clks[IMX8MQ_CLK_27M] =3D imx_obtain_fixed_clk_hw(np, "osc_27m"); + clks[IMX8MQ_CLK_EXT1] =3D imx_obtain_fixed_clk_hw(np, "clk_ext1"); + clks[IMX8MQ_CLK_EXT2] =3D imx_obtain_fixed_clk_hw(np, "clk_ext2"); + clks[IMX8MQ_CLK_EXT3] =3D imx_obtain_fixed_clk_hw(np, "clk_ext3"); + clks[IMX8MQ_CLK_EXT4] =3D imx_obtain_fixed_clk_hw(np, "clk_ext4"); =20 np =3D of_find_compatible_node(NULL, NULL, "fsl,imx8mq-anatop"); base =3D of_iomap(np, 0); if (WARN_ON(!base)) return -ENOMEM; =20 - clks[IMX8MQ_ARM_PLL_REF_SEL] =3D imx_clk_mux("arm_pll_ref_sel", base + 0x= 28, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - clks[IMX8MQ_GPU_PLL_REF_SEL] =3D imx_clk_mux("gpu_pll_ref_sel", base + 0x= 18, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - clks[IMX8MQ_VPU_PLL_REF_SEL] =3D imx_clk_mux("vpu_pll_ref_sel", base + 0x= 20, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - clks[IMX8MQ_AUDIO_PLL1_REF_SEL] =3D imx_clk_mux("audio_pll1_ref_sel", bas= e + 0x0, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - clks[IMX8MQ_AUDIO_PLL2_REF_SEL] =3D imx_clk_mux("audio_pll2_ref_sel", bas= e + 0x8, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - clks[IMX8MQ_VIDEO_PLL1_REF_SEL] =3D imx_clk_mux("video_pll1_ref_sel", bas= e + 0x10, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - clks[IMX8MQ_SYS3_PLL1_REF_SEL] =3D imx_clk_mux("sys3_pll1_ref_sel", base = + 0x48, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - clks[IMX8MQ_DRAM_PLL1_REF_SEL] =3D imx_clk_mux("dram_pll1_ref_sel", base = + 0x60, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - clks[IMX8MQ_VIDEO2_PLL1_REF_SEL] =3D imx_clk_mux("video2_pll1_ref_sel", b= ase + 0x54, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - - clks[IMX8MQ_ARM_PLL_REF_DIV] =3D imx_clk_divider("arm_pll_ref_div", "arm_= pll_ref_sel", base + 0x28, 5, 6); - clks[IMX8MQ_GPU_PLL_REF_DIV] =3D imx_clk_divider("gpu_pll_ref_div", "gpu_= pll_ref_sel", base + 0x18, 5, 6); - clks[IMX8MQ_VPU_PLL_REF_DIV] =3D imx_clk_divider("vpu_pll_ref_div", "vpu_= pll_ref_sel", base + 0x20, 5, 6); - clks[IMX8MQ_AUDIO_PLL1_REF_DIV] =3D imx_clk_divider("audio_pll1_ref_div",= "audio_pll1_ref_sel", base + 0x0, 5, 6); - clks[IMX8MQ_AUDIO_PLL2_REF_DIV] =3D imx_clk_divider("audio_pll2_ref_div",= "audio_pll2_ref_sel", base + 0x8, 5, 6); - clks[IMX8MQ_VIDEO_PLL1_REF_DIV] =3D imx_clk_divider("video_pll1_ref_div",= "video_pll1_ref_sel", base + 0x10, 5, 6); - - clks[IMX8MQ_ARM_PLL] =3D imx_clk_frac_pll("arm_pll", "arm_pll_ref_div", b= ase + 0x28); - clks[IMX8MQ_GPU_PLL] =3D imx_clk_frac_pll("gpu_pll", "gpu_pll_ref_div", b= ase + 0x18); - clks[IMX8MQ_VPU_PLL] =3D imx_clk_frac_pll("vpu_pll", "vpu_pll_ref_div", b= ase + 0x20); - clks[IMX8MQ_AUDIO_PLL1] =3D imx_clk_frac_pll("audio_pll1", "audio_pll1_re= f_div", base + 0x0); - clks[IMX8MQ_AUDIO_PLL2] =3D imx_clk_frac_pll("audio_pll2", "audio_pll2_re= f_div", base + 0x8); - clks[IMX8MQ_VIDEO_PLL1] =3D imx_clk_frac_pll("video_pll1", "video_pll1_re= f_div", base + 0x10); + clks[IMX8MQ_ARM_PLL_REF_SEL] =3D imx_clk_hw_mux("arm_pll_ref_sel", base += 0x28, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + clks[IMX8MQ_GPU_PLL_REF_SEL] =3D imx_clk_hw_mux("gpu_pll_ref_sel", base += 0x18, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + clks[IMX8MQ_VPU_PLL_REF_SEL] =3D imx_clk_hw_mux("vpu_pll_ref_sel", base += 0x20, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + clks[IMX8MQ_AUDIO_PLL1_REF_SEL] =3D imx_clk_hw_mux("audio_pll1_ref_sel", = base + 0x0, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + clks[IMX8MQ_AUDIO_PLL2_REF_SEL] =3D imx_clk_hw_mux("audio_pll2_ref_sel", = base + 0x8, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + clks[IMX8MQ_VIDEO_PLL1_REF_SEL] =3D imx_clk_hw_mux("video_pll1_ref_sel", = base + 0x10, 16, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + clks[IMX8MQ_SYS3_PLL1_REF_SEL] =3D imx_clk_hw_mux("sys3_pll1_ref_sel", ba= se + 0x48, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + clks[IMX8MQ_DRAM_PLL1_REF_SEL] =3D imx_clk_hw_mux("dram_pll1_ref_sel", ba= se + 0x60, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + clks[IMX8MQ_VIDEO2_PLL1_REF_SEL] =3D imx_clk_hw_mux("video2_pll1_ref_sel"= , base + 0x54, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + + clks[IMX8MQ_ARM_PLL_REF_DIV] =3D imx_clk_hw_divider("arm_pll_ref_div", "a= rm_pll_ref_sel", base + 0x28, 5, 6); + clks[IMX8MQ_GPU_PLL_REF_DIV] =3D imx_clk_hw_divider("gpu_pll_ref_div", "g= pu_pll_ref_sel", base + 0x18, 5, 6); + clks[IMX8MQ_VPU_PLL_REF_DIV] =3D imx_clk_hw_divider("vpu_pll_ref_div", "v= pu_pll_ref_sel", base + 0x20, 5, 6); + clks[IMX8MQ_AUDIO_PLL1_REF_DIV] =3D imx_clk_hw_divider("audio_pll1_ref_di= v", "audio_pll1_ref_sel", base + 0x0, 5, 6); + clks[IMX8MQ_AUDIO_PLL2_REF_DIV] =3D imx_clk_hw_divider("audio_pll2_ref_di= v", "audio_pll2_ref_sel", base + 0x8, 5, 6); + clks[IMX8MQ_VIDEO_PLL1_REF_DIV] =3D imx_clk_hw_divider("video_pll1_ref_di= v", "video_pll1_ref_sel", base + 0x10, 5, 6); + + clks[IMX8MQ_ARM_PLL] =3D imx_clk_hw_frac_pll("arm_pll", "arm_pll_ref_div"= , base + 0x28); + clks[IMX8MQ_GPU_PLL] =3D imx_clk_hw_frac_pll("gpu_pll", "gpu_pll_ref_div"= , base + 0x18); + clks[IMX8MQ_VPU_PLL] =3D imx_clk_hw_frac_pll("vpu_pll", "vpu_pll_ref_div"= , base + 0x20); + clks[IMX8MQ_AUDIO_PLL1] =3D imx_clk_hw_frac_pll("audio_pll1", "audio_pll1= _ref_div", base + 0x0); + clks[IMX8MQ_AUDIO_PLL2] =3D imx_clk_hw_frac_pll("audio_pll2", "audio_pll2= _ref_div", base + 0x8); + clks[IMX8MQ_VIDEO_PLL1] =3D imx_clk_hw_frac_pll("video_pll1", "video_pll1= _ref_div", base + 0x10); =20 /* PLL bypass out */ - clks[IMX8MQ_ARM_PLL_BYPASS] =3D imx_clk_mux_flags("arm_pll_bypass", base = + 0x28, 14, 1, arm_pll_bypass_sels, ARRAY_SIZE(arm_pll_bypass_sels), CLK_SE= T_RATE_PARENT); - clks[IMX8MQ_GPU_PLL_BYPASS] =3D imx_clk_mux("gpu_pll_bypass", base + 0x18= , 14, 1, gpu_pll_bypass_sels, ARRAY_SIZE(gpu_pll_bypass_sels)); - clks[IMX8MQ_VPU_PLL_BYPASS] =3D imx_clk_mux("vpu_pll_bypass", base + 0x20= , 14, 1, vpu_pll_bypass_sels, ARRAY_SIZE(vpu_pll_bypass_sels)); - clks[IMX8MQ_AUDIO_PLL1_BYPASS] =3D imx_clk_mux("audio_pll1_bypass", base = + 0x0, 14, 1, audio_pll1_bypass_sels, ARRAY_SIZE(audio_pll1_bypass_sels)); - clks[IMX8MQ_AUDIO_PLL2_BYPASS] =3D imx_clk_mux("audio_pll2_bypass", base = + 0x8, 14, 1, audio_pll2_bypass_sels, ARRAY_SIZE(audio_pll2_bypass_sels)); - clks[IMX8MQ_VIDEO_PLL1_BYPASS] =3D imx_clk_mux("video_pll1_bypass", base = + 0x10, 14, 1, video_pll1_bypass_sels, ARRAY_SIZE(video_pll1_bypass_sels)); + clks[IMX8MQ_ARM_PLL_BYPASS] =3D imx_clk_hw_mux_flags("arm_pll_bypass", ba= se + 0x28, 14, 1, arm_pll_bypass_sels, ARRAY_SIZE(arm_pll_bypass_sels), CLK= _SET_RATE_PARENT); + clks[IMX8MQ_GPU_PLL_BYPASS] =3D imx_clk_hw_mux("gpu_pll_bypass", base + 0= x18, 14, 1, gpu_pll_bypass_sels, ARRAY_SIZE(gpu_pll_bypass_sels)); + clks[IMX8MQ_VPU_PLL_BYPASS] =3D imx_clk_hw_mux("vpu_pll_bypass", base + 0= x20, 14, 1, vpu_pll_bypass_sels, ARRAY_SIZE(vpu_pll_bypass_sels)); + clks[IMX8MQ_AUDIO_PLL1_BYPASS] =3D imx_clk_hw_mux("audio_pll1_bypass", ba= se + 0x0, 14, 1, audio_pll1_bypass_sels, ARRAY_SIZE(audio_pll1_bypass_sels)= ); + clks[IMX8MQ_AUDIO_PLL2_BYPASS] =3D imx_clk_hw_mux("audio_pll2_bypass", ba= se + 0x8, 14, 1, audio_pll2_bypass_sels, ARRAY_SIZE(audio_pll2_bypass_sels)= ); + clks[IMX8MQ_VIDEO_PLL1_BYPASS] =3D imx_clk_hw_mux("video_pll1_bypass", ba= se + 0x10, 14, 1, video_pll1_bypass_sels, ARRAY_SIZE(video_pll1_bypass_sels= )); =20 /* PLL OUT GATE */ - clks[IMX8MQ_ARM_PLL_OUT] =3D imx_clk_gate("arm_pll_out", "arm_pll_bypass"= , base + 0x28, 21); - clks[IMX8MQ_GPU_PLL_OUT] =3D imx_clk_gate("gpu_pll_out", "gpu_pll_bypass"= , base + 0x18, 21); - clks[IMX8MQ_VPU_PLL_OUT] =3D imx_clk_gate("vpu_pll_out", "vpu_pll_bypass"= , base + 0x20, 21); - clks[IMX8MQ_AUDIO_PLL1_OUT] =3D imx_clk_gate("audio_pll1_out", "audio_pll= 1_bypass", base + 0x0, 21); - clks[IMX8MQ_AUDIO_PLL2_OUT] =3D imx_clk_gate("audio_pll2_out", "audio_pll= 2_bypass", base + 0x8, 21); - clks[IMX8MQ_VIDEO_PLL1_OUT] =3D imx_clk_gate("video_pll1_out", "video_pll= 1_bypass", base + 0x10, 21); - - clks[IMX8MQ_SYS1_PLL_OUT] =3D imx_clk_fixed("sys1_pll_out", 800000000); - clks[IMX8MQ_SYS2_PLL_OUT] =3D imx_clk_fixed("sys2_pll_out", 1000000000); - clks[IMX8MQ_SYS3_PLL_OUT] =3D imx_clk_sccg_pll("sys3_pll_out", sys3_pll_o= ut_sels, ARRAY_SIZE(sys3_pll_out_sels), 0, 0, 0, base + 0x48, CLK_IS_CRITIC= AL); - clks[IMX8MQ_DRAM_PLL_OUT] =3D imx_clk_sccg_pll("dram_pll_out", dram_pll_o= ut_sels, ARRAY_SIZE(dram_pll_out_sels), 0, 0, 0, base + 0x60, CLK_IS_CRITIC= AL); - clks[IMX8MQ_VIDEO2_PLL_OUT] =3D imx_clk_sccg_pll("video2_pll_out", video2= _pll_out_sels, ARRAY_SIZE(video2_pll_out_sels), 0, 0, 0, base + 0x54, 0); + clks[IMX8MQ_ARM_PLL_OUT] =3D imx_clk_hw_gate("arm_pll_out", "arm_pll_bypa= ss", base + 0x28, 21); + clks[IMX8MQ_GPU_PLL_OUT] =3D imx_clk_hw_gate("gpu_pll_out", "gpu_pll_bypa= ss", base + 0x18, 21); + clks[IMX8MQ_VPU_PLL_OUT] =3D imx_clk_hw_gate("vpu_pll_out", "vpu_pll_bypa= ss", base + 0x20, 21); + clks[IMX8MQ_AUDIO_PLL1_OUT] =3D imx_clk_hw_gate("audio_pll1_out", "audio_= pll1_bypass", base + 0x0, 21); + clks[IMX8MQ_AUDIO_PLL2_OUT] =3D imx_clk_hw_gate("audio_pll2_out", "audio_= pll2_bypass", base + 0x8, 21); + clks[IMX8MQ_VIDEO_PLL1_OUT] =3D imx_clk_hw_gate("video_pll1_out", "video_= pll1_bypass", base + 0x10, 21); + + clks[IMX8MQ_SYS1_PLL_OUT] =3D imx_clk_hw_fixed("sys1_pll_out", 800000000)= ; + clks[IMX8MQ_SYS2_PLL_OUT] =3D imx_clk_hw_fixed("sys2_pll_out", 1000000000= ); + clks[IMX8MQ_SYS3_PLL_OUT] =3D imx_clk_hw_sccg_pll("sys3_pll_out", sys3_pl= l_out_sels, ARRAY_SIZE(sys3_pll_out_sels), 0, 0, 0, base + 0x48, CLK_IS_CRI= TICAL); + clks[IMX8MQ_DRAM_PLL_OUT] =3D imx_clk_hw_sccg_pll("dram_pll_out", dram_pl= l_out_sels, ARRAY_SIZE(dram_pll_out_sels), 0, 0, 0, base + 0x60, CLK_IS_CRI= TICAL); + clks[IMX8MQ_VIDEO2_PLL_OUT] =3D imx_clk_hw_sccg_pll("video2_pll_out", vid= eo2_pll_out_sels, ARRAY_SIZE(video2_pll_out_sels), 0, 0, 0, base + 0x54, 0)= ; =20 /* SYS PLL1 fixed output */ - clks[IMX8MQ_SYS1_PLL_40M_CG] =3D imx_clk_gate("sys1_pll_40m_cg", "sys1_pl= l_out", base + 0x30, 9); - clks[IMX8MQ_SYS1_PLL_80M_CG] =3D imx_clk_gate("sys1_pll_80m_cg", "sys1_pl= l_out", base + 0x30, 11); - clks[IMX8MQ_SYS1_PLL_100M_CG] =3D imx_clk_gate("sys1_pll_100m_cg", "sys1_= pll_out", base + 0x30, 13); - clks[IMX8MQ_SYS1_PLL_133M_CG] =3D imx_clk_gate("sys1_pll_133m_cg", "sys1_= pll_out", base + 0x30, 15); - clks[IMX8MQ_SYS1_PLL_160M_CG] =3D imx_clk_gate("sys1_pll_160m_cg", "sys1_= pll_out", base + 0x30, 17); - clks[IMX8MQ_SYS1_PLL_200M_CG] =3D imx_clk_gate("sys1_pll_200m_cg", "sys1_= pll_out", base + 0x30, 19); - clks[IMX8MQ_SYS1_PLL_266M_CG] =3D imx_clk_gate("sys1_pll_266m_cg", "sys1_= pll_out", base + 0x30, 21); - clks[IMX8MQ_SYS1_PLL_400M_CG] =3D imx_clk_gate("sys1_pll_400m_cg", "sys1_= pll_out", base + 0x30, 23); - clks[IMX8MQ_SYS1_PLL_800M_CG] =3D imx_clk_gate("sys1_pll_800m_cg", "sys1_= pll_out", base + 0x30, 25); - - clks[IMX8MQ_SYS1_PLL_40M] =3D imx_clk_fixed_factor("sys1_pll_40m", "sys1_= pll_40m_cg", 1, 20); - clks[IMX8MQ_SYS1_PLL_80M] =3D imx_clk_fixed_factor("sys1_pll_80m", "sys1_= pll_80m_cg", 1, 10); - clks[IMX8MQ_SYS1_PLL_100M] =3D imx_clk_fixed_factor("sys1_pll_100m", "sys= 1_pll_100m_cg", 1, 8); - clks[IMX8MQ_SYS1_PLL_133M] =3D imx_clk_fixed_factor("sys1_pll_133m", "sys= 1_pll_133m_cg", 1, 6); - clks[IMX8MQ_SYS1_PLL_160M] =3D imx_clk_fixed_factor("sys1_pll_160m", "sys= 1_pll_160m_cg", 1, 5); - clks[IMX8MQ_SYS1_PLL_200M] =3D imx_clk_fixed_factor("sys1_pll_200m", "sys= 1_pll_200m_cg", 1, 4); - clks[IMX8MQ_SYS1_PLL_266M] =3D imx_clk_fixed_factor("sys1_pll_266m", "sys= 1_pll_266m_cg", 1, 3); - clks[IMX8MQ_SYS1_PLL_400M] =3D imx_clk_fixed_factor("sys1_pll_400m", "sys= 1_pll_400m_cg", 1, 2); - clks[IMX8MQ_SYS1_PLL_800M] =3D imx_clk_fixed_factor("sys1_pll_800m", "sys= 1_pll_800m_cg", 1, 1); + clks[IMX8MQ_SYS1_PLL_40M_CG] =3D imx_clk_hw_gate("sys1_pll_40m_cg", "sys1= _pll_out", base + 0x30, 9); + clks[IMX8MQ_SYS1_PLL_80M_CG] =3D imx_clk_hw_gate("sys1_pll_80m_cg", "sys1= _pll_out", base + 0x30, 11); + clks[IMX8MQ_SYS1_PLL_100M_CG] =3D imx_clk_hw_gate("sys1_pll_100m_cg", "sy= s1_pll_out", base + 0x30, 13); + clks[IMX8MQ_SYS1_PLL_133M_CG] =3D imx_clk_hw_gate("sys1_pll_133m_cg", "sy= s1_pll_out", base + 0x30, 15); + clks[IMX8MQ_SYS1_PLL_160M_CG] =3D imx_clk_hw_gate("sys1_pll_160m_cg", "sy= s1_pll_out", base + 0x30, 17); + clks[IMX8MQ_SYS1_PLL_200M_CG] =3D imx_clk_hw_gate("sys1_pll_200m_cg", "sy= s1_pll_out", base + 0x30, 19); + clks[IMX8MQ_SYS1_PLL_266M_CG] =3D imx_clk_hw_gate("sys1_pll_266m_cg", "sy= s1_pll_out", base + 0x30, 21); + clks[IMX8MQ_SYS1_PLL_400M_CG] =3D imx_clk_hw_gate("sys1_pll_400m_cg", "sy= s1_pll_out", base + 0x30, 23); + clks[IMX8MQ_SYS1_PLL_800M_CG] =3D imx_clk_hw_gate("sys1_pll_800m_cg", "sy= s1_pll_out", base + 0x30, 25); + + clks[IMX8MQ_SYS1_PLL_40M] =3D imx_clk_hw_fixed_factor("sys1_pll_40m", "sy= s1_pll_40m_cg", 1, 20); + clks[IMX8MQ_SYS1_PLL_80M] =3D imx_clk_hw_fixed_factor("sys1_pll_80m", "sy= s1_pll_80m_cg", 1, 10); + clks[IMX8MQ_SYS1_PLL_100M] =3D imx_clk_hw_fixed_factor("sys1_pll_100m", "= sys1_pll_100m_cg", 1, 8); + clks[IMX8MQ_SYS1_PLL_133M] =3D imx_clk_hw_fixed_factor("sys1_pll_133m", "= sys1_pll_133m_cg", 1, 6); + clks[IMX8MQ_SYS1_PLL_160M] =3D imx_clk_hw_fixed_factor("sys1_pll_160m", "= sys1_pll_160m_cg", 1, 5); + clks[IMX8MQ_SYS1_PLL_200M] =3D imx_clk_hw_fixed_factor("sys1_pll_200m", "= sys1_pll_200m_cg", 1, 4); + clks[IMX8MQ_SYS1_PLL_266M] =3D imx_clk_hw_fixed_factor("sys1_pll_266m", "= sys1_pll_266m_cg", 1, 3); + clks[IMX8MQ_SYS1_PLL_400M] =3D imx_clk_hw_fixed_factor("sys1_pll_400m", "= sys1_pll_400m_cg", 1, 2); + clks[IMX8MQ_SYS1_PLL_800M] =3D imx_clk_hw_fixed_factor("sys1_pll_800m", "= sys1_pll_800m_cg", 1, 1); =20 /* SYS PLL2 fixed output */ - clks[IMX8MQ_SYS2_PLL_50M_CG] =3D imx_clk_gate("sys2_pll_50m_cg", "sys2_pl= l_out", base + 0x3c, 9); - clks[IMX8MQ_SYS2_PLL_100M_CG] =3D imx_clk_gate("sys2_pll_100m_cg", "sys2_= pll_out", base + 0x3c, 11); - clks[IMX8MQ_SYS2_PLL_125M_CG] =3D imx_clk_gate("sys2_pll_125m_cg", "sys2_= pll_out", base + 0x3c, 13); - clks[IMX8MQ_SYS2_PLL_166M_CG] =3D imx_clk_gate("sys2_pll_166m_cg", "sys2_= pll_out", base + 0x3c, 15); - clks[IMX8MQ_SYS2_PLL_200M_CG] =3D imx_clk_gate("sys2_pll_200m_cg", "sys2_= pll_out", base + 0x3c, 17); - clks[IMX8MQ_SYS2_PLL_250M_CG] =3D imx_clk_gate("sys2_pll_250m_cg", "sys2_= pll_out", base + 0x3c, 19); - clks[IMX8MQ_SYS2_PLL_333M_CG] =3D imx_clk_gate("sys2_pll_333m_cg", "sys2_= pll_out", base + 0x3c, 21); - clks[IMX8MQ_SYS2_PLL_500M_CG] =3D imx_clk_gate("sys2_pll_500m_cg", "sys2_= pll_out", base + 0x3c, 23); - clks[IMX8MQ_SYS2_PLL_1000M_CG] =3D imx_clk_gate("sys2_pll_1000m_cg", "sys= 2_pll_out", base + 0x3c, 25); - - clks[IMX8MQ_SYS2_PLL_50M] =3D imx_clk_fixed_factor("sys2_pll_50m", "sys2_= pll_50m_cg", 1, 20); - clks[IMX8MQ_SYS2_PLL_100M] =3D imx_clk_fixed_factor("sys2_pll_100m", "sys= 2_pll_100m_cg", 1, 10); - clks[IMX8MQ_SYS2_PLL_125M] =3D imx_clk_fixed_factor("sys2_pll_125m", "sys= 2_pll_125m_cg", 1, 8); - clks[IMX8MQ_SYS2_PLL_166M] =3D imx_clk_fixed_factor("sys2_pll_166m", "sys= 2_pll_166m_cg", 1, 6); - clks[IMX8MQ_SYS2_PLL_200M] =3D imx_clk_fixed_factor("sys2_pll_200m", "sys= 2_pll_200m_cg", 1, 5); - clks[IMX8MQ_SYS2_PLL_250M] =3D imx_clk_fixed_factor("sys2_pll_250m", "sys= 2_pll_250m_cg", 1, 4); - clks[IMX8MQ_SYS2_PLL_333M] =3D imx_clk_fixed_factor("sys2_pll_333m", "sys= 2_pll_333m_cg", 1, 3); - clks[IMX8MQ_SYS2_PLL_500M] =3D imx_clk_fixed_factor("sys2_pll_500m", "sys= 2_pll_500m_cg", 1, 2); - clks[IMX8MQ_SYS2_PLL_1000M] =3D imx_clk_fixed_factor("sys2_pll_1000m", "s= ys2_pll_1000m_cg", 1, 1); + clks[IMX8MQ_SYS2_PLL_50M_CG] =3D imx_clk_hw_gate("sys2_pll_50m_cg", "sys2= _pll_out", base + 0x3c, 9); + clks[IMX8MQ_SYS2_PLL_100M_CG] =3D imx_clk_hw_gate("sys2_pll_100m_cg", "sy= s2_pll_out", base + 0x3c, 11); + clks[IMX8MQ_SYS2_PLL_125M_CG] =3D imx_clk_hw_gate("sys2_pll_125m_cg", "sy= s2_pll_out", base + 0x3c, 13); + clks[IMX8MQ_SYS2_PLL_166M_CG] =3D imx_clk_hw_gate("sys2_pll_166m_cg", "sy= s2_pll_out", base + 0x3c, 15); + clks[IMX8MQ_SYS2_PLL_200M_CG] =3D imx_clk_hw_gate("sys2_pll_200m_cg", "sy= s2_pll_out", base + 0x3c, 17); + clks[IMX8MQ_SYS2_PLL_250M_CG] =3D imx_clk_hw_gate("sys2_pll_250m_cg", "sy= s2_pll_out", base + 0x3c, 19); + clks[IMX8MQ_SYS2_PLL_333M_CG] =3D imx_clk_hw_gate("sys2_pll_333m_cg", "sy= s2_pll_out", base + 0x3c, 21); + clks[IMX8MQ_SYS2_PLL_500M_CG] =3D imx_clk_hw_gate("sys2_pll_500m_cg", "sy= s2_pll_out", base + 0x3c, 23); + clks[IMX8MQ_SYS2_PLL_1000M_CG] =3D imx_clk_hw_gate("sys2_pll_1000m_cg", "= sys2_pll_out", base + 0x3c, 25); + + clks[IMX8MQ_SYS2_PLL_50M] =3D imx_clk_hw_fixed_factor("sys2_pll_50m", "sy= s2_pll_50m_cg", 1, 20); + clks[IMX8MQ_SYS2_PLL_100M] =3D imx_clk_hw_fixed_factor("sys2_pll_100m", "= sys2_pll_100m_cg", 1, 10); + clks[IMX8MQ_SYS2_PLL_125M] =3D imx_clk_hw_fixed_factor("sys2_pll_125m", "= sys2_pll_125m_cg", 1, 8); + clks[IMX8MQ_SYS2_PLL_166M] =3D imx_clk_hw_fixed_factor("sys2_pll_166m", "= sys2_pll_166m_cg", 1, 6); + clks[IMX8MQ_SYS2_PLL_200M] =3D imx_clk_hw_fixed_factor("sys2_pll_200m", "= sys2_pll_200m_cg", 1, 5); + clks[IMX8MQ_SYS2_PLL_250M] =3D imx_clk_hw_fixed_factor("sys2_pll_250m", "= sys2_pll_250m_cg", 1, 4); + clks[IMX8MQ_SYS2_PLL_333M] =3D imx_clk_hw_fixed_factor("sys2_pll_333m", "= sys2_pll_333m_cg", 1, 3); + clks[IMX8MQ_SYS2_PLL_500M] =3D imx_clk_hw_fixed_factor("sys2_pll_500m", "= sys2_pll_500m_cg", 1, 2); + clks[IMX8MQ_SYS2_PLL_1000M] =3D imx_clk_hw_fixed_factor("sys2_pll_1000m",= "sys2_pll_1000m_cg", 1, 1); =20 np =3D dev->of_node; base =3D devm_platform_ioremap_resource(pdev, 0); @@ -394,206 +404,209 @@ static int imx8mq_clocks_probe(struct platform_devi= ce *pdev) return PTR_ERR(base); =20 /* CORE */ - clks[IMX8MQ_CLK_A53_SRC] =3D imx_clk_mux2("arm_a53_src", base + 0x8000, 2= 4, 3, imx8mq_a53_sels, ARRAY_SIZE(imx8mq_a53_sels)); - clks[IMX8MQ_CLK_M4_SRC] =3D imx_clk_mux2("arm_m4_src", base + 0x8080, 24,= 3, imx8mq_arm_m4_sels, ARRAY_SIZE(imx8mq_arm_m4_sels)); - clks[IMX8MQ_CLK_VPU_SRC] =3D imx_clk_mux2("vpu_src", base + 0x8100, 24, 3= , imx8mq_vpu_sels, ARRAY_SIZE(imx8mq_vpu_sels)); - clks[IMX8MQ_CLK_GPU_CORE_SRC] =3D imx_clk_mux2("gpu_core_src", base + 0x8= 180, 24, 3, imx8mq_gpu_core_sels, ARRAY_SIZE(imx8mq_gpu_core_sels)); - clks[IMX8MQ_CLK_GPU_SHADER_SRC] =3D imx_clk_mux2("gpu_shader_src", base += 0x8200, 24, 3, imx8mq_gpu_shader_sels, ARRAY_SIZE(imx8mq_gpu_shader_sels)= ); - - clks[IMX8MQ_CLK_A53_CG] =3D imx_clk_gate3_flags("arm_a53_cg", "arm_a53_sr= c", base + 0x8000, 28, CLK_IS_CRITICAL); - clks[IMX8MQ_CLK_M4_CG] =3D imx_clk_gate3("arm_m4_cg", "arm_m4_src", base = + 0x8080, 28); - clks[IMX8MQ_CLK_VPU_CG] =3D imx_clk_gate3("vpu_cg", "vpu_src", base + 0x8= 100, 28); - clks[IMX8MQ_CLK_GPU_CORE_CG] =3D imx_clk_gate3("gpu_core_cg", "gpu_core_s= rc", base + 0x8180, 28); - clks[IMX8MQ_CLK_GPU_SHADER_CG] =3D imx_clk_gate3("gpu_shader_cg", "gpu_sh= ader_src", base + 0x8200, 28); - - clks[IMX8MQ_CLK_A53_DIV] =3D imx_clk_divider2("arm_a53_div", "arm_a53_cg"= , base + 0x8000, 0, 3); - clks[IMX8MQ_CLK_M4_DIV] =3D imx_clk_divider2("arm_m4_div", "arm_m4_cg", b= ase + 0x8080, 0, 3); - clks[IMX8MQ_CLK_VPU_DIV] =3D imx_clk_divider2("vpu_div", "vpu_cg", base += 0x8100, 0, 3); - clks[IMX8MQ_CLK_GPU_CORE_DIV] =3D imx_clk_divider2("gpu_core_div", "gpu_c= ore_cg", base + 0x8180, 0, 3); - clks[IMX8MQ_CLK_GPU_SHADER_DIV] =3D imx_clk_divider2("gpu_shader_div", "g= pu_shader_cg", base + 0x8200, 0, 3); + clks[IMX8MQ_CLK_A53_SRC] =3D imx_clk_hw_mux2("arm_a53_src", base + 0x8000= , 24, 3, imx8mq_a53_sels, ARRAY_SIZE(imx8mq_a53_sels)); + clks[IMX8MQ_CLK_M4_SRC] =3D imx_clk_hw_mux2("arm_m4_src", base + 0x8080, = 24, 3, imx8mq_arm_m4_sels, ARRAY_SIZE(imx8mq_arm_m4_sels)); + clks[IMX8MQ_CLK_VPU_SRC] =3D imx_clk_hw_mux2("vpu_src", base + 0x8100, 24= , 3, imx8mq_vpu_sels, ARRAY_SIZE(imx8mq_vpu_sels)); + clks[IMX8MQ_CLK_GPU_CORE_SRC] =3D imx_clk_hw_mux2("gpu_core_src", base + = 0x8180, 24, 3, imx8mq_gpu_core_sels, ARRAY_SIZE(imx8mq_gpu_core_sels)); + clks[IMX8MQ_CLK_GPU_SHADER_SRC] =3D imx_clk_hw_mux2("gpu_shader_src", bas= e + 0x8200, 24, 3, imx8mq_gpu_shader_sels, ARRAY_SIZE(imx8mq_gpu_shader_se= ls)); + + clks[IMX8MQ_CLK_A53_CG] =3D imx_clk_hw_gate3_flags("arm_a53_cg", "arm_a53= _src", base + 0x8000, 28, CLK_IS_CRITICAL); + clks[IMX8MQ_CLK_M4_CG] =3D imx_clk_hw_gate3("arm_m4_cg", "arm_m4_src", ba= se + 0x8080, 28); + clks[IMX8MQ_CLK_VPU_CG] =3D imx_clk_hw_gate3("vpu_cg", "vpu_src", base + = 0x8100, 28); + clks[IMX8MQ_CLK_GPU_CORE_CG] =3D imx_clk_hw_gate3("gpu_core_cg", "gpu_cor= e_src", base + 0x8180, 28); + clks[IMX8MQ_CLK_GPU_SHADER_CG] =3D imx_clk_hw_gate3("gpu_shader_cg", "gpu= _shader_src", base + 0x8200, 28); + + clks[IMX8MQ_CLK_A53_DIV] =3D imx_clk_hw_divider2("arm_a53_div", "arm_a53_= cg", base + 0x8000, 0, 3); + clks[IMX8MQ_CLK_M4_DIV] =3D imx_clk_hw_divider2("arm_m4_div", "arm_m4_cg"= , base + 0x8080, 0, 3); + clks[IMX8MQ_CLK_VPU_DIV] =3D imx_clk_hw_divider2("vpu_div", "vpu_cg", bas= e + 0x8100, 0, 3); + clks[IMX8MQ_CLK_GPU_CORE_DIV] =3D imx_clk_hw_divider2("gpu_core_div", "gp= u_core_cg", base + 0x8180, 0, 3); + clks[IMX8MQ_CLK_GPU_SHADER_DIV] =3D imx_clk_hw_divider2("gpu_shader_div",= "gpu_shader_cg", base + 0x8200, 0, 3); =20 /* BUS */ - clks[IMX8MQ_CLK_MAIN_AXI] =3D imx8m_clk_composite_critical("main_axi", im= x8mq_main_axi_sels, base + 0x8800); - clks[IMX8MQ_CLK_ENET_AXI] =3D imx8m_clk_composite("enet_axi", imx8mq_enet= _axi_sels, base + 0x8880); - clks[IMX8MQ_CLK_NAND_USDHC_BUS] =3D imx8m_clk_composite("nand_usdhc_bus",= imx8mq_nand_usdhc_sels, base + 0x8900); - clks[IMX8MQ_CLK_VPU_BUS] =3D imx8m_clk_composite("vpu_bus", imx8mq_vpu_bu= s_sels, base + 0x8980); - clks[IMX8MQ_CLK_DISP_AXI] =3D imx8m_clk_composite("disp_axi", imx8mq_disp= _axi_sels, base + 0x8a00); - clks[IMX8MQ_CLK_DISP_APB] =3D imx8m_clk_composite("disp_apb", imx8mq_disp= _apb_sels, base + 0x8a80); - clks[IMX8MQ_CLK_DISP_RTRM] =3D imx8m_clk_composite("disp_rtrm", imx8mq_di= sp_rtrm_sels, base + 0x8b00); - clks[IMX8MQ_CLK_USB_BUS] =3D imx8m_clk_composite("usb_bus", imx8mq_usb_bu= s_sels, base + 0x8b80); - clks[IMX8MQ_CLK_GPU_AXI] =3D imx8m_clk_composite("gpu_axi", imx8mq_gpu_ax= i_sels, base + 0x8c00); - clks[IMX8MQ_CLK_GPU_AHB] =3D imx8m_clk_composite("gpu_ahb", imx8mq_gpu_ah= b_sels, base + 0x8c80); - clks[IMX8MQ_CLK_NOC] =3D imx8m_clk_composite_critical("noc", imx8mq_noc_s= els, base + 0x8d00); - clks[IMX8MQ_CLK_NOC_APB] =3D imx8m_clk_composite_critical("noc_apb", imx8= mq_noc_apb_sels, base + 0x8d80); + clks[IMX8MQ_CLK_MAIN_AXI] =3D imx8m_clk_hw_composite_critical("main_axi",= imx8mq_main_axi_sels, base + 0x8800); + clks[IMX8MQ_CLK_ENET_AXI] =3D imx8m_clk_hw_composite("enet_axi", imx8mq_e= net_axi_sels, base + 0x8880); + clks[IMX8MQ_CLK_NAND_USDHC_BUS] =3D imx8m_clk_hw_composite("nand_usdhc_bu= s", imx8mq_nand_usdhc_sels, base + 0x8900); + clks[IMX8MQ_CLK_VPU_BUS] =3D imx8m_clk_hw_composite("vpu_bus", imx8mq_vpu= _bus_sels, base + 0x8980); + clks[IMX8MQ_CLK_DISP_AXI] =3D imx8m_clk_hw_composite("disp_axi", imx8mq_d= isp_axi_sels, base + 0x8a00); + clks[IMX8MQ_CLK_DISP_APB] =3D imx8m_clk_hw_composite("disp_apb", imx8mq_d= isp_apb_sels, base + 0x8a80); + clks[IMX8MQ_CLK_DISP_RTRM] =3D imx8m_clk_hw_composite("disp_rtrm", imx8mq= _disp_rtrm_sels, base + 0x8b00); + clks[IMX8MQ_CLK_USB_BUS] =3D imx8m_clk_hw_composite("usb_bus", imx8mq_usb= _bus_sels, base + 0x8b80); + clks[IMX8MQ_CLK_GPU_AXI] =3D imx8m_clk_hw_composite("gpu_axi", imx8mq_gpu= _axi_sels, base + 0x8c00); + clks[IMX8MQ_CLK_GPU_AHB] =3D imx8m_clk_hw_composite("gpu_ahb", imx8mq_gpu= _ahb_sels, base + 0x8c80); + clks[IMX8MQ_CLK_NOC] =3D imx8m_clk_hw_composite_critical("noc", imx8mq_no= c_sels, base + 0x8d00); + clks[IMX8MQ_CLK_NOC_APB] =3D imx8m_clk_hw_composite_critical("noc_apb", i= mx8mq_noc_apb_sels, base + 0x8d80); =20 /* AHB */ /* AHB clock is used by the AHB bus therefore marked as critical */ - clks[IMX8MQ_CLK_AHB] =3D imx8m_clk_composite_critical("ahb", imx8mq_ahb_s= els, base + 0x9000); - clks[IMX8MQ_CLK_AUDIO_AHB] =3D imx8m_clk_composite("audio_ahb", imx8mq_au= dio_ahb_sels, base + 0x9100); + clks[IMX8MQ_CLK_AHB] =3D imx8m_clk_hw_composite_critical("ahb", imx8mq_ah= b_sels, base + 0x9000); + clks[IMX8MQ_CLK_AUDIO_AHB] =3D imx8m_clk_hw_composite("audio_ahb", imx8mq= _audio_ahb_sels, base + 0x9100); =20 /* IPG */ - clks[IMX8MQ_CLK_IPG_ROOT] =3D imx_clk_divider2("ipg_root", "ahb", base + = 0x9080, 0, 1); - clks[IMX8MQ_CLK_IPG_AUDIO_ROOT] =3D imx_clk_divider2("ipg_audio_root", "a= udio_ahb", base + 0x9180, 0, 1); + clks[IMX8MQ_CLK_IPG_ROOT] =3D imx_clk_hw_divider2("ipg_root", "ahb", base= + 0x9080, 0, 1); + clks[IMX8MQ_CLK_IPG_AUDIO_ROOT] =3D imx_clk_hw_divider2("ipg_audio_root",= "audio_ahb", base + 0x9180, 0, 1); =20 /* IP */ - clks[IMX8MQ_CLK_DRAM_CORE] =3D imx_clk_mux2_flags("dram_core_clk", base += 0x9800, 24, 1, imx8mq_dram_core_sels, ARRAY_SIZE(imx8mq_dram_core_sels), C= LK_IS_CRITICAL); - - clks[IMX8MQ_CLK_DRAM_ALT] =3D imx8m_clk_composite("dram_alt", imx8mq_dram= _alt_sels, base + 0xa000); - clks[IMX8MQ_CLK_DRAM_APB] =3D imx8m_clk_composite_critical("dram_apb", im= x8mq_dram_apb_sels, base + 0xa080); - clks[IMX8MQ_CLK_VPU_G1] =3D imx8m_clk_composite("vpu_g1", imx8mq_vpu_g1_s= els, base + 0xa100); - clks[IMX8MQ_CLK_VPU_G2] =3D imx8m_clk_composite("vpu_g2", imx8mq_vpu_g2_s= els, base + 0xa180); - clks[IMX8MQ_CLK_DISP_DTRC] =3D imx8m_clk_composite("disp_dtrc", imx8mq_di= sp_dtrc_sels, base + 0xa200); - clks[IMX8MQ_CLK_DISP_DC8000] =3D imx8m_clk_composite("disp_dc8000", imx8m= q_disp_dc8000_sels, base + 0xa280); - clks[IMX8MQ_CLK_PCIE1_CTRL] =3D imx8m_clk_composite("pcie1_ctrl", imx8mq_= pcie1_ctrl_sels, base + 0xa300); - clks[IMX8MQ_CLK_PCIE1_PHY] =3D imx8m_clk_composite("pcie1_phy", imx8mq_pc= ie1_phy_sels, base + 0xa380); - clks[IMX8MQ_CLK_PCIE1_AUX] =3D imx8m_clk_composite("pcie1_aux", imx8mq_pc= ie1_aux_sels, base + 0xa400); - clks[IMX8MQ_CLK_DC_PIXEL] =3D imx8m_clk_composite("dc_pixel", imx8mq_dc_p= ixel_sels, base + 0xa480); - clks[IMX8MQ_CLK_LCDIF_PIXEL] =3D imx8m_clk_composite("lcdif_pixel", imx8m= q_lcdif_pixel_sels, base + 0xa500); - clks[IMX8MQ_CLK_SAI1] =3D imx8m_clk_composite("sai1", imx8mq_sai1_sels, b= ase + 0xa580); - clks[IMX8MQ_CLK_SAI2] =3D imx8m_clk_composite("sai2", imx8mq_sai2_sels, b= ase + 0xa600); - clks[IMX8MQ_CLK_SAI3] =3D imx8m_clk_composite("sai3", imx8mq_sai3_sels, b= ase + 0xa680); - clks[IMX8MQ_CLK_SAI4] =3D imx8m_clk_composite("sai4", imx8mq_sai4_sels, b= ase + 0xa700); - clks[IMX8MQ_CLK_SAI5] =3D imx8m_clk_composite("sai5", imx8mq_sai5_sels, b= ase + 0xa780); - clks[IMX8MQ_CLK_SAI6] =3D imx8m_clk_composite("sai6", imx8mq_sai6_sels, b= ase + 0xa800); - clks[IMX8MQ_CLK_SPDIF1] =3D imx8m_clk_composite("spdif1", imx8mq_spdif1_s= els, base + 0xa880); - clks[IMX8MQ_CLK_SPDIF2] =3D imx8m_clk_composite("spdif2", imx8mq_spdif2_s= els, base + 0xa900); - clks[IMX8MQ_CLK_ENET_REF] =3D imx8m_clk_composite("enet_ref", imx8mq_enet= _ref_sels, base + 0xa980); - clks[IMX8MQ_CLK_ENET_TIMER] =3D imx8m_clk_composite("enet_timer", imx8mq_= enet_timer_sels, base + 0xaa00); - clks[IMX8MQ_CLK_ENET_PHY_REF] =3D imx8m_clk_composite("enet_phy", imx8mq_= enet_phy_sels, base + 0xaa80); - clks[IMX8MQ_CLK_NAND] =3D imx8m_clk_composite("nand", imx8mq_nand_sels, b= ase + 0xab00); - clks[IMX8MQ_CLK_QSPI] =3D imx8m_clk_composite("qspi", imx8mq_qspi_sels, b= ase + 0xab80); - clks[IMX8MQ_CLK_USDHC1] =3D imx8m_clk_composite("usdhc1", imx8mq_usdhc1_s= els, base + 0xac00); - clks[IMX8MQ_CLK_USDHC2] =3D imx8m_clk_composite("usdhc2", imx8mq_usdhc2_s= els, base + 0xac80); - clks[IMX8MQ_CLK_I2C1] =3D imx8m_clk_composite("i2c1", imx8mq_i2c1_sels, b= ase + 0xad00); - clks[IMX8MQ_CLK_I2C2] =3D imx8m_clk_composite("i2c2", imx8mq_i2c2_sels, b= ase + 0xad80); - clks[IMX8MQ_CLK_I2C3] =3D imx8m_clk_composite("i2c3", imx8mq_i2c3_sels, b= ase + 0xae00); - clks[IMX8MQ_CLK_I2C4] =3D imx8m_clk_composite("i2c4", imx8mq_i2c4_sels, b= ase + 0xae80); - clks[IMX8MQ_CLK_UART1] =3D imx8m_clk_composite("uart1", imx8mq_uart1_sels= , base + 0xaf00); - clks[IMX8MQ_CLK_UART2] =3D imx8m_clk_composite("uart2", imx8mq_uart2_sels= , base + 0xaf80); - clks[IMX8MQ_CLK_UART3] =3D imx8m_clk_composite("uart3", imx8mq_uart3_sels= , base + 0xb000); - clks[IMX8MQ_CLK_UART4] =3D imx8m_clk_composite("uart4", imx8mq_uart4_sels= , base + 0xb080); - clks[IMX8MQ_CLK_USB_CORE_REF] =3D imx8m_clk_composite("usb_core_ref", imx= 8mq_usb_core_sels, base + 0xb100); - clks[IMX8MQ_CLK_USB_PHY_REF] =3D imx8m_clk_composite("usb_phy_ref", imx8m= q_usb_phy_sels, base + 0xb180); - clks[IMX8MQ_CLK_GIC] =3D imx8m_clk_composite_critical("gic", imx8mq_gic_s= els, base + 0xb200); - clks[IMX8MQ_CLK_ECSPI1] =3D imx8m_clk_composite("ecspi1", imx8mq_ecspi1_s= els, base + 0xb280); - clks[IMX8MQ_CLK_ECSPI2] =3D imx8m_clk_composite("ecspi2", imx8mq_ecspi2_s= els, base + 0xb300); - clks[IMX8MQ_CLK_PWM1] =3D imx8m_clk_composite("pwm1", imx8mq_pwm1_sels, b= ase + 0xb380); - clks[IMX8MQ_CLK_PWM2] =3D imx8m_clk_composite("pwm2", imx8mq_pwm2_sels, b= ase + 0xb400); - clks[IMX8MQ_CLK_PWM3] =3D imx8m_clk_composite("pwm3", imx8mq_pwm3_sels, b= ase + 0xb480); - clks[IMX8MQ_CLK_PWM4] =3D imx8m_clk_composite("pwm4", imx8mq_pwm4_sels, b= ase + 0xb500); - clks[IMX8MQ_CLK_GPT1] =3D imx8m_clk_composite("gpt1", imx8mq_gpt1_sels, b= ase + 0xb580); - clks[IMX8MQ_CLK_WDOG] =3D imx8m_clk_composite("wdog", imx8mq_wdog_sels, b= ase + 0xb900); - clks[IMX8MQ_CLK_WRCLK] =3D imx8m_clk_composite("wrclk", imx8mq_wrclk_sels= , base + 0xb980); - clks[IMX8MQ_CLK_CLKO1] =3D imx8m_clk_composite("clko1", imx8mq_clko1_sels= , base + 0xba00); - clks[IMX8MQ_CLK_CLKO2] =3D imx8m_clk_composite("clko2", imx8mq_clko2_sels= , base + 0xba80); - clks[IMX8MQ_CLK_DSI_CORE] =3D imx8m_clk_composite("dsi_core", imx8mq_dsi_= core_sels, base + 0xbb00); - clks[IMX8MQ_CLK_DSI_PHY_REF] =3D imx8m_clk_composite("dsi_phy_ref", imx8m= q_dsi_phy_sels, base + 0xbb80); - clks[IMX8MQ_CLK_DSI_DBI] =3D imx8m_clk_composite("dsi_dbi", imx8mq_dsi_db= i_sels, base + 0xbc00); - clks[IMX8MQ_CLK_DSI_ESC] =3D imx8m_clk_composite("dsi_esc", imx8mq_dsi_es= c_sels, base + 0xbc80); - clks[IMX8MQ_CLK_DSI_AHB] =3D imx8m_clk_composite("dsi_ahb", imx8mq_dsi_ah= b_sels, base + 0x9200); - clks[IMX8MQ_CLK_DSI_IPG_DIV] =3D imx_clk_divider2("dsi_ipg_div", "dsi_ahb= ", base + 0x9280, 0, 6); - clks[IMX8MQ_CLK_CSI1_CORE] =3D imx8m_clk_composite("csi1_core", imx8mq_cs= i1_core_sels, base + 0xbd00); - clks[IMX8MQ_CLK_CSI1_PHY_REF] =3D imx8m_clk_composite("csi1_phy_ref", imx= 8mq_csi1_phy_sels, base + 0xbd80); - clks[IMX8MQ_CLK_CSI1_ESC] =3D imx8m_clk_composite("csi1_esc", imx8mq_csi1= _esc_sels, base + 0xbe00); - clks[IMX8MQ_CLK_CSI2_CORE] =3D imx8m_clk_composite("csi2_core", imx8mq_cs= i2_core_sels, base + 0xbe80); - clks[IMX8MQ_CLK_CSI2_PHY_REF] =3D imx8m_clk_composite("csi2_phy_ref", imx= 8mq_csi2_phy_sels, base + 0xbf00); - clks[IMX8MQ_CLK_CSI2_ESC] =3D imx8m_clk_composite("csi2_esc", imx8mq_csi2= _esc_sels, base + 0xbf80); - clks[IMX8MQ_CLK_PCIE2_CTRL] =3D imx8m_clk_composite("pcie2_ctrl", imx8mq_= pcie2_ctrl_sels, base + 0xc000); - clks[IMX8MQ_CLK_PCIE2_PHY] =3D imx8m_clk_composite("pcie2_phy", imx8mq_pc= ie2_phy_sels, base + 0xc080); - clks[IMX8MQ_CLK_PCIE2_AUX] =3D imx8m_clk_composite("pcie2_aux", imx8mq_pc= ie2_aux_sels, base + 0xc100); - clks[IMX8MQ_CLK_ECSPI3] =3D imx8m_clk_composite("ecspi3", imx8mq_ecspi3_s= els, base + 0xc180); - - clks[IMX8MQ_CLK_ECSPI1_ROOT] =3D imx_clk_gate4("ecspi1_root_clk", "ecspi1= ", base + 0x4070, 0); - clks[IMX8MQ_CLK_ECSPI2_ROOT] =3D imx_clk_gate4("ecspi2_root_clk", "ecspi2= ", base + 0x4080, 0); - clks[IMX8MQ_CLK_ECSPI3_ROOT] =3D imx_clk_gate4("ecspi3_root_clk", "ecspi3= ", base + 0x4090, 0); - clks[IMX8MQ_CLK_ENET1_ROOT] =3D imx_clk_gate4("enet1_root_clk", "enet_axi= ", base + 0x40a0, 0); - clks[IMX8MQ_CLK_GPIO1_ROOT] =3D imx_clk_gate4("gpio1_root_clk", "ipg_root= ", base + 0x40b0, 0); - clks[IMX8MQ_CLK_GPIO2_ROOT] =3D imx_clk_gate4("gpio2_root_clk", "ipg_root= ", base + 0x40c0, 0); - clks[IMX8MQ_CLK_GPIO3_ROOT] =3D imx_clk_gate4("gpio3_root_clk", "ipg_root= ", base + 0x40d0, 0); - clks[IMX8MQ_CLK_GPIO4_ROOT] =3D imx_clk_gate4("gpio4_root_clk", "ipg_root= ", base + 0x40e0, 0); - clks[IMX8MQ_CLK_GPIO5_ROOT] =3D imx_clk_gate4("gpio5_root_clk", "ipg_root= ", base + 0x40f0, 0); - clks[IMX8MQ_CLK_GPT1_ROOT] =3D imx_clk_gate4("gpt1_root_clk", "gpt1", bas= e + 0x4100, 0); - clks[IMX8MQ_CLK_I2C1_ROOT] =3D imx_clk_gate4("i2c1_root_clk", "i2c1", bas= e + 0x4170, 0); - clks[IMX8MQ_CLK_I2C2_ROOT] =3D imx_clk_gate4("i2c2_root_clk", "i2c2", bas= e + 0x4180, 0); - clks[IMX8MQ_CLK_I2C3_ROOT] =3D imx_clk_gate4("i2c3_root_clk", "i2c3", bas= e + 0x4190, 0); - clks[IMX8MQ_CLK_I2C4_ROOT] =3D imx_clk_gate4("i2c4_root_clk", "i2c4", bas= e + 0x41a0, 0); - clks[IMX8MQ_CLK_MU_ROOT] =3D imx_clk_gate4("mu_root_clk", "ipg_root", bas= e + 0x4210, 0); - clks[IMX8MQ_CLK_OCOTP_ROOT] =3D imx_clk_gate4("ocotp_root_clk", "ipg_root= ", base + 0x4220, 0); - clks[IMX8MQ_CLK_PCIE1_ROOT] =3D imx_clk_gate4("pcie1_root_clk", "pcie1_ct= rl", base + 0x4250, 0); - clks[IMX8MQ_CLK_PCIE2_ROOT] =3D imx_clk_gate4("pcie2_root_clk", "pcie2_ct= rl", base + 0x4640, 0); - clks[IMX8MQ_CLK_PWM1_ROOT] =3D imx_clk_gate4("pwm1_root_clk", "pwm1", bas= e + 0x4280, 0); - clks[IMX8MQ_CLK_PWM2_ROOT] =3D imx_clk_gate4("pwm2_root_clk", "pwm2", bas= e + 0x4290, 0); - clks[IMX8MQ_CLK_PWM3_ROOT] =3D imx_clk_gate4("pwm3_root_clk", "pwm3", bas= e + 0x42a0, 0); - clks[IMX8MQ_CLK_PWM4_ROOT] =3D imx_clk_gate4("pwm4_root_clk", "pwm4", bas= e + 0x42b0, 0); - clks[IMX8MQ_CLK_QSPI_ROOT] =3D imx_clk_gate4("qspi_root_clk", "qspi", bas= e + 0x42f0, 0); - clks[IMX8MQ_CLK_RAWNAND_ROOT] =3D imx_clk_gate2_shared2("nand_root_clk", = "nand", base + 0x4300, 0, &share_count_nand); - clks[IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK] =3D imx_clk_gate2_shared2("na= nd_usdhc_rawnand_clk", "nand_usdhc_bus", base + 0x4300, 0, &share_count_nan= d); - clks[IMX8MQ_CLK_SAI1_ROOT] =3D imx_clk_gate2_shared2("sai1_root_clk", "sa= i1", base + 0x4330, 0, &share_count_sai1); - clks[IMX8MQ_CLK_SAI1_IPG] =3D imx_clk_gate2_shared2("sai1_ipg_clk", "ipg_= audio_root", base + 0x4330, 0, &share_count_sai1); - clks[IMX8MQ_CLK_SAI2_ROOT] =3D imx_clk_gate2_shared2("sai2_root_clk", "sa= i2", base + 0x4340, 0, &share_count_sai2); - clks[IMX8MQ_CLK_SAI2_IPG] =3D imx_clk_gate2_shared2("sai2_ipg_clk", "ipg_= root", base + 0x4340, 0, &share_count_sai2); - clks[IMX8MQ_CLK_SAI3_ROOT] =3D imx_clk_gate2_shared2("sai3_root_clk", "sa= i3", base + 0x4350, 0, &share_count_sai3); - clks[IMX8MQ_CLK_SAI3_IPG] =3D imx_clk_gate2_shared2("sai3_ipg_clk", "ipg_= root", base + 0x4350, 0, &share_count_sai3); - clks[IMX8MQ_CLK_SAI4_ROOT] =3D imx_clk_gate2_shared2("sai4_root_clk", "sa= i4", base + 0x4360, 0, &share_count_sai4); - clks[IMX8MQ_CLK_SAI4_IPG] =3D imx_clk_gate2_shared2("sai4_ipg_clk", "ipg_= audio_root", base + 0x4360, 0, &share_count_sai4); - clks[IMX8MQ_CLK_SAI5_ROOT] =3D imx_clk_gate2_shared2("sai5_root_clk", "sa= i5", base + 0x4370, 0, &share_count_sai5); - clks[IMX8MQ_CLK_SAI5_IPG] =3D imx_clk_gate2_shared2("sai5_ipg_clk", "ipg_= audio_root", base + 0x4370, 0, &share_count_sai5); - clks[IMX8MQ_CLK_SAI6_ROOT] =3D imx_clk_gate2_shared2("sai6_root_clk", "sa= i6", base + 0x4380, 0, &share_count_sai6); - clks[IMX8MQ_CLK_SAI6_IPG] =3D imx_clk_gate2_shared2("sai6_ipg_clk", "ipg_= audio_root", base + 0x4380, 0, &share_count_sai6); - clks[IMX8MQ_CLK_SNVS_ROOT] =3D imx_clk_gate4("snvs_root_clk", "ipg_root",= base + 0x4470, 0); - clks[IMX8MQ_CLK_UART1_ROOT] =3D imx_clk_gate4("uart1_root_clk", "uart1", = base + 0x4490, 0); - clks[IMX8MQ_CLK_UART2_ROOT] =3D imx_clk_gate4("uart2_root_clk", "uart2", = base + 0x44a0, 0); - clks[IMX8MQ_CLK_UART3_ROOT] =3D imx_clk_gate4("uart3_root_clk", "uart3", = base + 0x44b0, 0); - clks[IMX8MQ_CLK_UART4_ROOT] =3D imx_clk_gate4("uart4_root_clk", "uart4", = base + 0x44c0, 0); - clks[IMX8MQ_CLK_USB1_CTRL_ROOT] =3D imx_clk_gate4("usb1_ctrl_root_clk", "= usb_bus", base + 0x44d0, 0); - clks[IMX8MQ_CLK_USB2_CTRL_ROOT] =3D imx_clk_gate4("usb2_ctrl_root_clk", "= usb_bus", base + 0x44e0, 0); - clks[IMX8MQ_CLK_USB1_PHY_ROOT] =3D imx_clk_gate4("usb1_phy_root_clk", "us= b_phy_ref", base + 0x44f0, 0); - clks[IMX8MQ_CLK_USB2_PHY_ROOT] =3D imx_clk_gate4("usb2_phy_root_clk", "us= b_phy_ref", base + 0x4500, 0); - clks[IMX8MQ_CLK_USDHC1_ROOT] =3D imx_clk_gate4("usdhc1_root_clk", "usdhc1= ", base + 0x4510, 0); - clks[IMX8MQ_CLK_USDHC2_ROOT] =3D imx_clk_gate4("usdhc2_root_clk", "usdhc2= ", base + 0x4520, 0); - clks[IMX8MQ_CLK_WDOG1_ROOT] =3D imx_clk_gate4("wdog1_root_clk", "wdog", b= ase + 0x4530, 0); - clks[IMX8MQ_CLK_WDOG2_ROOT] =3D imx_clk_gate4("wdog2_root_clk", "wdog", b= ase + 0x4540, 0); - clks[IMX8MQ_CLK_WDOG3_ROOT] =3D imx_clk_gate4("wdog3_root_clk", "wdog", b= ase + 0x4550, 0); - clks[IMX8MQ_CLK_VPU_G1_ROOT] =3D imx_clk_gate2_flags("vpu_g1_root_clk", "= vpu_g1", base + 0x4560, 0, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE); - clks[IMX8MQ_CLK_GPU_ROOT] =3D imx_clk_gate4("gpu_root_clk", "gpu_core_div= ", base + 0x4570, 0); - clks[IMX8MQ_CLK_VPU_G2_ROOT] =3D imx_clk_gate2_flags("vpu_g2_root_clk", "= vpu_g2", base + 0x45a0, 0, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE); - clks[IMX8MQ_CLK_DISP_ROOT] =3D imx_clk_gate2_shared2("disp_root_clk", "di= sp_dc8000", base + 0x45d0, 0, &share_count_dcss); - clks[IMX8MQ_CLK_DISP_AXI_ROOT] =3D imx_clk_gate2_shared2("disp_axi_root_= clk", "disp_axi", base + 0x45d0, 0, &share_count_dcss); - clks[IMX8MQ_CLK_DISP_APB_ROOT] =3D imx_clk_gate2_shared2("disp_apb_root_= clk", "disp_apb", base + 0x45d0, 0, &share_count_dcss); - clks[IMX8MQ_CLK_DISP_RTRM_ROOT] =3D imx_clk_gate2_shared2("disp_rtrm_root= _clk", "disp_rtrm", base + 0x45d0, 0, &share_count_dcss); - clks[IMX8MQ_CLK_TMU_ROOT] =3D imx_clk_gate4("tmu_root_clk", "ipg_root", b= ase + 0x4620, 0); - clks[IMX8MQ_CLK_VPU_DEC_ROOT] =3D imx_clk_gate2_flags("vpu_dec_root_clk",= "vpu_bus", base + 0x4630, 0, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE); - clks[IMX8MQ_CLK_CSI1_ROOT] =3D imx_clk_gate4("csi1_root_clk", "csi1_core"= , base + 0x4650, 0); - clks[IMX8MQ_CLK_CSI2_ROOT] =3D imx_clk_gate4("csi2_root_clk", "csi2_core"= , base + 0x4660, 0); - clks[IMX8MQ_CLK_SDMA1_ROOT] =3D imx_clk_gate4("sdma1_clk", "ipg_root", ba= se + 0x43a0, 0); - clks[IMX8MQ_CLK_SDMA2_ROOT] =3D imx_clk_gate4("sdma2_clk", "ipg_audio_roo= t", base + 0x43b0, 0); - - clks[IMX8MQ_GPT_3M_CLK] =3D imx_clk_fixed_factor("gpt_3m", "osc_25m", 1, = 8); - clks[IMX8MQ_CLK_DRAM_ALT_ROOT] =3D imx_clk_fixed_factor("dram_alt_root", = "dram_alt", 1, 4); - - clks[IMX8MQ_CLK_ARM] =3D imx_clk_cpu("arm", "arm_a53_div", - clks[IMX8MQ_CLK_A53_DIV], - clks[IMX8MQ_CLK_A53_SRC], - clks[IMX8MQ_ARM_PLL_OUT], - clks[IMX8MQ_SYS1_PLL_800M]); - - imx_check_clocks(clks, ARRAY_SIZE(clks)); - - clk_data.clks =3D clks; - clk_data.clk_num =3D ARRAY_SIZE(clks); - - err =3D of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); + clks[IMX8MQ_CLK_DRAM_CORE] =3D imx_clk_hw_mux2_flags("dram_core_clk", bas= e + 0x9800, 24, 1, imx8mq_dram_core_sels, ARRAY_SIZE(imx8mq_dram_core_sels)= , CLK_IS_CRITICAL); + + clks[IMX8MQ_CLK_DRAM_ALT] =3D imx8m_clk_hw_composite("dram_alt", imx8mq_d= ram_alt_sels, base + 0xa000); + clks[IMX8MQ_CLK_DRAM_APB] =3D imx8m_clk_hw_composite_critical("dram_apb",= imx8mq_dram_apb_sels, base + 0xa080); + clks[IMX8MQ_CLK_VPU_G1] =3D imx8m_clk_hw_composite("vpu_g1", imx8mq_vpu_g= 1_sels, base + 0xa100); + clks[IMX8MQ_CLK_VPU_G2] =3D imx8m_clk_hw_composite("vpu_g2", imx8mq_vpu_g= 2_sels, base + 0xa180); + clks[IMX8MQ_CLK_DISP_DTRC] =3D imx8m_clk_hw_composite("disp_dtrc", imx8mq= _disp_dtrc_sels, base + 0xa200); + clks[IMX8MQ_CLK_DISP_DC8000] =3D imx8m_clk_hw_composite("disp_dc8000", im= x8mq_disp_dc8000_sels, base + 0xa280); + clks[IMX8MQ_CLK_PCIE1_CTRL] =3D imx8m_clk_hw_composite("pcie1_ctrl", imx8= mq_pcie1_ctrl_sels, base + 0xa300); + clks[IMX8MQ_CLK_PCIE1_PHY] =3D imx8m_clk_hw_composite("pcie1_phy", imx8mq= _pcie1_phy_sels, base + 0xa380); + clks[IMX8MQ_CLK_PCIE1_AUX] =3D imx8m_clk_hw_composite("pcie1_aux", imx8mq= _pcie1_aux_sels, base + 0xa400); + clks[IMX8MQ_CLK_DC_PIXEL] =3D imx8m_clk_hw_composite("dc_pixel", imx8mq_d= c_pixel_sels, base + 0xa480); + clks[IMX8MQ_CLK_LCDIF_PIXEL] =3D imx8m_clk_hw_composite("lcdif_pixel", im= x8mq_lcdif_pixel_sels, base + 0xa500); + clks[IMX8MQ_CLK_SAI1] =3D imx8m_clk_hw_composite("sai1", imx8mq_sai1_sels= , base + 0xa580); + clks[IMX8MQ_CLK_SAI2] =3D imx8m_clk_hw_composite("sai2", imx8mq_sai2_sels= , base + 0xa600); + clks[IMX8MQ_CLK_SAI3] =3D imx8m_clk_hw_composite("sai3", imx8mq_sai3_sels= , base + 0xa680); + clks[IMX8MQ_CLK_SAI4] =3D imx8m_clk_hw_composite("sai4", imx8mq_sai4_sels= , base + 0xa700); + clks[IMX8MQ_CLK_SAI5] =3D imx8m_clk_hw_composite("sai5", imx8mq_sai5_sels= , base + 0xa780); + clks[IMX8MQ_CLK_SAI6] =3D imx8m_clk_hw_composite("sai6", imx8mq_sai6_sels= , base + 0xa800); + clks[IMX8MQ_CLK_SPDIF1] =3D imx8m_clk_hw_composite("spdif1", imx8mq_spdif= 1_sels, base + 0xa880); + clks[IMX8MQ_CLK_SPDIF2] =3D imx8m_clk_hw_composite("spdif2", imx8mq_spdif= 2_sels, base + 0xa900); + clks[IMX8MQ_CLK_ENET_REF] =3D imx8m_clk_hw_composite("enet_ref", imx8mq_e= net_ref_sels, base + 0xa980); + clks[IMX8MQ_CLK_ENET_TIMER] =3D imx8m_clk_hw_composite("enet_timer", imx8= mq_enet_timer_sels, base + 0xaa00); + clks[IMX8MQ_CLK_ENET_PHY_REF] =3D imx8m_clk_hw_composite("enet_phy", imx8= mq_enet_phy_sels, base + 0xaa80); + clks[IMX8MQ_CLK_NAND] =3D imx8m_clk_hw_composite("nand", imx8mq_nand_sels= , base + 0xab00); + clks[IMX8MQ_CLK_QSPI] =3D imx8m_clk_hw_composite("qspi", imx8mq_qspi_sels= , base + 0xab80); + clks[IMX8MQ_CLK_USDHC1] =3D imx8m_clk_hw_composite("usdhc1", imx8mq_usdhc= 1_sels, base + 0xac00); + clks[IMX8MQ_CLK_USDHC2] =3D imx8m_clk_hw_composite("usdhc2", imx8mq_usdhc= 2_sels, base + 0xac80); + clks[IMX8MQ_CLK_I2C1] =3D imx8m_clk_hw_composite("i2c1", imx8mq_i2c1_sels= , base + 0xad00); + clks[IMX8MQ_CLK_I2C2] =3D imx8m_clk_hw_composite("i2c2", imx8mq_i2c2_sels= , base + 0xad80); + clks[IMX8MQ_CLK_I2C3] =3D imx8m_clk_hw_composite("i2c3", imx8mq_i2c3_sels= , base + 0xae00); + clks[IMX8MQ_CLK_I2C4] =3D imx8m_clk_hw_composite("i2c4", imx8mq_i2c4_sels= , base + 0xae80); + clks[IMX8MQ_CLK_UART1] =3D imx8m_clk_hw_composite("uart1", imx8mq_uart1_s= els, base + 0xaf00); + clks[IMX8MQ_CLK_UART2] =3D imx8m_clk_hw_composite("uart2", imx8mq_uart2_s= els, base + 0xaf80); + clks[IMX8MQ_CLK_UART3] =3D imx8m_clk_hw_composite("uart3", imx8mq_uart3_s= els, base + 0xb000); + clks[IMX8MQ_CLK_UART4] =3D imx8m_clk_hw_composite("uart4", imx8mq_uart4_s= els, base + 0xb080); + clks[IMX8MQ_CLK_USB_CORE_REF] =3D imx8m_clk_hw_composite("usb_core_ref", = imx8mq_usb_core_sels, base + 0xb100); + clks[IMX8MQ_CLK_USB_PHY_REF] =3D imx8m_clk_hw_composite("usb_phy_ref", im= x8mq_usb_phy_sels, base + 0xb180); + clks[IMX8MQ_CLK_GIC] =3D imx8m_clk_hw_composite_critical("gic", imx8mq_gi= c_sels, base + 0xb200); + clks[IMX8MQ_CLK_ECSPI1] =3D imx8m_clk_hw_composite("ecspi1", imx8mq_ecspi= 1_sels, base + 0xb280); + clks[IMX8MQ_CLK_ECSPI2] =3D imx8m_clk_hw_composite("ecspi2", imx8mq_ecspi= 2_sels, base + 0xb300); + clks[IMX8MQ_CLK_PWM1] =3D imx8m_clk_hw_composite("pwm1", imx8mq_pwm1_sels= , base + 0xb380); + clks[IMX8MQ_CLK_PWM2] =3D imx8m_clk_hw_composite("pwm2", imx8mq_pwm2_sels= , base + 0xb400); + clks[IMX8MQ_CLK_PWM3] =3D imx8m_clk_hw_composite("pwm3", imx8mq_pwm3_sels= , base + 0xb480); + clks[IMX8MQ_CLK_PWM4] =3D imx8m_clk_hw_composite("pwm4", imx8mq_pwm4_sels= , base + 0xb500); + clks[IMX8MQ_CLK_GPT1] =3D imx8m_clk_hw_composite("gpt1", imx8mq_gpt1_sels= , base + 0xb580); + clks[IMX8MQ_CLK_WDOG] =3D imx8m_clk_hw_composite("wdog", imx8mq_wdog_sels= , base + 0xb900); + clks[IMX8MQ_CLK_WRCLK] =3D imx8m_clk_hw_composite("wrclk", imx8mq_wrclk_s= els, base + 0xb980); + clks[IMX8MQ_CLK_CLKO1] =3D imx8m_clk_hw_composite("clko1", imx8mq_clko1_s= els, base + 0xba00); + clks[IMX8MQ_CLK_CLKO2] =3D imx8m_clk_hw_composite("clko2", imx8mq_clko2_s= els, base + 0xba80); + clks[IMX8MQ_CLK_DSI_CORE] =3D imx8m_clk_hw_composite("dsi_core", imx8mq_d= si_core_sels, base + 0xbb00); + clks[IMX8MQ_CLK_DSI_PHY_REF] =3D imx8m_clk_hw_composite("dsi_phy_ref", im= x8mq_dsi_phy_sels, base + 0xbb80); + clks[IMX8MQ_CLK_DSI_DBI] =3D imx8m_clk_hw_composite("dsi_dbi", imx8mq_dsi= _dbi_sels, base + 0xbc00); + clks[IMX8MQ_CLK_DSI_ESC] =3D imx8m_clk_hw_composite("dsi_esc", imx8mq_dsi= _esc_sels, base + 0xbc80); + clks[IMX8MQ_CLK_DSI_AHB] =3D imx8m_clk_hw_composite("dsi_ahb", imx8mq_dsi= _ahb_sels, base + 0x9200); + clks[IMX8MQ_CLK_DSI_IPG_DIV] =3D imx_clk_hw_divider2("dsi_ipg_div", "dsi_= ahb", base + 0x9280, 0, 6); + clks[IMX8MQ_CLK_CSI1_CORE] =3D imx8m_clk_hw_composite("csi1_core", imx8mq= _csi1_core_sels, base + 0xbd00); + clks[IMX8MQ_CLK_CSI1_PHY_REF] =3D imx8m_clk_hw_composite("csi1_phy_ref", = imx8mq_csi1_phy_sels, base + 0xbd80); + clks[IMX8MQ_CLK_CSI1_ESC] =3D imx8m_clk_hw_composite("csi1_esc", imx8mq_c= si1_esc_sels, base + 0xbe00); + clks[IMX8MQ_CLK_CSI2_CORE] =3D imx8m_clk_hw_composite("csi2_core", imx8mq= _csi2_core_sels, base + 0xbe80); + clks[IMX8MQ_CLK_CSI2_PHY_REF] =3D imx8m_clk_hw_composite("csi2_phy_ref", = imx8mq_csi2_phy_sels, base + 0xbf00); + clks[IMX8MQ_CLK_CSI2_ESC] =3D imx8m_clk_hw_composite("csi2_esc", imx8mq_c= si2_esc_sels, base + 0xbf80); + clks[IMX8MQ_CLK_PCIE2_CTRL] =3D imx8m_clk_hw_composite("pcie2_ctrl", imx8= mq_pcie2_ctrl_sels, base + 0xc000); + clks[IMX8MQ_CLK_PCIE2_PHY] =3D imx8m_clk_hw_composite("pcie2_phy", imx8mq= _pcie2_phy_sels, base + 0xc080); + clks[IMX8MQ_CLK_PCIE2_AUX] =3D imx8m_clk_hw_composite("pcie2_aux", imx8mq= _pcie2_aux_sels, base + 0xc100); + clks[IMX8MQ_CLK_ECSPI3] =3D imx8m_clk_hw_composite("ecspi3", imx8mq_ecspi= 3_sels, base + 0xc180); + + clks[IMX8MQ_CLK_ECSPI1_ROOT] =3D imx_clk_hw_gate4("ecspi1_root_clk", "ecs= pi1", base + 0x4070, 0); + clks[IMX8MQ_CLK_ECSPI2_ROOT] =3D imx_clk_hw_gate4("ecspi2_root_clk", "ecs= pi2", base + 0x4080, 0); + clks[IMX8MQ_CLK_ECSPI3_ROOT] =3D imx_clk_hw_gate4("ecspi3_root_clk", "ecs= pi3", base + 0x4090, 0); + clks[IMX8MQ_CLK_ENET1_ROOT] =3D imx_clk_hw_gate4("enet1_root_clk", "enet_= axi", base + 0x40a0, 0); + clks[IMX8MQ_CLK_GPIO1_ROOT] =3D imx_clk_hw_gate4("gpio1_root_clk", "ipg_r= oot", base + 0x40b0, 0); + clks[IMX8MQ_CLK_GPIO2_ROOT] =3D imx_clk_hw_gate4("gpio2_root_clk", "ipg_r= oot", base + 0x40c0, 0); + clks[IMX8MQ_CLK_GPIO3_ROOT] =3D imx_clk_hw_gate4("gpio3_root_clk", "ipg_r= oot", base + 0x40d0, 0); + clks[IMX8MQ_CLK_GPIO4_ROOT] =3D imx_clk_hw_gate4("gpio4_root_clk", "ipg_r= oot", base + 0x40e0, 0); + clks[IMX8MQ_CLK_GPIO5_ROOT] =3D imx_clk_hw_gate4("gpio5_root_clk", "ipg_r= oot", base + 0x40f0, 0); + clks[IMX8MQ_CLK_GPT1_ROOT] =3D imx_clk_hw_gate4("gpt1_root_clk", "gpt1", = base + 0x4100, 0); + clks[IMX8MQ_CLK_I2C1_ROOT] =3D imx_clk_hw_gate4("i2c1_root_clk", "i2c1", = base + 0x4170, 0); + clks[IMX8MQ_CLK_I2C2_ROOT] =3D imx_clk_hw_gate4("i2c2_root_clk", "i2c2", = base + 0x4180, 0); + clks[IMX8MQ_CLK_I2C3_ROOT] =3D imx_clk_hw_gate4("i2c3_root_clk", "i2c3", = base + 0x4190, 0); + clks[IMX8MQ_CLK_I2C4_ROOT] =3D imx_clk_hw_gate4("i2c4_root_clk", "i2c4", = base + 0x41a0, 0); + clks[IMX8MQ_CLK_MU_ROOT] =3D imx_clk_hw_gate4("mu_root_clk", "ipg_root", = base + 0x4210, 0); + clks[IMX8MQ_CLK_OCOTP_ROOT] =3D imx_clk_hw_gate4("ocotp_root_clk", "ipg_r= oot", base + 0x4220, 0); + clks[IMX8MQ_CLK_PCIE1_ROOT] =3D imx_clk_hw_gate4("pcie1_root_clk", "pcie1= _ctrl", base + 0x4250, 0); + clks[IMX8MQ_CLK_PCIE2_ROOT] =3D imx_clk_hw_gate4("pcie2_root_clk", "pcie2= _ctrl", base + 0x4640, 0); + clks[IMX8MQ_CLK_PWM1_ROOT] =3D imx_clk_hw_gate4("pwm1_root_clk", "pwm1", = base + 0x4280, 0); + clks[IMX8MQ_CLK_PWM2_ROOT] =3D imx_clk_hw_gate4("pwm2_root_clk", "pwm2", = base + 0x4290, 0); + clks[IMX8MQ_CLK_PWM3_ROOT] =3D imx_clk_hw_gate4("pwm3_root_clk", "pwm3", = base + 0x42a0, 0); + clks[IMX8MQ_CLK_PWM4_ROOT] =3D imx_clk_hw_gate4("pwm4_root_clk", "pwm4", = base + 0x42b0, 0); + clks[IMX8MQ_CLK_QSPI_ROOT] =3D imx_clk_hw_gate4("qspi_root_clk", "qspi", = base + 0x42f0, 0); + clks[IMX8MQ_CLK_RAWNAND_ROOT] =3D imx_clk_hw_gate2_shared2("nand_root_clk= ", "nand", base + 0x4300, 0, &share_count_nand); + clks[IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK] =3D imx_clk_hw_gate2_shared2(= "nand_usdhc_rawnand_clk", "nand_usdhc_bus", base + 0x4300, 0, &share_count_= nand); + clks[IMX8MQ_CLK_SAI1_ROOT] =3D imx_clk_hw_gate2_shared2("sai1_root_clk", = "sai1", base + 0x4330, 0, &share_count_sai1); + clks[IMX8MQ_CLK_SAI1_IPG] =3D imx_clk_hw_gate2_shared2("sai1_ipg_clk", "i= pg_audio_root", base + 0x4330, 0, &share_count_sai1); + clks[IMX8MQ_CLK_SAI2_ROOT] =3D imx_clk_hw_gate2_shared2("sai2_root_clk", = "sai2", base + 0x4340, 0, &share_count_sai2); + clks[IMX8MQ_CLK_SAI2_IPG] =3D imx_clk_hw_gate2_shared2("sai2_ipg_clk", "i= pg_root", base + 0x4340, 0, &share_count_sai2); + clks[IMX8MQ_CLK_SAI3_ROOT] =3D imx_clk_hw_gate2_shared2("sai3_root_clk", = "sai3", base + 0x4350, 0, &share_count_sai3); + clks[IMX8MQ_CLK_SAI3_IPG] =3D imx_clk_hw_gate2_shared2("sai3_ipg_clk", "i= pg_root", base + 0x4350, 0, &share_count_sai3); + clks[IMX8MQ_CLK_SAI4_ROOT] =3D imx_clk_hw_gate2_shared2("sai4_root_clk", = "sai4", base + 0x4360, 0, &share_count_sai4); + clks[IMX8MQ_CLK_SAI4_IPG] =3D imx_clk_hw_gate2_shared2("sai4_ipg_clk", "i= pg_audio_root", base + 0x4360, 0, &share_count_sai4); + clks[IMX8MQ_CLK_SAI5_ROOT] =3D imx_clk_hw_gate2_shared2("sai5_root_clk", = "sai5", base + 0x4370, 0, &share_count_sai5); + clks[IMX8MQ_CLK_SAI5_IPG] =3D imx_clk_hw_gate2_shared2("sai5_ipg_clk", "i= pg_audio_root", base + 0x4370, 0, &share_count_sai5); + clks[IMX8MQ_CLK_SAI6_ROOT] =3D imx_clk_hw_gate2_shared2("sai6_root_clk", = "sai6", base + 0x4380, 0, &share_count_sai6); + clks[IMX8MQ_CLK_SAI6_IPG] =3D imx_clk_hw_gate2_shared2("sai6_ipg_clk", "i= pg_audio_root", base + 0x4380, 0, &share_count_sai6); + clks[IMX8MQ_CLK_SNVS_ROOT] =3D imx_clk_hw_gate4("snvs_root_clk", "ipg_roo= t", base + 0x4470, 0); + clks[IMX8MQ_CLK_UART1_ROOT] =3D imx_clk_hw_gate4("uart1_root_clk", "uart1= ", base + 0x4490, 0); + clks[IMX8MQ_CLK_UART2_ROOT] =3D imx_clk_hw_gate4("uart2_root_clk", "uart2= ", base + 0x44a0, 0); + clks[IMX8MQ_CLK_UART3_ROOT] =3D imx_clk_hw_gate4("uart3_root_clk", "uart3= ", base + 0x44b0, 0); + clks[IMX8MQ_CLK_UART4_ROOT] =3D imx_clk_hw_gate4("uart4_root_clk", "uart4= ", base + 0x44c0, 0); + clks[IMX8MQ_CLK_USB1_CTRL_ROOT] =3D imx_clk_hw_gate4("usb1_ctrl_root_clk"= , "usb_bus", base + 0x44d0, 0); + clks[IMX8MQ_CLK_USB2_CTRL_ROOT] =3D imx_clk_hw_gate4("usb2_ctrl_root_clk"= , "usb_bus", base + 0x44e0, 0); + clks[IMX8MQ_CLK_USB1_PHY_ROOT] =3D imx_clk_hw_gate4("usb1_phy_root_clk", = "usb_phy_ref", base + 0x44f0, 0); + clks[IMX8MQ_CLK_USB2_PHY_ROOT] =3D imx_clk_hw_gate4("usb2_phy_root_clk", = "usb_phy_ref", base + 0x4500, 0); + clks[IMX8MQ_CLK_USDHC1_ROOT] =3D imx_clk_hw_gate4("usdhc1_root_clk", "usd= hc1", base + 0x4510, 0); + clks[IMX8MQ_CLK_USDHC2_ROOT] =3D imx_clk_hw_gate4("usdhc2_root_clk", "usd= hc2", base + 0x4520, 0); + clks[IMX8MQ_CLK_WDOG1_ROOT] =3D imx_clk_hw_gate4("wdog1_root_clk", "wdog"= , base + 0x4530, 0); + clks[IMX8MQ_CLK_WDOG2_ROOT] =3D imx_clk_hw_gate4("wdog2_root_clk", "wdog"= , base + 0x4540, 0); + clks[IMX8MQ_CLK_WDOG3_ROOT] =3D imx_clk_hw_gate4("wdog3_root_clk", "wdog"= , base + 0x4550, 0); + clks[IMX8MQ_CLK_VPU_G1_ROOT] =3D imx_clk_hw_gate2_flags("vpu_g1_root_clk"= , "vpu_g1", base + 0x4560, 0, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE); + clks[IMX8MQ_CLK_GPU_ROOT] =3D imx_clk_hw_gate4("gpu_root_clk", "gpu_core_= div", base + 0x4570, 0); + clks[IMX8MQ_CLK_VPU_G2_ROOT] =3D imx_clk_hw_gate2_flags("vpu_g2_root_clk"= , "vpu_g2", base + 0x45a0, 0, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE); + clks[IMX8MQ_CLK_DISP_ROOT] =3D imx_clk_hw_gate2_shared2("disp_root_clk", = "disp_dc8000", base + 0x45d0, 0, &share_count_dcss); + clks[IMX8MQ_CLK_DISP_AXI_ROOT] =3D imx_clk_hw_gate2_shared2("disp_axi_ro= ot_clk", "disp_axi", base + 0x45d0, 0, &share_count_dcss); + clks[IMX8MQ_CLK_DISP_APB_ROOT] =3D imx_clk_hw_gate2_shared2("disp_apb_ro= ot_clk", "disp_apb", base + 0x45d0, 0, &share_count_dcss); + clks[IMX8MQ_CLK_DISP_RTRM_ROOT] =3D imx_clk_hw_gate2_shared2("disp_rtrm_r= oot_clk", "disp_rtrm", base + 0x45d0, 0, &share_count_dcss); + clks[IMX8MQ_CLK_TMU_ROOT] =3D imx_clk_hw_gate4("tmu_root_clk", "ipg_root"= , base + 0x4620, 0); + clks[IMX8MQ_CLK_VPU_DEC_ROOT] =3D imx_clk_hw_gate2_flags("vpu_dec_root_cl= k", "vpu_bus", base + 0x4630, 0, CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABL= E); + clks[IMX8MQ_CLK_CSI1_ROOT] =3D imx_clk_hw_gate4("csi1_root_clk", "csi1_co= re", base + 0x4650, 0); + clks[IMX8MQ_CLK_CSI2_ROOT] =3D imx_clk_hw_gate4("csi2_root_clk", "csi2_co= re", base + 0x4660, 0); + clks[IMX8MQ_CLK_SDMA1_ROOT] =3D imx_clk_hw_gate4("sdma1_clk", "ipg_root",= base + 0x43a0, 0); + clks[IMX8MQ_CLK_SDMA2_ROOT] =3D imx_clk_hw_gate4("sdma2_clk", "ipg_audio_= root", base + 0x43b0, 0); + + clks[IMX8MQ_GPT_3M_CLK] =3D imx_clk_hw_fixed_factor("gpt_3m", "osc_25m", = 1, 8); + clks[IMX8MQ_CLK_DRAM_ALT_ROOT] =3D imx_clk_hw_fixed_factor("dram_alt_root= ", "dram_alt", 1, 4); + + clks[IMX8MQ_CLK_ARM] =3D imx_clk_hw_cpu("arm", "arm_a53_div", + clks[IMX8MQ_CLK_A53_DIV]->clk, + clks[IMX8MQ_CLK_A53_SRC]->clk, + clks[IMX8MQ_ARM_PLL_OUT]->clk, + clks[IMX8MQ_SYS1_PLL_800M]->clk); + + imx_check_clk_hws(clks, IMX8MQ_CLK_END); + + err =3D of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data); if (err < 0) { dev_err(dev, "failed to register clks for i.MX8MQ\n"); goto unregister_clks; } =20 + for (i =3D 0; i < ARRAY_SIZE(uart_clk_ids); i++) { + int index =3D uart_clk_ids[i]; + + uart_clks[i] =3D &clks[index]->clk; + } + imx_register_uart_clocks(uart_clks); =20 return 0; =20 unregister_clks: - imx_unregister_clocks(clks, ARRAY_SIZE(clks)); + imx_unregister_hw_clocks(clks, IMX8MQ_CLK_END); =20 return err; } --=20 2.16.4