ARM: integrator: convert to common clock

This converts the Integrator platform to use common clock
and the ICST driver. Since from this point not all ARM
reference platforms use the clock, we define
CONFIG_PLAT_VERSATILE_CLOCK and select it for all platforms
except the Integrator.

Open issue: I could not use the .init_early() field of the
machine descriptor to initialize the clocks, but had to
move them to .init_irq(), so presumably .init_early() is
so early that common clock is not up, and .init_machine()
is too late since it's needed for the clockevent/clocksource
initialization. Any suggestions on how to solve this is
very welcome.

Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[mturquette@linaro.org: use 'select' instead of versatile Kconfig]
Signed-off-by: Mike Turquette <mturquette@linaro.org>

1 files changed, 0 insertions, 45 deletions

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 2a20bba246fb..ebf680bebdf2 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -21,7 +21,6 @@
 #include <linux/amba/bus.h>
 #include <linux/amba/serial.h>
 #include <linux/io.h>
-#include <linux/clkdev.h>
 
 #include <mach/hardware.h>
 #include <mach/platform.h>
@@ -61,50 +60,6 @@ static struct amba_device *amba_devs[] __initdata = {
         &kmi1_device,
 };
 
-/*
- * These are fixed clocks.
- */
-static struct clk clk24mhz = {
-        .rate   = 24000000,
-};
-
-static struct clk uartclk = {
-        .rate   = 14745600,
-};
-
-static struct clk dummy_apb_pclk;
-
-static struct clk_lookup lookups[] = {
-        {       /* Bus clock */
-                .con_id         = "apb_pclk",
-                .clk            = &dummy_apb_pclk,
-        }, {
-                /* Integrator/AP timer frequency */
-                .dev_id         = "ap_timer",
-                .clk            = &clk24mhz,
-        }, {    /* UART0 */
-                .dev_id         = "uart0",
-                .clk            = &uartclk,
-        }, {    /* UART1 */
-                .dev_id         = "uart1",
-                .clk            = &uartclk,
-        }, {    /* KMI0 */
-                .dev_id         = "kmi0",
-                .clk            = &clk24mhz,
-        }, {    /* KMI1 */
-                .dev_id         = "kmi1",
-                .clk            = &clk24mhz,
-        }, {    /* MMCI - IntegratorCP */
-                .dev_id         = "mmci",
-                .clk            = &uartclk,
-        }
-};
-
-void __init integrator_init_early(void)
-{
-        clkdev_add_table(lookups, ARRAY_SIZE(lookups));
-}
-
 static int __init integrator_init(void)
 {
         int i;