clk: imx: remove clk_count of imx_register_uart_clocks

The clk count has been get with of_clk_get_parent_count, there is
no need to pass clk_count from users.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Link: https://lore.kernel.org/r/20230104110032.1220721-4-peng.fan@oss.nxp.com

diff --git a/drivers/clk/imx/clk-imx25.c b/drivers/clk/imx/clk-imx25.c
index 66192fe0a898c1a568b7c44c02bf180c8dd1899a..cc013b343e62a9e66afbd4998767be31861f4680 100644 (file)
--- a/drivers/clk/imx/clk-imx25.c
+++ b/drivers/clk/imx/clk-imx25.c
@@ -218,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(6);
+       imx_register_uart_clocks();
 
        return 0;
 }

diff --git a/drivers/clk/imx/clk-imx27.c b/drivers/clk/imx/clk-imx27.c
index 56a5fc402b10c48487e79660b22c1acd541ce7c6..5d177125728df3a8c8694f1a34b089e4e1d78436 100644 (file)
--- a/drivers/clk/imx/clk-imx27.c
+++ b/drivers/clk/imx/clk-imx27.c
@@ -165,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(7);
+       imx_register_uart_clocks();
 
        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 0fe5ac210156607231a1390a5372c21cd3b89c0e..7dcbaea3fea35d6839402967f27616b68c14ebc7 100644 (file)
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
@@ -235,7 +235,7 @@ static void __init _mx35_clocks_init(void)
         */
        clk_prepare_enable(clk[scc_gate]);
 
-       imx_register_uart_clocks(4);
+       imx_register_uart_clocks();
 
        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 e4493846454dd15fa9797ddc5f44acc546fd41b2..b820449116031630630987dbae9915638d472b91 100644 (file)
--- a/drivers/clk/imx/clk-imx5.c
+++ b/drivers/clk/imx/clk-imx5.c
@@ -358,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(5);
+       imx_register_uart_clocks();
 }
 CLK_OF_DECLARE(imx50_ccm, "fsl,imx50-ccm", mx50_clocks_init);
 
@@ -464,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(3);
+       imx_register_uart_clocks();
 }
 CLK_OF_DECLARE(imx51_ccm, "fsl,imx51-ccm", mx51_clocks_init);
 
@@ -609,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(5);
+       imx_register_uart_clocks();
 }
 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 de36f58d551c0b920b0375360318f3f38c093528..da71e064531eee82a07d4da3437265382fb6539a 100644 (file)
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -974,6 +974,6 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
                               hws[IMX6QDL_CLK_PLL3_USB_OTG]->clk);
        }
 
-       imx_register_uart_clocks(2);
+       imx_register_uart_clocks();
 }
 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 277365970320299c5966039ad9aae0da448b51b8..47b8667cfa3f82e07fb528a05313d5cbd82e4105 100644 (file)
--- a/drivers/clk/imx/clk-imx6sl.c
+++ b/drivers/clk/imx/clk-imx6sl.c
@@ -440,6 +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);
 
-       imx_register_uart_clocks(2);
+       imx_register_uart_clocks();
 }
 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 1c9351649eab7e98c92b5b86a54a7a465e148a74..2fa70bf35e45719465e388097b8abb91a5a028b1 100644 (file)
--- a/drivers/clk/imx/clk-imx6sll.c
+++ b/drivers/clk/imx/clk-imx6sll.c
@@ -340,7 +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);
 
