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=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 C1915C433E0 for ; Sat, 13 Mar 2021 15:19:06 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 0320664EDD for ; Sat, 13 Mar 2021 15:19:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0320664EDD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=klTXFhX01sB9R/WRsfxk38wdvgApmwRCkjGNBkcwtxc=; b=gOPdzGAyKxf9WRhTYKXFjuydV NeBeiocmELpBPls5MXr8x9X5REXjrgY/GHTmCRygpK0XRQLO/v8eLLtUVYr6Hq/IcWEtcBBdOhRNX Mj89uIajNY8HqKvtVpntP5Om/R/G0TbgtcVjhLlHYsV4iiUeH8h0vIs5t7OYSjcM0KP6G5/8sQfoU E234emFWk0ExwnP+rIn52ScF8FeLlI753UOkY9FN9gXy2MNL05SGNxXTBolTmpLbOH3IkQrOhWfxp fMVDp4+B/DCWRLgQkdoc9pJIPs57mXhWdeKONIMjYZEfH2kHcMzFqBI6zEqpBu1kCjlj1amRlUUfo 1FOo5twSg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lL60q-00DJaC-PU; Sat, 13 Mar 2021 15:17:08 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lL60j-00DJZT-NM for linux-arm-kernel@lists.infradead.org; Sat, 13 Mar 2021 15:17:04 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lL60h-000491-IM; Sat, 13 Mar 2021 16:16:59 +0100 Subject: Re: [PATCH V4] clk: imx: Fix reparenting of UARTs not associated with stdout To: Adam Ford , linux-clk@vger.kernel.org Cc: aford@beaconembedded.com, Aisheng Dong , Abel Vesa , Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Jerome Brunet , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20210313122818.445228-1-aford173@gmail.com> From: Ahmad Fatoum Message-ID: Date: Sat, 13 Mar 2021 16:16:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210313122818.445228-1-aford173@gmail.com> Content-Language: en-US X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: a.fatoum@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210313_151702_021261_286F1235 X-CRM114-Status: GOOD ( 32.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On 13.03.21 13:28, Adam Ford wrote: > Most if not all i.MX SoC's call a function which enables all UARTS. > This is a problem for users who need to re-parent the clock source, > because any attempt to change the parent results in an busy error > due to the fact that the clocks have been enabled already. > > clk: failed to reparent uart1 to sys_pll1_80m: -16 > > Instead of pre-initializing all UARTS, scan the device tree to see > which UART clocks are associated to stdout, and only enable those > UART clocks if it's needed early. This will move initialization of > the remaining clocks until after the parenting of the clocks. > > When the clocks are shutdown, this mechanism will also disable any > clocks that were pre-initialized. > > Fixes: 9461f7b33d11c ("clk: fix CLK_SET_RATE_GATE with clock rate protection") > Suggested-by: Aisheng Dong > Signed-off-by: Adam Ford > Reviewed-by: Abel Vesa > Tested-by: Ahmad Fatoum > > --- > V4: Check if of_stdout is available before using it. > Re-align #ifdef to remove repeated code. > V3: Return a method more closely related to upstream kernel but > instead of passing an array of UART's, each SoC passes the max > number of UART clocks is has. The imx clock driver will create > an array to enable on startup, and disable later. > V2: Attempt to port driver from vendor kernel. > --- > drivers/clk/imx/clk-imx25.c | 12 +--------- > drivers/clk/imx/clk-imx27.c | 13 +---------- > drivers/clk/imx/clk-imx35.c | 10 +-------- > drivers/clk/imx/clk-imx5.c | 30 +++---------------------- > drivers/clk/imx/clk-imx6q.c | 16 +------------- > drivers/clk/imx/clk-imx6sl.c | 16 +------------- > drivers/clk/imx/clk-imx6sll.c | 24 +------------------- > drivers/clk/imx/clk-imx6sx.c | 16 +------------- > drivers/clk/imx/clk-imx7d.c | 22 +------------------ > drivers/clk/imx/clk-imx7ulp.c | 31 ++------------------------ > drivers/clk/imx/clk-imx8mm.c | 18 ++------------- > drivers/clk/imx/clk-imx8mn.c | 18 ++------------- > drivers/clk/imx/clk-imx8mp.c | 17 +-------------- > drivers/clk/imx/clk-imx8mq.c | 18 ++------------- > drivers/clk/imx/clk.c | 41 +++++++++++++++++++++++++++-------- > drivers/clk/imx/clk.h | 4 ++-- > 16 files changed, 54 insertions(+), 252 deletions(-) > > diff --git a/drivers/clk/imx/clk-imx25.c b/drivers/clk/imx/clk-imx25.c > index a66cabfbf94f..66192fe0a898 100644 > --- a/drivers/clk/imx/clk-imx25.c > +++ b/drivers/clk/imx/clk-imx25.c > @@ -73,16 +73,6 @@ enum mx25_clks { > > static struct clk *clk[clk_max]; > > -static struct clk ** const uart_clks[] __initconst = { > - &clk[uart_ipg_per], > - &clk[uart1_ipg], > - &clk[uart2_ipg], > - &clk[uart3_ipg], > - &clk[uart4_ipg], > - &clk[uart5_ipg], > - NULL > -}; > - > static int __init __mx25_clocks_init(void __iomem *ccm_base) > { > BUG_ON(!ccm_base); > @@ -228,7 +218,7 @@ static int __init __mx25_clocks_init(void __iomem *ccm_base) > */ > clk_set_parent(clk[cko_sel], clk[ipg]); > > - imx_register_uart_clocks(uart_clks); > + imx_register_uart_clocks(6); > > return 0; > } > diff --git a/drivers/clk/imx/clk-imx27.c b/drivers/clk/imx/clk-imx27.c > index 5585ded8b8c6..56a5fc402b10 100644 > --- a/drivers/clk/imx/clk-imx27.c > +++ b/drivers/clk/imx/clk-imx27.c > @@ -49,17 +49,6 @@ static const char *ssi_sel_clks[] = { "spll_gate", "mpll", }; > static struct clk *clk[IMX27_CLK_MAX]; > static struct clk_onecell_data clk_data; > > -static struct clk ** const uart_clks[] __initconst = { > - &clk[IMX27_CLK_PER1_GATE], > - &clk[IMX27_CLK_UART1_IPG_GATE], > - &clk[IMX27_CLK_UART2_IPG_GATE], > - &clk[IMX27_CLK_UART3_IPG_GATE], > - &clk[IMX27_CLK_UART4_IPG_GATE], > - &clk[IMX27_CLK_UART5_IPG_GATE], > - &clk[IMX27_CLK_UART6_IPG_GATE], > - NULL > -}; > - > static void __init _mx27_clocks_init(unsigned long fref) > { > BUG_ON(!ccm); > @@ -176,7 +165,7 @@ static void __init _mx27_clocks_init(unsigned long fref) > > clk_prepare_enable(clk[IMX27_CLK_EMI_AHB_GATE]); > > - imx_register_uart_clocks(uart_clks); > + imx_register_uart_clocks(7); > > imx_print_silicon_rev("i.MX27", mx27_revision()); > } > diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c > index c1df03665c09..0fe5ac210156 100644 > --- a/drivers/clk/imx/clk-imx35.c > +++ b/drivers/clk/imx/clk-imx35.c > @@ -82,14 +82,6 @@ enum mx35_clks { > > static struct clk *clk[clk_max]; > > -static struct clk ** const uart_clks[] __initconst = { > - &clk[ipg], > - &clk[uart1_gate], > - &clk[uart2_gate], > - &clk[uart3_gate], > - NULL > -}; > - > static void __init _mx35_clocks_init(void) > { > void __iomem *base; > @@ -243,7 +235,7 @@ static void __init _mx35_clocks_init(void) > */ > clk_prepare_enable(clk[scc_gate]); > > - imx_register_uart_clocks(uart_clks); > + imx_register_uart_clocks(4); > > imx_print_silicon_rev("i.MX35", mx35_revision()); > } > diff --git a/drivers/clk/imx/clk-imx5.c b/drivers/clk/imx/clk-imx5.c > index 01e079b81026..e4493846454d 100644 > --- a/drivers/clk/imx/clk-imx5.c > +++ b/drivers/clk/imx/clk-imx5.c > @@ -128,30 +128,6 @@ static const char *ieee1588_sels[] = { "pll3_sw", "pll4_sw", "dummy" /* usbphy2_ > static struct clk *clk[IMX5_CLK_END]; > static struct clk_onecell_data clk_data; > > -static struct clk ** const uart_clks_mx51[] __initconst = { > - &clk[IMX5_CLK_UART1_IPG_GATE], > - &clk[IMX5_CLK_UART1_PER_GATE], > - &clk[IMX5_CLK_UART2_IPG_GATE], > - &clk[IMX5_CLK_UART2_PER_GATE], > - &clk[IMX5_CLK_UART3_IPG_GATE], > - &clk[IMX5_CLK_UART3_PER_GATE], > - NULL > -}; > - > -static struct clk ** const uart_clks_mx50_mx53[] __initconst = { > - &clk[IMX5_CLK_UART1_IPG_GATE], > - &clk[IMX5_CLK_UART1_PER_GATE], > - &clk[IMX5_CLK_UART2_IPG_GATE], > - &clk[IMX5_CLK_UART2_PER_GATE], > - &clk[IMX5_CLK_UART3_IPG_GATE], > - &clk[IMX5_CLK_UART3_PER_GATE], > - &clk[IMX5_CLK_UART4_IPG_GATE], > - &clk[IMX5_CLK_UART4_PER_GATE], > - &clk[IMX5_CLK_UART5_IPG_GATE], > - &clk[IMX5_CLK_UART5_PER_GATE], > - NULL > -}; > - > static void __init mx5_clocks_common_init(void __iomem *ccm_base) > { > clk[IMX5_CLK_DUMMY] = imx_clk_fixed("dummy", 0); > @@ -382,7 +358,7 @@ static void __init mx50_clocks_init(struct device_node *np) > r = clk_round_rate(clk[IMX5_CLK_USBOH3_PER_GATE], 54000000); > clk_set_rate(clk[IMX5_CLK_USBOH3_PER_GATE], r); > > - imx_register_uart_clocks(uart_clks_mx50_mx53); > + imx_register_uart_clocks(5); > } > CLK_OF_DECLARE(imx50_ccm, "fsl,imx50-ccm", mx50_clocks_init); > > @@ -488,7 +464,7 @@ static void __init mx51_clocks_init(struct device_node *np) > val |= 1 << 23; > writel(val, MXC_CCM_CLPCR); > > - imx_register_uart_clocks(uart_clks_mx51); > + imx_register_uart_clocks(3); > } > CLK_OF_DECLARE(imx51_ccm, "fsl,imx51-ccm", mx51_clocks_init); > > @@ -633,6 +609,6 @@ static void __init mx53_clocks_init(struct device_node *np) > r = clk_round_rate(clk[IMX5_CLK_USBOH3_PER_GATE], 54000000); > clk_set_rate(clk[IMX5_CLK_USBOH3_PER_GATE], r); > > - imx_register_uart_clocks(uart_clks_mx50_mx53); > + imx_register_uart_clocks(5); > } > CLK_OF_DECLARE(imx53_ccm, "fsl,imx53-ccm", mx53_clocks_init); > diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c > index 521d6136d22c..496900de0b0b 100644 > --- a/drivers/clk/imx/clk-imx6q.c > +++ b/drivers/clk/imx/clk-imx6q.c > @@ -140,13 +140,6 @@ static inline int clk_on_imx6dl(void) > return of_machine_is_compatible("fsl,imx6dl"); > } > > -static const int uart_clk_ids[] __initconst = { > - IMX6QDL_CLK_UART_IPG, > - IMX6QDL_CLK_UART_SERIAL, > -}; > - > -static struct clk **uart_clks[ARRAY_SIZE(uart_clk_ids) + 1] __initdata; > - > static int ldb_di_sel_by_clock_id(int clock_id) > { > switch (clock_id) { > @@ -440,7 +433,6 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) > struct device_node *np; > void __iomem *anatop_base, *base; > int ret; > - int i; > > clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > IMX6QDL_CLK_END), GFP_KERNEL); > @@ -982,12 +974,6 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) > hws[IMX6QDL_CLK_PLL3_USB_OTG]->clk); > } > > - for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) { > - int index = uart_clk_ids[i]; > - > - uart_clks[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(uart_clks); > + imx_register_uart_clocks(1); > } > CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init); > diff --git a/drivers/clk/imx/clk-imx6sl.c b/drivers/clk/imx/clk-imx6sl.c > index 29eab05c9068..277365970320 100644 > --- a/drivers/clk/imx/clk-imx6sl.c > +++ b/drivers/clk/imx/clk-imx6sl.c > @@ -179,19 +179,11 @@ void imx6sl_set_wait_clk(bool enter) > imx6sl_enable_pll_arm(false); > } > > -static const int uart_clk_ids[] __initconst = { > - IMX6SL_CLK_UART, > - IMX6SL_CLK_UART_SERIAL, > -}; > - > -static struct clk **uart_clks[ARRAY_SIZE(uart_clk_ids) + 1] __initdata; > - > static void __init imx6sl_clocks_init(struct device_node *ccm_node) > { > struct device_node *np; > void __iomem *base; > int ret; > - int i; > > clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > IMX6SL_CLK_END), GFP_KERNEL); > @@ -448,12 +440,6 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) > clk_set_parent(hws[IMX6SL_CLK_LCDIF_AXI_SEL]->clk, > hws[IMX6SL_CLK_PLL2_PFD2]->clk); > > - for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) { > - int index = uart_clk_ids[i]; > - > - uart_clks[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(uart_clks); > + imx_register_uart_clocks(2); > } > CLK_OF_DECLARE(imx6sl, "fsl,imx6sl-ccm", imx6sl_clocks_init); > diff --git a/drivers/clk/imx/clk-imx6sll.c b/drivers/clk/imx/clk-imx6sll.c > index 8e8288bda4d0..31d777f30039 100644 > --- a/drivers/clk/imx/clk-imx6sll.c > +++ b/drivers/clk/imx/clk-imx6sll.c > @@ -76,26 +76,10 @@ static u32 share_count_ssi1; > static u32 share_count_ssi2; > static u32 share_count_ssi3; > > -static const int uart_clk_ids[] __initconst = { > - IMX6SLL_CLK_UART1_IPG, > - IMX6SLL_CLK_UART1_SERIAL, > - IMX6SLL_CLK_UART2_IPG, > - IMX6SLL_CLK_UART2_SERIAL, > - IMX6SLL_CLK_UART3_IPG, > - IMX6SLL_CLK_UART3_SERIAL, > - IMX6SLL_CLK_UART4_IPG, > - IMX6SLL_CLK_UART4_SERIAL, > - IMX6SLL_CLK_UART5_IPG, > - IMX6SLL_CLK_UART5_SERIAL, > -}; > - > -static struct clk **uart_clks[ARRAY_SIZE(uart_clk_ids) + 1] __initdata; > - > static void __init imx6sll_clocks_init(struct device_node *ccm_node) > { > struct device_node *np; > void __iomem *base; > - int i; > > clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > IMX6SLL_CLK_END), GFP_KERNEL); > @@ -356,13 +340,7 @@ static void __init imx6sll_clocks_init(struct device_node *ccm_node) > > of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data); > > - for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) { > - int index = uart_clk_ids[i]; > - > - uart_clks[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(uart_clks); > + imx_register_uart_clocks(5); > > /* Lower the AHB clock rate before changing the clock source. */ > clk_set_rate(hws[IMX6SLL_CLK_AHB]->clk, 99000000); > diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c > index 20dcce526d07..fc1bd23d4583 100644 > --- a/drivers/clk/imx/clk-imx6sx.c > +++ b/drivers/clk/imx/clk-imx6sx.c > @@ -117,18 +117,10 @@ static u32 share_count_ssi3; > static u32 share_count_sai1; > static u32 share_count_sai2; > > -static const int uart_clk_ids[] __initconst = { > - IMX6SX_CLK_UART_IPG, > - IMX6SX_CLK_UART_SERIAL, > -}; > - > -static struct clk **uart_clks[ARRAY_SIZE(uart_clk_ids) + 1] __initdata; > - > static void __init imx6sx_clocks_init(struct device_node *ccm_node) > { > struct device_node *np; > void __iomem *base; > - int i; > > clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > IMX6SX_CLK_CLK_END), GFP_KERNEL); > @@ -556,12 +548,6 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) > clk_set_parent(hws[IMX6SX_CLK_QSPI1_SEL]->clk, hws[IMX6SX_CLK_PLL2_BUS]->clk); > clk_set_parent(hws[IMX6SX_CLK_QSPI2_SEL]->clk, hws[IMX6SX_CLK_PLL2_BUS]->clk); > > - for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) { > - int index = uart_clk_ids[i]; > - > - uart_clks[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(uart_clks); > + imx_register_uart_clocks(2); > } > CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init); > diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c > index 22d24a6a05e7..c4e0f1c07192 100644 > --- a/drivers/clk/imx/clk-imx7d.c > +++ b/drivers/clk/imx/clk-imx7d.c > @@ -377,23 +377,10 @@ static const char *pll_video_bypass_sel[] = { "pll_video_main", "pll_video_main_ > static struct clk_hw **hws; > static struct clk_hw_onecell_data *clk_hw_data; > > -static const int uart_clk_ids[] __initconst = { > - IMX7D_UART1_ROOT_CLK, > - IMX7D_UART2_ROOT_CLK, > - IMX7D_UART3_ROOT_CLK, > - IMX7D_UART4_ROOT_CLK, > - IMX7D_UART5_ROOT_CLK, > - IMX7D_UART6_ROOT_CLK, > - IMX7D_UART7_ROOT_CLK, > -}; > - > -static struct clk **uart_clks[ARRAY_SIZE(uart_clk_ids) + 1] __initdata; > - > static void __init imx7d_clocks_init(struct device_node *ccm_node) > { > struct device_node *np; > void __iomem *base; > - int i; > > clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > IMX7D_CLK_END), GFP_KERNEL); > @@ -897,14 +884,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) > hws[IMX7D_USB1_MAIN_480M_CLK] = imx_clk_hw_fixed_factor("pll_usb1_main_clk", "osc", 20, 1); > hws[IMX7D_USB_MAIN_480M_CLK] = imx_clk_hw_fixed_factor("pll_usb_main_clk", "osc", 20, 1); > > - for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) { > - int index = uart_clk_ids[i]; > - > - uart_clks[i] = &hws[index]->clk; > - } > - > - > - imx_register_uart_clocks(uart_clks); > + imx_register_uart_clocks(7); > > } > CLK_OF_DECLARE(imx7d, "fsl,imx7d-ccm", imx7d_clocks_init); > diff --git a/drivers/clk/imx/clk-imx7ulp.c b/drivers/clk/imx/clk-imx7ulp.c > index 634c0b6636b0..779e09105da7 100644 > --- a/drivers/clk/imx/clk-imx7ulp.c > +++ b/drivers/clk/imx/clk-imx7ulp.c > @@ -43,19 +43,6 @@ static const struct clk_div_table ulp_div_table[] = { > { /* sentinel */ }, > }; > > -static const int pcc2_uart_clk_ids[] __initconst = { > - IMX7ULP_CLK_LPUART4, > - IMX7ULP_CLK_LPUART5, > -}; > - > -static const int pcc3_uart_clk_ids[] __initconst = { > - IMX7ULP_CLK_LPUART6, > - IMX7ULP_CLK_LPUART7, > -}; > - > -static struct clk **pcc2_uart_clks[ARRAY_SIZE(pcc2_uart_clk_ids) + 1] __initdata; > -static struct clk **pcc3_uart_clks[ARRAY_SIZE(pcc3_uart_clk_ids) + 1] __initdata; > - > static void __init imx7ulp_clk_scg1_init(struct device_node *np) > { > struct clk_hw_onecell_data *clk_data; > @@ -150,7 +137,6 @@ static void __init imx7ulp_clk_pcc2_init(struct device_node *np) > struct clk_hw_onecell_data *clk_data; > struct clk_hw **hws; > void __iomem *base; > - int i; > > clk_data = kzalloc(struct_size(clk_data, hws, IMX7ULP_CLK_PCC2_END), > GFP_KERNEL); > @@ -190,13 +176,7 @@ static void __init imx7ulp_clk_pcc2_init(struct device_node *np) > > of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data); > > - for (i = 0; i < ARRAY_SIZE(pcc2_uart_clk_ids); i++) { > - int index = pcc2_uart_clk_ids[i]; > - > - pcc2_uart_clks[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(pcc2_uart_clks); > + imx_register_uart_clocks(2); > } > CLK_OF_DECLARE(imx7ulp_clk_pcc2, "fsl,imx7ulp-pcc2", imx7ulp_clk_pcc2_init); > > @@ -205,7 +185,6 @@ static void __init imx7ulp_clk_pcc3_init(struct device_node *np) > struct clk_hw_onecell_data *clk_data; > struct clk_hw **hws; > void __iomem *base; > - int i; > > clk_data = kzalloc(struct_size(clk_data, hws, IMX7ULP_CLK_PCC3_END), > GFP_KERNEL); > @@ -244,13 +223,7 @@ static void __init imx7ulp_clk_pcc3_init(struct device_node *np) > > of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data); > > - for (i = 0; i < ARRAY_SIZE(pcc3_uart_clk_ids); i++) { > - int index = pcc3_uart_clk_ids[i]; > - > - pcc3_uart_clks[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(pcc3_uart_clks); > + imx_register_uart_clocks(7); > } > CLK_OF_DECLARE(imx7ulp_clk_pcc3, "fsl,imx7ulp-pcc3", imx7ulp_clk_pcc3_init); > > diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c > index 6a01eec36dd0..f1919fafb124 100644 > --- a/drivers/clk/imx/clk-imx8mm.c > +++ b/drivers/clk/imx/clk-imx8mm.c > @@ -296,20 +296,12 @@ static const char * const clkout_sels[] = {"audio_pll1_out", "audio_pll2_out", " > static struct clk_hw_onecell_data *clk_hw_data; > static struct clk_hw **hws; > > -static const int uart_clk_ids[] = { > - IMX8MM_CLK_UART1_ROOT, > - IMX8MM_CLK_UART2_ROOT, > - IMX8MM_CLK_UART3_ROOT, > - IMX8MM_CLK_UART4_ROOT, > -}; > -static struct clk **uart_hws[ARRAY_SIZE(uart_clk_ids) + 1]; > - > static int imx8mm_clocks_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct device_node *np = dev->of_node; > void __iomem *base; > - int ret, i; > + int ret; > > clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > IMX8MM_CLK_END), GFP_KERNEL); > @@ -634,13 +626,7 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) > goto unregister_hws; > } > > - for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) { > - int index = uart_clk_ids[i]; > - > - uart_hws[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(uart_hws); > + imx_register_uart_clocks(4); > > return 0; > > diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c > index 324c5fd0aa04..88f6630cd472 100644 > --- a/drivers/clk/imx/clk-imx8mn.c > +++ b/drivers/clk/imx/clk-imx8mn.c > @@ -289,20 +289,12 @@ static const char * const clkout_sels[] = {"audio_pll1_out", "audio_pll2_out", " > static struct clk_hw_onecell_data *clk_hw_data; > static struct clk_hw **hws; > > -static const int uart_clk_ids[] = { > - IMX8MN_CLK_UART1_ROOT, > - IMX8MN_CLK_UART2_ROOT, > - IMX8MN_CLK_UART3_ROOT, > - IMX8MN_CLK_UART4_ROOT, > -}; > -static struct clk **uart_hws[ARRAY_SIZE(uart_clk_ids) + 1]; > - > static int imx8mn_clocks_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct device_node *np = dev->of_node; > void __iomem *base; > - int ret, i; > + int ret; > > clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > IMX8MN_CLK_END), GFP_KERNEL); > @@ -585,13 +577,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) > goto unregister_hws; > } > > - for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) { > - int index = uart_clk_ids[i]; > - > - uart_hws[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(uart_hws); > + imx_register_uart_clocks(4); > > return 0; > > diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c > index 2f4e1d674e1c..3e6557e7d559 100644 > --- a/drivers/clk/imx/clk-imx8mp.c > +++ b/drivers/clk/imx/clk-imx8mp.c > @@ -414,20 +414,11 @@ static const char * const imx8mp_dram_core_sels[] = {"dram_pll_out", "dram_alt_r > static struct clk_hw **hws; > static struct clk_hw_onecell_data *clk_hw_data; > > -static const int uart_clk_ids[] = { > - IMX8MP_CLK_UART1_ROOT, > - IMX8MP_CLK_UART2_ROOT, > - IMX8MP_CLK_UART3_ROOT, > - IMX8MP_CLK_UART4_ROOT, > -}; > -static struct clk **uart_clks[ARRAY_SIZE(uart_clk_ids) + 1]; > - > static int imx8mp_clocks_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct device_node *np; > void __iomem *anatop_base, *ccm_base; > - int i; > > np = of_find_compatible_node(NULL, NULL, "fsl,imx8mp-anatop"); > anatop_base = of_iomap(np, 0); > @@ -737,13 +728,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) > > of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data); > > - for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) { > - int index = uart_clk_ids[i]; > - > - uart_clks[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(uart_clks); > + imx_register_uart_clocks(4); > > return 0; > } > diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c > index 4dd4ae9d022b..3e1a10d3f55c 100644 > --- a/drivers/clk/imx/clk-imx8mq.c > +++ b/drivers/clk/imx/clk-imx8mq.c > @@ -281,20 +281,12 @@ static const char * const pllout_monitor_sels[] = {"osc_25m", "osc_27m", "dummy" > static struct clk_hw_onecell_data *clk_hw_data; > static struct clk_hw **hws; > > -static const int uart_clk_ids[] = { > - IMX8MQ_CLK_UART1_ROOT, > - IMX8MQ_CLK_UART2_ROOT, > - IMX8MQ_CLK_UART3_ROOT, > - IMX8MQ_CLK_UART4_ROOT, > -}; > -static struct clk **uart_hws[ARRAY_SIZE(uart_clk_ids) + 1]; > - > static int imx8mq_clocks_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct device_node *np = dev->of_node; > void __iomem *base; > - int err, i; > + int err; > > clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > IMX8MQ_CLK_END), GFP_KERNEL); > @@ -629,13 +621,7 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) > goto unregister_hws; > } > > - for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) { > - int index = uart_clk_ids[i]; > - > - uart_hws[i] = &hws[index]->clk; > - } > - > - imx_register_uart_clocks(uart_hws); > + imx_register_uart_clocks(4); > > return 0; > > diff --git a/drivers/clk/imx/clk.c b/drivers/clk/imx/clk.c > index 47882c51cb85..35e41b9a4e34 100644 > --- a/drivers/clk/imx/clk.c > +++ b/drivers/clk/imx/clk.c > @@ -147,8 +147,10 @@ void imx_cscmr1_fixup(u32 *val) > } > > #ifndef MODULE > -static int imx_keep_uart_clocks; > -static struct clk ** const *imx_uart_clocks; > + > +static bool imx_keep_uart_clocks; > +static int imx_enabled_uart_clocks; > +static struct clk **imx_uart_clocks; > > static int __init imx_keep_uart_clocks_param(char *str) > { > @@ -161,24 +163,45 @@ __setup_param("earlycon", imx_keep_uart_earlycon, > __setup_param("earlyprintk", imx_keep_uart_earlyprintk, > imx_keep_uart_clocks_param, 0); > > -void imx_register_uart_clocks(struct clk ** const clks[]) > +void imx_register_uart_clocks(unsigned int clk_count) > { > + imx_enabled_uart_clocks = 0; > + > +/* i.MX boards use device trees now. For build tests without CONFIG_OF, do nothing */ > +#ifdef CONFIG_OF > if (imx_keep_uart_clocks) { > int i; > > - imx_uart_clocks = clks; > - for (i = 0; imx_uart_clocks[i]; i++) > - clk_prepare_enable(*imx_uart_clocks[i]); > + imx_uart_clocks = kcalloc(clk_count, sizeof(struct clk *), GFP_KERNEL); > + > + if (!of_stdout) > + return; Memory leak. Just do if (imx_keep_uart_clocks && of_stdout) > + > + for (i = 0; i < clk_count; i++) { > + imx_uart_clocks[imx_enabled_uart_clocks] = of_clk_get(of_stdout, i); > + > + /* Stop if there are no more of_stdout references */ > + if (IS_ERR(imx_uart_clocks[imx_enabled_uart_clocks])) > + return; > + > + /* Only enable the clock if it's not NULL */ > + if (imx_uart_clocks[imx_enabled_uart_clocks]) > + clk_prepare_enable(imx_uart_clocks[imx_enabled_uart_clocks++]); > + } > } > +#endif > } > > static int __init imx_clk_disable_uart(void) > { > - if (imx_keep_uart_clocks && imx_uart_clocks) { > + if (imx_keep_uart_clocks && imx_enabled_uart_clocks) { > int i; > > - for (i = 0; imx_uart_clocks[i]; i++) > - clk_disable_unprepare(*imx_uart_clocks[i]); > + for (i = 0; i < imx_enabled_uart_clocks; i++) { > + clk_disable_unprepare(imx_uart_clocks[i]); > + clk_put(imx_uart_clocks[i]); > + }; > + kfree(imx_uart_clocks); > } > > return 0; > diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h > index 4f04c8287286..7571603bee23 100644 > --- a/drivers/clk/imx/clk.h > +++ b/drivers/clk/imx/clk.h > @@ -11,9 +11,9 @@ extern spinlock_t imx_ccm_lock; > void imx_check_clocks(struct clk *clks[], unsigned int count); > void imx_check_clk_hws(struct clk_hw *clks[], unsigned int count); > #ifndef MODULE > -void imx_register_uart_clocks(struct clk ** const clks[]); > +void imx_register_uart_clocks(unsigned int clk_count); > #else > -static inline void imx_register_uart_clocks(struct clk ** const clks[]) > +static inline void imx_register_uart_clocks(unsigned int clk_count) > { > } > #endif > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel