Commit 8178e245 authored by Dario Binacchi's avatar Dario Binacchi Committed by Abel Vesa
Browse files

clk: imx: rename imx_obtain_fixed_clk_hw() to imx_get_clk_hw_by_name() 



The imx_obtain_fixed_clk_hw name was wrong and misleading. Renaming it
to imx_get_clk_hw_by_name clarifies the purpose of the function, and
will allow it to be used not only for fixed rate clocks but also in
wider contexts.

No functional changes intended.

The replacements were made with the following command:

grep -rl 'imx_obtain_fixed_clk_hw' ./ | \
     xargs sed -i 's/imx_obtain_fixed_clk_hw/imx_get_clk_hw_by_name/g'

Tested on a BSH SystemMaster (SMM) S2 board.

Signed-off-by: default avatarDario Binacchi <dario.binacchi@amarulasolutions.com>
Reviewed-by: default avatarAbel Vesa <abel.vesa@linaro.org>
Signed-off-by: default avatarAbel Vesa <abel.vesa@linaro.org>
Link: https://lore.kernel.org/r/20221113180839.1625832-1-dario.binacchi@amarulasolutions.com
parent 2626cf67

drivers/clk/imx/clk-imx6sll.c

+4 −4
Original line number Diff line number Diff line
@@ -91,12 +91,12 @@ static void __init imx6sll_clocks_init(struct device_node *ccm_node) 


	hws[IMX6SLL_CLK_DUMMY] = imx_clk_hw_fixed("dummy", 0);



	hws[IMX6SLL_CLK_CKIL] = imx_obtain_fixed_clk_hw(ccm_node, "ckil");

	hws[IMX6SLL_CLK_OSC] = imx_obtain_fixed_clk_hw(ccm_node, "osc");

	hws[IMX6SLL_CLK_CKIL] = imx_get_clk_hw_by_name(ccm_node, "ckil");

	hws[IMX6SLL_CLK_OSC] = imx_get_clk_hw_by_name(ccm_node, "osc");



	/* ipp_di clock is external input */

	hws[IMX6SLL_CLK_IPP_DI0] = imx_obtain_fixed_clk_hw(ccm_node, "ipp_di0");

	hws[IMX6SLL_CLK_IPP_DI1] = imx_obtain_fixed_clk_hw(ccm_node, "ipp_di1");

	hws[IMX6SLL_CLK_IPP_DI0] = imx_get_clk_hw_by_name(ccm_node, "ipp_di0");

	hws[IMX6SLL_CLK_IPP_DI1] = imx_get_clk_hw_by_name(ccm_node, "ipp_di1");



	np = of_find_compatible_node(NULL, NULL, "fsl,imx6sll-anatop");

	base = of_iomap(np, 0);

drivers/clk/imx/clk-imx6sx.c

+6 −6
Original line number Diff line number Diff line
@@ -132,16 +132,16 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) 


	hws[IMX6SX_CLK_DUMMY] = imx_clk_hw_fixed("dummy", 0);



	hws[IMX6SX_CLK_CKIL] = imx_obtain_fixed_clk_hw(ccm_node, "ckil");

	hws[IMX6SX_CLK_OSC] = imx_obtain_fixed_clk_hw(ccm_node, "osc");

	hws[IMX6SX_CLK_CKIL] = imx_get_clk_hw_by_name(ccm_node, "ckil");

	hws[IMX6SX_CLK_OSC] = imx_get_clk_hw_by_name(ccm_node, "osc");



	/* ipp_di clock is external input */

	hws[IMX6SX_CLK_IPP_DI0] = imx_obtain_fixed_clk_hw(ccm_node, "ipp_di0");

	hws[IMX6SX_CLK_IPP_DI1] = imx_obtain_fixed_clk_hw(ccm_node, "ipp_di1");

	hws[IMX6SX_CLK_IPP_DI0] = imx_get_clk_hw_by_name(ccm_node, "ipp_di0");

	hws[IMX6SX_CLK_IPP_DI1] = imx_get_clk_hw_by_name(ccm_node, "ipp_di1");



	/* Clock source from external clock via CLK1/2 PAD */

	hws[IMX6SX_CLK_ANACLK1] = imx_obtain_fixed_clk_hw(ccm_node, "anaclk1");

	hws[IMX6SX_CLK_ANACLK2] = imx_obtain_fixed_clk_hw(ccm_node, "anaclk2");

	hws[IMX6SX_CLK_ANACLK1] = imx_get_clk_hw_by_name(ccm_node, "anaclk1");

	hws[IMX6SX_CLK_ANACLK2] = imx_get_clk_hw_by_name(ccm_node, "anaclk2");



	np = of_find_compatible_node(NULL, NULL, "fsl,imx6sx-anatop");

	base = of_iomap(np, 0);

