2 files changed, 6 insertions, 18 deletions

diff --git a/arch/arm/mach-u300/clock.c b/arch/arm/mach-u300/clock.c
index fabcc49abe80..5535dd0a78c9 100644
--- a/arch/arm/mach-u300/clock.c
+++ b/arch/arm/mach-u300/clock.c
@@ -263,7 +263,7 @@ static void disable_i2s0_vcxo(void)
         val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
         val &= ~U300_SYSCON_CCR_I2S0_USE_VCXO;
         writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
-        /* Deactivate VCXO if noone else is using VCXO */
+        /* Deactivate VCXO if no one else is using VCXO */
         if (!(val & U300_SYSCON_CCR_I2S1_USE_VCXO))
                 val &= ~U300_SYSCON_CCR_TURN_VCXO_ON;
         writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
@@ -283,7 +283,7 @@ static void disable_i2s1_vcxo(void)
         val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
         val &= ~U300_SYSCON_CCR_I2S1_USE_VCXO;
         writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
-        /* Deactivate VCXO if noone else is using VCXO */
+        /* Deactivate VCXO if no one else is using VCXO */
         if (!(val & U300_SYSCON_CCR_I2S0_USE_VCXO))
                 val &= ~U300_SYSCON_CCR_TURN_VCXO_ON;
         writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
@@ -649,7 +649,7 @@ static unsigned long clk_round_rate_cpuclk(struct clk *clk, unsigned long rate)
  */
 long clk_round_rate(struct clk *clk, unsigned long rate)
 {
-        /* TODO: get apropriate switches for EMIFCLK, AHBCLK and MCLK */
+        /* TODO: get appropriate switches for EMIFCLK, AHBCLK and MCLK */
         /* Else default to fixed value */
 
         if (clk->round_rate) {
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c
index 3ec58bd2d6e4..891cf44591e0 100644
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@ -333,20 +333,6 @@ static struct irqaction u300_timer_irq = {
         .handler        = u300_timer_interrupt,
 };
 
-/* Use general purpose timer 2 as clock source */
-static cycle_t u300_get_cycles(struct clocksource *cs)
-{
-        return (cycles_t) readl(U300_TIMER_APP_VBASE + U300_TIMER_APP_GPT2CC);
-}
-
-static struct clocksource clocksource_u300_1mhz = {
-        .name           = "GPT2",
-        .rating         = 300, /* Reasonably fast and accurate clock source */
-        .read           = u300_get_cycles,
-        .mask           = CLOCKSOURCE_MASK(32), /* 32 bits */
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 /*
  * Override the global weak sched_clock symbol with this
  * local implementation which uses the clocksource to get some
@@ -422,7 +408,9 @@ static void __init u300_timer_init(void)
         writel(U300_TIMER_APP_EGPT2_TIMER_ENABLE,
                 U300_TIMER_APP_VBASE + U300_TIMER_APP_EGPT2);
 
-        if (clocksource_register_hz(&clocksource_u300_1mhz, rate))
+        /* Use general purpose timer 2 as clock source */
+        if (clocksource_mmio_init(U300_TIMER_APP_VBASE + U300_TIMER_APP_GPT2CC,
+                        "GPT2", rate, 300, 32, clocksource_mmio_readl_up))
                 printk(KERN_ERR "timer: failed to initialize clock "
                        "source %s\n", clocksource_u300_1mhz.name);