clk: imx: enable the earlycon uart clocks by parsing from dt
Subsystems (3)
PATCH 1/2 clk: imx: enable the earlycon uart clocks by parsing from dt
Remove the earlycon uart clocks that are hard cord in platforms clock driver, instead of parsing the earlycon uart port from dt and enable these clocks from clock property in dt node.
---
Based on NXP's code base and adapted for 5.11-rc1.
https://source.codeaurora.org/external/imx/linux-imx/commit/drivers/clk/imx/clk.c?h=imx_5.4.47_2.2.0&id=754ae82cc55b7445545fc2f092a70e0f490e9c1b
The original signed-off was retained.
Added the fixes tag.
--- drivers/clk/imx/clk.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-)
drivers/clk/imx/clk.c +29 -14
@@ -148,7 +148,7 @@ void imx_cscmr1_fixup(u32 *val)#ifndef MODULE static int imx_keep_uart_clocks; -static struct clk **const *imx_uart_clocks; +static bool imx_uart_clks_on;static int __init imx_keep_uart_clocks_param (char *str) {
@@ -161,25 +161,40 @@ __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[]) +static void imx_earlycon_uart_clks_onoff (bool is_on) { -if (imx_keep_uart_clocks) { -int i; +struct clk *uart_clk; +int i =0 ; - imx_uart_clocks = clks; -for (i =0 ; imx_uart_clocks[i]; i++) -clk_prepare_enable (*imx_uart_clocks[i]); - } +if (!imx_keep_uart_clocks || (!is_on && !imx_uart_clks_on)) +return ; + +/* only support dt */ +if (!of_stdout) +return ; + +do { + uart_clk =of_clk_get (of_stdout, i++); +if (IS_ERR (uart_clk)) +break ; + +if (is_on) +clk_prepare_enable (uart_clk); +else +clk_disable_unprepare (uart_clk); + }while (true); + +if (is_on) + imx_uart_clks_on = true; +} +void imx_register_uart_clocks (struct clk **const clks[]) +{ +imx_earlycon_uart_clks_onoff (true); }static int __init imx_clk_disable_uart (void ) { -if (imx_keep_uart_clocks && imx_uart_clocks) { -int i; - -for (i =0 ; imx_uart_clocks[i]; i++) -clk_disable_unprepare (*imx_uart_clocks[i]); - } +imx_earlycon_uart_clks_onoff (false);return 0 ; }
Signature · 1 line
2.25.1
PATCH 2/2 clk: imx: Cleanup references to imx_register_uart_clocks
With the clk driver scanning the device tree the for stdout, it doesn't require a list of clocks to be passed to it. Remove the code that generates these clock lists.
---
This was build tested for arm, and tested on i.MX8M Nano.
--- drivers/clk/imx/clk-imx25.c | 12 +----------- drivers/clk/imx/clk-imx27.c | 13 +------------ drivers/clk/imx/clk-imx31.c | 10 ---------- 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 | 2 +- drivers/clk/imx/clk.h | 4 ++-- 17 files changed, 23 insertions(+), 254 deletions(-)
drivers/clk/imx/clk-imx25.c +1 -11
@@ -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 ();return 0 ; }
drivers/clk/imx/clk-imx27.c +1 -12
@@ -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 ();imx_print_silicon_rev ("i.MX27" ,mx27_revision ()); }
drivers/clk/imx/clk-imx31.c +0 -10
@@ -51,16 +51,6 @@ enum mx31_clks {static struct clk *clk[clk_max];static struct clk_onecell_data clk_data; -static struct clk **const uart_clks[]__initconst = { - &clk[ipg], - &clk[uart1_gate], - &clk[uart2_gate], - &clk[uart3_gate], - &clk[uart4_gate], - &clk[uart5_gate], -NULL -}; -static void __init _mx31_clocks_init (void __iomem *base,unsigned long fref) { clk[dummy] =imx_clk_fixed ("dummy" ,0 );
drivers/clk/imx/clk-imx35.c +1 -9
@@ -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 ();imx_print_silicon_rev ("i.MX35" ,mx35_revision ()); }
drivers/clk/imx/clk-imx5.c +3 -27
@@ -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 (); }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 (); }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 (); }CLK_OF_DECLARE (imx53_ccm,"fsl,imx53-ccm" , mx53_clocks_init);
drivers/clk/imx/clk-imx6q.c +1 -15
@@ -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 (); }CLK_OF_DECLARE (imx6q,"fsl,imx6q-ccm" , imx6q_clocks_init);
drivers/clk/imx/clk-imx6sl.c +1 -15
@@ -178,19 +178,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 );
@@ -447,12 +439,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 (); }CLK_OF_DECLARE (imx6sl,"fsl,imx6sl-ccm" , imx6sl_clocks_init);
drivers/clk/imx/clk-imx6sll.c +1 -23
@@ -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 ();/* Lower the AHB clock rate before changing the clock source. */ clk_set_rate (hws[IMX6SLL_CLK_AHB ]->clk,99000000 );
drivers/clk/imx/clk-imx6sx.c +1 -15
@@ -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 (); }CLK_OF_DECLARE (imx6sx,"fsl,imx6sx-ccm" , imx6sx_clocks_init);
drivers/clk/imx/clk-imx7d.c +1 -21
@@ -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 (); }CLK_OF_DECLARE (imx7d,"fsl,imx7d-ccm" , imx7d_clocks_init);
drivers/clk/imx/clk-imx7ulp.c +2 -29
@@ -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 (); }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 (); }CLK_OF_DECLARE (imx7ulp_clk_pcc3,"fsl,imx7ulp-pcc3" , imx7ulp_clk_pcc3_init);
drivers/clk/imx/clk-imx8mm.c +2 -16
@@ -291,20 +291,12 @@ static const char *imx8mm_clko2_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_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 );
@@ -622,13 +614,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 ();return 0 ;
drivers/clk/imx/clk-imx8mn.c +2 -16
@@ -284,20 +284,12 @@ static const char * const imx8mn_clko2_sels[] = {"osc_24m", "sys_pll2_200m", "systatic 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 );
@@ -573,13 +565,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 ();return 0 ;
drivers/clk/imx/clk-imx8mp.c +1 -16
@@ -414,20 +414,11 @@ static const char * const imx8mp_dram_core_sels[] = {"dram_pll_out", "dram_alt_rstatic 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 ();return 0 ; }
drivers/clk/imx/clk-imx8mq.c +2 -16
@@ -273,20 +273,12 @@ static const char * const imx8mq_clko2_sels[] = {"osc_25m", "sys2_pll_200m", "systatic 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 );
@@ -607,13 +599,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 ();return 0 ;
drivers/clk/imx/clk.c +1 -1
@@ -187,7 +187,7 @@ static void imx_earlycon_uart_clks_onoff(bool is_on)if (is_on) imx_uart_clks_on = true; } -void imx_register_uart_clocks (struct clk **const clks[]) +void imx_register_uart_clocks (void ) {imx_earlycon_uart_clks_onoff (true); }
drivers/clk/imx/clk.h +2 -2
@@ -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 (void );#else -static inline void imx_register_uart_clocks (struct clk **const clks[]) +static inline void imx_register_uart_clocks (void ) { }#endif
Signature · 1 line
2.25.1
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Adam,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on shawnguo/for-next]
[also build test ERROR on clk/clk-next rockchip/for-next soc/for-next v5.11-rc1 next-20201223] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Adam-Ford/clk-imx-enable-the-earlycon-uart-clocks-by-parsing-from-dt/20201229-225330 base: https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git for-next config: i386-randconfig-a016-20201230 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/dbc1139f0f9718caba0f0091cdf3ece65ef47f3f git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Adam-Ford/clk-imx-enable-the-earlycon-uart-clocks-by-parsing-from-dt/20201229-225330 git checkout dbc1139f0f9718caba0f0091cdf3ece65ef47f3f # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
ld: drivers/clk/imx/clk.o: in function `imx_earlycon_uart_clks_onoff':
>> clk.c:(.text+0x1bd): undefined reference to `of_stdout'
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Sascha Hauer
maintainerHi Adam,
Quoted 2 lines · Adam Ford
Remove the earlycon uart clocks that are hard cord in platforms clock driver, instead of parsing the earlycon uart port from dt
"instead parse the earlycon uart..."
Otherwise it's confusing what you mean here.
Quoted 29 lines
and enable these clocks from clock property in dt node.
Fixes 9461f7b33d11c ("clk: fix CLK_SET_RATE_GATE with clock rate protection")Signed-off-by Fugang Duan <[email protected]>Signed-off-by Adam Ford <[email protected]>---
Based on NXP's code base and adapted for 5.11-rc1.
https://source.codeaurora.org/external/imx/linux-imx/commit/drivers/clk/imx/clk.c?h=imx_5.4.47_2.2.0&id=754ae82cc55b7445545fc2f092a70e0f490e9c1bThe original signed-off was retained.
Added the fixes tag.--- drivers/clk/imx/clk.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-)drivers/clk/imx/clk.c +1
-1@@ -148,7 +148,7 @@ void imx_cscmr1_fixup(u32 *val)#ifndef MODULE static int imx_keep_uart_clocks; -static struct clk **const *imx_uart_clocks; +static bool imx_uart_clks_on;static int __init imx_keep_uart_clocks_param (char *str) {
drivers/clk/imx/clk.c __setup_param("earlycon", imx_keep_uart_earlycon, · line 164
Quoted 5 lines
drivers/clk/imx/clk.c +1
-1@@ -161,25 +161,40 @@ __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[]) +static void imx_earlycon_uart_clks_onoff (bool is_on)
"is_on" sounds like it's the current state of the clock, but actually the variable is used for the desired state, so I suggest using plain "on" as name.
Quoted 9 lines
drivers/clk/imx/clk.c +2
-5{ -if (imx_keep_uart_clocks) { -int i; +struct clk *uart_clk; +int i =0 ; - imx_uart_clocks = clks; -for (i =0 ; imx_uart_clocks[i]; i++) -clk_prepare_enable (*imx_uart_clocks[i]);
drivers/clk/imx/clk.c __setup_param("earlycon", imx_keep_uart_earlycon, · line 177
Quoted 10 lines
drivers/clk/imx/clk.c +9
-1- } +if (!imx_keep_uart_clocks || (!is_on && !imx_uart_clks_on)) +return ; + +/* only support dt */ +if (!of_stdout) +return ; + + do { + uart_clk = of_clk_get(of_stdout, i++);
of_clk_get() allocates memory and gets you a reference to the clock. You have to release the clock with clk_put(). I think what you have to do here is to fill an array with clks when called from imx_register_uart_clocks() and when called from imx_clk_disable_uart() use that array to clk_disable_unprepare()/clk_put() the clocks.
Sascha
Quoted 33 lines
drivers/clk/imx/clk.c +16
-6+if (IS_ERR (uart_clk)) +break ; + +if (is_on) +clk_prepare_enable (uart_clk); +else +clk_disable_unprepare (uart_clk); + }while (true); + +if (is_on) + imx_uart_clks_on = true; +} +void imx_register_uart_clocks (struct clk **const clks[]) +{ +imx_earlycon_uart_clks_onoff (true); }static int __init imx_clk_disable_uart (void ) { -if (imx_keep_uart_clocks && imx_uart_clocks) { -int i; - -for (i =0 ; imx_uart_clocks[i]; i++) -clk_disable_unprepare (*imx_uart_clocks[i]); - } +imx_earlycon_uart_clks_onoff (false);return 0 ; }Signature · 1 line
2.25.1
Signature · 4 lines
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 |
Quoted 43 lines · Sascha Hauer
Hi Adam,
Quoted 2 lines · Adam Ford
Remove the earlycon uart clocks that are hard cord in platforms clock driver, instead of parsing the earlycon uart port from dt
"instead parse the earlycon uart..."
Otherwise it's confusing what you mean here.
Quoted 32 lines
and enable these clocks from clock property in dt node.
Fixes 9461f7b33d11c ("clk: fix CLK_SET_RATE_GATE with clock rate protection")Signed-off-by Fugang Duan <[email protected]>Signed-off-by Adam Ford <[email protected]>---
Based on NXP's code base and adapted for 5.11-rc1.
https://source.codeaurora.org/external/imx/linux-imx/commit/drivers/clk/imx/clk.c?h=imx_5.4.47_2.2.0&id=754ae82cc55b7445545fc2f092a70e0f490e9c1bThe original signed-off was retained.
Added the fixes tag.--- drivers/clk/imx/clk.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-)drivers/clk/imx/clk.c +1
-1@@ -148,7 +148,7 @@ void imx_cscmr1_fixup(u32 *val)#ifndef MODULE static int imx_keep_uart_clocks; -static struct clk **const *imx_uart_clocks; +static bool imx_uart_clks_on;static int __init imx_keep_uart_clocks_param (char *str) {@@ -161,25 +161,40 @@ __setup_param("earlycon", imx_keep_uart_earlycon,__setup_param ("earlyprintk" , imx_keep_uart_earlyprintk, imx_keep_uart_clocks_param,0 );
Quoted 6 lines
drivers/clk/imx/clk.c __setup_param("earlycon", imx_keep_uart_earlycon, · line 164
Quoted 2 lines
drivers/clk/imx/clk.c +1
-1-void imx_register_uart_clocks (struct clk **const clks[]) +static void imx_earlycon_uart_clks_onoff (bool is_on)"
is_on" sounds like it's the current state of the clock, but actually the variable is used for the desired state, so I suggest using plain "on" as name.
Sascha,
I think I'll try to keep the existing structure of imx/clk.c in place so this function won't be needed. It was part of NXP's custom kernel, but I have a different idea that I'll explain below.
Quoted 18 lines
Quoted 18 lines
drivers/clk/imx/clk.c +9
-6{ -if (imx_keep_uart_clocks) { -int i; +struct clk *uart_clk; +int i =0 ; - imx_uart_clocks = clks; -for (i =0 ; imx_uart_clocks[i]; i++) -clk_prepare_enable (*imx_uart_clocks[i]); - } +if (!imx_keep_uart_clocks || (!is_on && !imx_uart_clks_on)) +return ; + +/* only support dt */ +if (!of_stdout) +return ; +
Quoted 8 lines
drivers/clk/imx/clk.c __setup_param("earlycon", imx_keep_uart_earlycon, · line 177
Quoted 2 lines
drivers/clk/imx/clk.c +2
-0+ do { + uart_clk = of_clk_get(of_stdout, i++);
of_clk_get()allocates memory and gets you a reference to the clock. You have to release the clock withclk_put(). I think what you have to do here is to fill an array with clks when called fromimx_register_uart_clocks()and when called fromimx_clk_disable_uart()use that array to clk_disable_unprepare()/clk_put() the clocks.
I have another revision pending which modifies imx_register_uart_clocks() to receive the number of available UART clocks from the calling SoC. It will then allocate an array of clock
structures equal to that size. Instead of enabling all UART clocks,
it will then go through of_clk_get(of_stdout, ...) to fill the array and keep track of the number of devices it's assigned to the array. Most likely the array will be larger than the number of of_stdout entries.
Because it keeps track of the number of enabled UART's, it will use that to go through the array and only try to unprepare/disable and put that many clocks. Once all the clocks have been disabled and put, the entire clock array will be freed.
It will be more closely related to how the current imx/clk.c file is now instead of using NXP's custom kernel, but it will also allow me to remove the static arrays setting up the UART clocks for each SoC.
Does that sound OK to you?
I need to run some tests on my i.MX6Q board before I submit it, but tests on my i.MX8MM are looking promising. I can re-parent the UART that I need reparented, and it fails if I try to reparent when that UART is assigned to stdout.
adam
Quoted 42 lines
Sascha
Quoted 30 lines
drivers/clk/imx/clk.c +16
-7+if (IS_ERR (uart_clk)) +break ; + +if (is_on) +clk_prepare_enable (uart_clk); +else +clk_disable_unprepare (uart_clk); + }while (true); + +if (is_on) + imx_uart_clks_on = true; +} +void imx_register_uart_clocks (struct clk **const clks[]) +{ +imx_earlycon_uart_clks_onoff (true); }static int __init imx_clk_disable_uart (void ) { -if (imx_keep_uart_clocks && imx_uart_clocks) { -int i; - -for (i =0 ; imx_uart_clocks[i]; i++) -clk_disable_unprepare (*imx_uart_clocks[i]); - } +imx_earlycon_uart_clks_onoff (false);return 0 ; } --Quoted 3 lines
2.25.1
--
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 |