| Message ID | E1QJhSC-0000z6-H6@rmk-PC.arm.linux.org.uk |
|---|---|
| State | New |
| Headers | show |
On Tue, May 10, 2011 at 08:34:00AM +0100, Russell King - ARM Linux wrote: > Convert the MXS timrotv2 32-bit down counting clocksource to the > generic clocksource infrastructure. > > Cc: Sascha Hauer <kernel@pengutronix.de> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > arch/arm/Kconfig | 1 + > arch/arm/mach-mxs/timer.c | 20 +++++++------------- > 2 files changed, 8 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index cbc27fb..43f003a 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -376,6 +376,7 @@ config ARCH_MXS > select GENERIC_CLOCKEVENTS > select ARCH_REQUIRE_GPIOLIB > select CLKDEV_LOOKUP > + select CLKSRC_MMIO > help > Support for Freescale MXS-based family of processors > > diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c > index 13647f3..27bebf2 100644 > --- a/arch/arm/mach-mxs/timer.c > +++ b/arch/arm/mach-mxs/timer.c > @@ -101,11 +101,6 @@ static cycle_t timrotv1_get_cycles(struct clocksource *cs) > & 0xffff0000) >> 16); > } > > -static cycle_t timrotv2_get_cycles(struct clocksource *cs) > -{ > - return ~__raw_readl(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); > -} > - > static int timrotv1_set_next_event(unsigned long evt, > struct clock_event_device *dev) > { > @@ -230,8 +225,8 @@ static int __init mxs_clockevent_init(struct clk *timer_clk) > static struct clocksource clocksource_mxs = { > .name = "mxs_timer", > .rating = 200, > - .read = timrotv2_get_cycles, > - .mask = CLOCKSOURCE_MASK(32), > + .read = timrotv1_get_cycles, > + .mask = CLOCKSOURCE_MASK(16), > .flags = CLOCK_SOURCE_IS_CONTINUOUS, > }; > > @@ -239,12 +234,11 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) > { > unsigned int c = clk_get_rate(timer_clk); > > - if (timrot_is_v1()) { > - clocksource_mxs.read = timrotv1_get_cycles; > - clocksource_mxs.mask = CLOCKSOURCE_MASK(16); > - } > - > - clocksource_register_hz(&clocksource_mxs, c); > + if (timrot_is_v1()) > + clocksource_register_hz(&clocksource_mxs, c); > + else > + clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)), ^ Mismatched parenthesis > + "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); > > return 0; > }
On Mon, May 16, 2011 at 10:31:25PM +0800, Shawn Guo wrote: > On Tue, May 10, 2011 at 08:34:00AM +0100, Russell King - ARM Linux wrote: > > Convert the MXS timrotv2 32-bit down counting clocksource to the > > generic clocksource infrastructure. > > > > Cc: Sascha Hauer <kernel@pengutronix.de> > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > > --- > > arch/arm/Kconfig | 1 + > > arch/arm/mach-mxs/timer.c | 20 +++++++------------- > > 2 files changed, 8 insertions(+), 13 deletions(-) > > > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > > index cbc27fb..43f003a 100644 > > --- a/arch/arm/Kconfig > > +++ b/arch/arm/Kconfig > > @@ -376,6 +376,7 @@ config ARCH_MXS > > select GENERIC_CLOCKEVENTS > > select ARCH_REQUIRE_GPIOLIB > > select CLKDEV_LOOKUP > > + select CLKSRC_MMIO > > help > > Support for Freescale MXS-based family of processors > > > > diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c > > index 13647f3..27bebf2 100644 > > --- a/arch/arm/mach-mxs/timer.c > > +++ b/arch/arm/mach-mxs/timer.c > > @@ -101,11 +101,6 @@ static cycle_t timrotv1_get_cycles(struct clocksource *cs) > > & 0xffff0000) >> 16); > > } > > > > -static cycle_t timrotv2_get_cycles(struct clocksource *cs) > > -{ > > - return ~__raw_readl(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); > > -} > > - > > static int timrotv1_set_next_event(unsigned long evt, > > struct clock_event_device *dev) > > { > > @@ -230,8 +225,8 @@ static int __init mxs_clockevent_init(struct clk *timer_clk) > > static struct clocksource clocksource_mxs = { > > .name = "mxs_timer", > > .rating = 200, > > - .read = timrotv2_get_cycles, > > - .mask = CLOCKSOURCE_MASK(32), > > + .read = timrotv1_get_cycles, > > + .mask = CLOCKSOURCE_MASK(16), > > .flags = CLOCK_SOURCE_IS_CONTINUOUS, > > }; > > > > @@ -239,12 +234,11 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) > > { > > unsigned int c = clk_get_rate(timer_clk); > > > > - if (timrot_is_v1()) { > > - clocksource_mxs.read = timrotv1_get_cycles; > > - clocksource_mxs.mask = CLOCKSOURCE_MASK(16); > > - } > > - > > - clocksource_register_hz(&clocksource_mxs, c); > > + if (timrot_is_v1()) > > + clocksource_register_hz(&clocksource_mxs, c); > > + else > > + clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)), > ^ > Mismatched parenthesis > Other than that, Acked-by: Shawn Guo <shawn.guo@freescale.com> Tested on both i.MX23 and i.MX28. > > + "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); > > > > return 0; > > } >
On Mon, May 16, 2011 at 11:16:10PM +0800, Shawn Guo wrote: > > > + clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)), > > ^ > > Mismatched parenthesis Fixed. > Other than that, > > Acked-by: Shawn Guo <shawn.guo@freescale.com> > > Tested on both i.MX23 and i.MX28. Thanks.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cbc27fb..43f003a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -376,6 +376,7 @@ config ARCH_MXS select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP + select CLKSRC_MMIO help Support for Freescale MXS-based family of processors diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c index 13647f3..27bebf2 100644 --- a/arch/arm/mach-mxs/timer.c +++ b/arch/arm/mach-mxs/timer.c @@ -101,11 +101,6 @@ static cycle_t timrotv1_get_cycles(struct clocksource *cs) & 0xffff0000) >> 16); } -static cycle_t timrotv2_get_cycles(struct clocksource *cs) -{ - return ~__raw_readl(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); -} - static int timrotv1_set_next_event(unsigned long evt, struct clock_event_device *dev) { @@ -230,8 +225,8 @@ static int __init mxs_clockevent_init(struct clk *timer_clk) static struct clocksource clocksource_mxs = { .name = "mxs_timer", .rating = 200, - .read = timrotv2_get_cycles, - .mask = CLOCKSOURCE_MASK(32), + .read = timrotv1_get_cycles, + .mask = CLOCKSOURCE_MASK(16), .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -239,12 +234,11 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) { unsigned int c = clk_get_rate(timer_clk); - if (timrot_is_v1()) { - clocksource_mxs.read = timrotv1_get_cycles; - clocksource_mxs.mask = CLOCKSOURCE_MASK(16); - } - - clocksource_register_hz(&clocksource_mxs, c); + if (timrot_is_v1()) + clocksource_register_hz(&clocksource_mxs, c); + else + clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)), + "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); return 0; }
Convert the MXS timrotv2 32-bit down counting clocksource to the generic clocksource infrastructure. Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/Kconfig | 1 + arch/arm/mach-mxs/timer.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 13 deletions(-)