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

Commit 2fb318ff authored by Torben Hohn's avatar Torben Hohn Committed by Shawn Guo
Browse files

ARM: mxs: use apbx bus clock to drive the timers on timrotv2 



timer resolution of ~32us is pretty low.
v2 has 32bits resolution, so we have quite some headroom, and
can use the 24MHz clock.
v1 has only 16bits, so we only increase v2.

So we just exchange the timrot clock in imx28.
On imx23 we have timrotv1 and everything stays the same.

Signed-off-by: default avatarTorben Hohn <torbenh@linutronix.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 77d168a9

arch/arm/mach-mxs/timer.c

+5 −4
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
#define BP_TIMROT_TIMCTRLn_SELECT	0

#define BV_TIMROTv1_TIMCTRLn_SELECT__32KHZ_XTAL		0x8

#define BV_TIMROTv2_TIMCTRLn_SELECT__32KHZ_XTAL		0xb

#define BV_TIMROTv2_TIMCTRLn_SELECT__TICK_ALWAYS	0xf



static struct clock_event_device mxs_clockevent_device;

static enum clock_event_mode mxs_clockevent_mode = CLOCK_EVT_MODE_UNUSED;
@@ -274,7 +275,7 @@ void __init mxs_timer_init(void) 
	/* one for clock_event */

	__raw_writel((timrot_is_v1() ?

			BV_TIMROTv1_TIMCTRLn_SELECT__32KHZ_XTAL :

			BV_TIMROTv2_TIMCTRLn_SELECT__32KHZ_XTAL) |

			BV_TIMROTv2_TIMCTRLn_SELECT__TICK_ALWAYS) |

			BM_TIMROT_TIMCTRLn_UPDATE |

			BM_TIMROT_TIMCTRLn_IRQ_EN,

			mxs_timrot_base + HW_TIMROT_TIMCTRLn(0));
@@ -282,7 +283,7 @@ void __init mxs_timer_init(void) 
	/* another for clocksource */

	__raw_writel((timrot_is_v1() ?

			BV_TIMROTv1_TIMCTRLn_SELECT__32KHZ_XTAL :

			BV_TIMROTv2_TIMCTRLn_SELECT__32KHZ_XTAL) |

			BV_TIMROTv2_TIMCTRLn_SELECT__TICK_ALWAYS) |

			BM_TIMROT_TIMCTRLn_RELOAD,

			mxs_timrot_base + HW_TIMROT_TIMCTRLn(1));

drivers/clk/mxs/clk-imx28.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ int __init mx28_clocks_init(void) 
		of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);

	}



	clk_register_clkdev(clks[clk32k], NULL, "timrot");

	clk_register_clkdev(clks[xbus], NULL, "timrot");

	clk_register_clkdev(clks[enet_out], NULL, "enet_out");



	for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)