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

Commit 6c529c49 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: use dynamic mapping for timer 



Pass physical address of timer block to mxc_timer_init() call, which in
turn does dynamic mapping within the function.  Thus, we can avoid using
static mapping in clock drivers.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 0ed4668a

arch/arm/mach-imx/clk-imx1.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int __init mx1_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[IMX1_CLK_DUMMY], "ipg", "imx1-fb.0");

	clk_register_clkdev(clk[IMX1_CLK_DUMMY], "ahb", "imx1-fb.0");



	mxc_timer_init(MX1_IO_ADDRESS(MX1_TIM1_BASE_ADDR), MX1_TIM1_INT);

	mxc_timer_init(MX1_TIM1_BASE_ADDR, MX1_TIM1_INT);



	return 0;

}

arch/arm/mach-imx/clk-imx21.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) 
	clk_register_clkdev(clk[IMX21_CLK_I2C_GATE], NULL, "imx21-i2c.0");

	clk_register_clkdev(clk[IMX21_CLK_OWIRE_GATE], NULL, "mxc_w1.0");



	mxc_timer_init(MX21_IO_ADDRESS(MX21_GPT1_BASE_ADDR), MX21_INT_GPT1);

	mxc_timer_init(MX21_GPT1_BASE_ADDR, MX21_INT_GPT1);



	return 0;

}

arch/arm/mach-imx/clk-imx27.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ int __init mx27_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[IMX27_CLK_EMMA_AHB_GATE], "ahb", "m2m-emmaprp.0");

	clk_register_clkdev(clk[IMX27_CLK_EMMA_IPG_GATE], "ipg", "m2m-emmaprp.0");



	mxc_timer_init(MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR), MX27_INT_GPT1);

	mxc_timer_init(MX27_GPT1_BASE_ADDR, MX27_INT_GPT1);



	return 0;

}

arch/arm/mach-imx/clk-imx31.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ int __init mx31_clocks_init(unsigned long fref) 
	mx31_revision();

	clk_disable_unprepare(clk[iim_gate]);



	mxc_timer_init(MX31_IO_ADDRESS(MX31_GPT1_BASE_ADDR), MX31_INT_GPT);

	mxc_timer_init(MX31_GPT1_BASE_ADDR, MX31_INT_GPT);



	return 0;

}

arch/arm/mach-imx/clk-imx35.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ int __init mx35_clocks_init(void) 
#ifdef CONFIG_MXC_USE_EPIT

	epit_timer_init(MX35_IO_ADDRESS(MX35_EPIT1_BASE_ADDR), MX35_INT_EPIT1);

#else

	mxc_timer_init(MX35_IO_ADDRESS(MX35_GPT1_BASE_ADDR), MX35_INT_GPT);

	mxc_timer_init(MX35_GPT1_BASE_ADDR, MX35_INT_GPT);

#endif



	return 0;