-       imx_register_uart_clocks(5);
+       imx_register_uart_clocks();
 
        /* 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 b378531240e60fcb35807d924afb4844b24060ec..7cf86707bc395309d12109aaf77c5b5fdb7e3cbd 100644 (file)
--- a/drivers/clk/imx/clk-imx6sx.c
+++ b/drivers/clk/imx/clk-imx6sx.c
@@ -548,6 +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);
 
-       imx_register_uart_clocks(2);
+       imx_register_uart_clocks();
 }
 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 d681b6c4b29a5fc2341d334a556d3a3cb6063044..2b77d1fc7bb94605d7b37b9e757db668bb121f31 100644 (file)
--- a/drivers/clk/imx/clk-imx7d.c
+++ b/drivers/clk/imx/clk-imx7d.c
@@ -882,7 +882,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);
 
-       imx_register_uart_clocks(7);
+       imx_register_uart_clocks();
 
 }
 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 208a0ab80d5e97b82996d32c5184bc7e760c6ed0..f4a48a42637f6efd4744fbcf01991acc75379626 100644 (file)
--- a/drivers/clk/imx/clk-imx7ulp.c
+++ b/drivers/clk/imx/clk-imx7ulp.c
@@ -176,7 +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);
 
-       imx_register_uart_clocks(2);
+       imx_register_uart_clocks();
 }
 CLK_OF_DECLARE(imx7ulp_clk_pcc2, "fsl,imx7ulp-pcc2", imx7ulp_clk_pcc2_init);
 
@@ -223,7 +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);
 
-       imx_register_uart_clocks(7);
+       imx_register_uart_clocks();
 }
 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 cb44e8148e53590d826cfa3fc7df40966ef11869..b618892170f26303221f0f7afd27c4965e368d52 100644 (file)
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -609,7 +609,7 @@ static int imx8mm_clocks_probe(struct platform_device *pdev)
                goto unregister_hws;
        }
 
-       imx_register_uart_clocks(4);
+       imx_register_uart_clocks();
 
        return 0;
 

diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
index af256ade554f4a41f83827f7079ea57a3c3dacd4..a042ed3a9d6c2828726fcfc8f7b01b85309c452a 100644 (file)
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -602,7 +602,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)
                goto unregister_hws;
        }
 
-       imx_register_uart_clocks(4);
+       imx_register_uart_clocks();
 
        return 0;
 

diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index a57d877d393d38d05e7ffff959898e1abbffe323..3253589851ffbc5cb60e4fbb2648c7cb3d04a318 100644 (file)
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -723,7 +723,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
 
        of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
 
-       imx_register_uart_clocks(4);
+       imx_register_uart_clocks();
 
        return 0;
 }

diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c
index 2bcaec19a999a9b8d57245392d05cc304e9bc316..4bd65879fcd347a9d5a4d1126f0e02ef985fc60c 100644 (file)
--- a/drivers/clk/imx/clk-imx8mq.c
+++ b/drivers/clk/imx/clk-imx8mq.c
@@ -601,7 +601,7 @@ static int imx8mq_clocks_probe(struct platform_device *pdev)
                goto unregister_hws;
        }
 
-       imx_register_uart_clocks(4);
+       imx_register_uart_clocks();
 
        return 0;
 

diff --git a/drivers/clk/imx/clk-imx8ulp.c b/drivers/clk/imx/clk-imx8ulp.c
index 8eb1af2d642981702febc15d69176f427882e635..a07df3b44703ff434b0686e2967d980287ea9567 100644 (file)
--- a/drivers/clk/imx/clk-imx8ulp.c
+++ b/drivers/clk/imx/clk-imx8ulp.c
@@ -385,7 +385,7 @@ static int imx8ulp_clk_pcc3_init(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       imx_register_uart_clocks(1);
+       imx_register_uart_clocks();
 
        /* register the pcc3 reset controller */
        return imx8ulp_pcc_reset_init(pdev, base, pcc3_resets, ARRAY_SIZE(pcc3_resets));

diff --git a/drivers/clk/imx/clk.c b/drivers/clk/imx/clk.c
index df810f0ee16d53f1355c6706cafe6713af37604f..4f7db3c9e144e2210cd84f2f4bdf10607882b19c 100644 (file)
--- a/drivers/clk/imx/clk.c
+++ b/drivers/clk/imx/clk.c
@@ -165,7 +165,7 @@ __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(unsigned int clk_count)
+void imx_register_uart_clocks(void)
 {
        unsigned int num __maybe_unused;
 

diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h
index 689b3ad927c07841d71d9c7e2549206911aea9f8..c4c73477e7726c380188d1d76db32ee7d0ff4ba9 100644 (file)
--- a/drivers/clk/imx/clk.h
+++ b/drivers/clk/imx/clk.h
@@ -12,9 +12,9 @@ extern bool mcore_booted;
 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(unsigned int clk_count);
+void imx_register_uart_clocks(void);
 #else
-static inline void imx_register_uart_clocks(unsigned int clk_count)
+static inline void imx_register_uart_clocks(void)
 {
 }
 #endif