drivers/clk/imx/clk-imx6ul.c

+4 −4
Original line number Diff line number Diff line
@@ -126,12 +126,12 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) 


	hws[IMX6UL_CLK_DUMMY] = imx_clk_hw_fixed("dummy", 0);



	hws[IMX6UL_CLK_CKIL] = imx_obtain_fixed_clk_hw(ccm_node, "ckil");

	hws[IMX6UL_CLK_OSC] = imx_obtain_fixed_clk_hw(ccm_node, "osc");

	hws[IMX6UL_CLK_CKIL] = imx_get_clk_hw_by_name(ccm_node, "ckil");

	hws[IMX6UL_CLK_OSC] = imx_get_clk_hw_by_name(ccm_node, "osc");



	/* ipp_di clock is external input */

	hws[IMX6UL_CLK_IPP_DI0] = imx_obtain_fixed_clk_hw(ccm_node, "ipp_di0");

	hws[IMX6UL_CLK_IPP_DI1] = imx_obtain_fixed_clk_hw(ccm_node, "ipp_di1");

	hws[IMX6UL_CLK_IPP_DI0] = imx_get_clk_hw_by_name(ccm_node, "ipp_di0");

	hws[IMX6UL_CLK_IPP_DI1] = imx_get_clk_hw_by_name(ccm_node, "ipp_di1");



	np = of_find_compatible_node(NULL, NULL, "fsl,imx6ul-anatop");

	base = of_iomap(np, 0);

drivers/clk/imx/clk-imx7d.c

+2 −2
Original line number Diff line number Diff line
@@ -391,8 +391,8 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) 
	hws = clk_hw_data->hws;



	hws[IMX7D_CLK_DUMMY] = imx_clk_hw_fixed("dummy", 0);

	hws[IMX7D_OSC_24M_CLK] = imx_obtain_fixed_clk_hw(ccm_node, "osc");

	hws[IMX7D_CKIL] = imx_obtain_fixed_clk_hw(ccm_node, "ckil");

	hws[IMX7D_OSC_24M_CLK] = imx_get_clk_hw_by_name(ccm_node, "osc");

	hws[IMX7D_CKIL] = imx_get_clk_hw_by_name(ccm_node, "ckil");



	np = of_find_compatible_node(NULL, NULL, "fsl,imx7d-anatop");

	base = of_iomap(np, 0);

drivers/clk/imx/clk-imx7ulp.c

+5 −5
Original line number Diff line number Diff line
@@ -59,11 +59,11 @@ static void __init imx7ulp_clk_scg1_init(struct device_node *np) 


	hws[IMX7ULP_CLK_DUMMY]		= imx_clk_hw_fixed("dummy", 0);



	hws[IMX7ULP_CLK_ROSC]		= imx_obtain_fixed_clk_hw(np, "rosc");

	hws[IMX7ULP_CLK_SOSC]		= imx_obtain_fixed_clk_hw(np, "sosc");

	hws[IMX7ULP_CLK_SIRC]		= imx_obtain_fixed_clk_hw(np, "sirc");

	hws[IMX7ULP_CLK_FIRC]		= imx_obtain_fixed_clk_hw(np, "firc");

	hws[IMX7ULP_CLK_UPLL]		= imx_obtain_fixed_clk_hw(np, "upll");

	hws[IMX7ULP_CLK_ROSC]		= imx_get_clk_hw_by_name(np, "rosc");

	hws[IMX7ULP_CLK_SOSC]		= imx_get_clk_hw_by_name(np, "sosc");

	hws[IMX7ULP_CLK_SIRC]		= imx_get_clk_hw_by_name(np, "sirc");

	hws[IMX7ULP_CLK_FIRC]		= imx_get_clk_hw_by_name(np, "firc");

	hws[IMX7ULP_CLK_UPLL]		= imx_get_clk_hw_by_name(np, "upll");



	/* SCG1 */

	base = of_iomap(np, 0);