Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b674cf2f authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx5: drop arguments from mx5_clocks_common_init() 



The function mx5_clocks_common_init() was created with a number of
arguments to pass oscillator clock rate in non-DT boot.  Since i.MX5
is DT only platform, the arguments can be dropped, and the clock rate
can just be retrieved from device tree.

Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent c16cc8a0

arch/arm/mach-imx/clk-imx51-imx53.c

+8 −10
Original line number Diff line number Diff line
@@ -86,17 +86,15 @@ static const char *mx51_spdif1_com_sel[] = { "spdif1_podf", "ssi2_root_gate", }; 
static struct clk *clk[IMX5_CLK_END];

static struct clk_onecell_data clk_data;



static void __init mx5_clocks_common_init(unsigned long rate_ckil,

		unsigned long rate_osc, unsigned long rate_ckih1,

		unsigned long rate_ckih2)

static void __init mx5_clocks_common_init(void)

{

	int i;



	clk[IMX5_CLK_DUMMY]		= imx_clk_fixed("dummy", 0);

	clk[IMX5_CLK_CKIL]		= imx_obtain_fixed_clock("ckil", rate_ckil);

	clk[IMX5_CLK_OSC]		= imx_obtain_fixed_clock("osc", rate_osc);

	clk[IMX5_CLK_CKIH1]		= imx_obtain_fixed_clock("ckih1", rate_ckih1);

	clk[IMX5_CLK_CKIH2]		= imx_obtain_fixed_clock("ckih2", rate_ckih2);

	clk[IMX5_CLK_CKIL]		= imx_obtain_fixed_clock("ckil", 0);

	clk[IMX5_CLK_OSC]		= imx_obtain_fixed_clock("osc", 0);

	clk[IMX5_CLK_CKIH1]		= imx_obtain_fixed_clock("ckih1", 0);

	clk[IMX5_CLK_CKIH2]		= imx_obtain_fixed_clock("ckih2", 0);



	clk[IMX5_CLK_PERIPH_APM]	= imx_clk_mux("periph_apm", MXC_CCM_CBCMR, 12, 2,

						periph_apm_sel, ARRAY_SIZE(periph_apm_sel));
@@ -358,7 +356,7 @@ static void __init mx50_clocks_init(struct device_node *np) 
	clk_data.clk_num = ARRAY_SIZE(clk);

	of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);



	mx5_clocks_common_init(0, 0, 0, 0);

	mx5_clocks_common_init();



	/* set SDHC root clock to 200MHZ*/

	clk_set_rate(clk[IMX5_CLK_ESDHC_A_PODF], 200000000);
@@ -424,7 +422,7 @@ static void __init mx51_clocks_init(struct device_node *np) 
	clk_data.clk_num = ARRAY_SIZE(clk);

	of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);



	mx5_clocks_common_init(0, 0, 0, 0);

	mx5_clocks_common_init();



	clk_register_clkdev(clk[IMX5_CLK_HSI2C_GATE], NULL, "imx21-i2c.2");

	clk_register_clkdev(clk[IMX5_CLK_MX51_MIPI], "mipi_hsp", NULL);
@@ -542,7 +540,7 @@ static void __init mx53_clocks_init(struct device_node *np) 
	clk_data.clk_num = ARRAY_SIZE(clk);

	of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);



	mx5_clocks_common_init(0, 0, 0, 0);

	mx5_clocks_common_init();



	clk_register_clkdev(clk[IMX5_CLK_I2C3_GATE], NULL, "imx21-i2c.2");

	clk_register_clkdev(clk[IMX5_CLK_FEC_GATE], NULL, "imx25-fec.0");