ARM: vexpress: Remove non-DT code

Now, with the CLCD DT support available, there is no
more reason to keep the non-DT support for V2P-CA9.

Removed, together with "some" supporting code. It was
necessary to make PLAT_VERSATILE_SCHED_CLOCK optional
and selected by the machines still interested in it.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

3 files changed, 0 insertions, 94 deletions

diff --git a/drivers/clk/versatile/Makefile b/drivers/clk/versatile/Makefile
index 162e519cb0f9..8ff03744fe98 100644
--- a/drivers/clk/versatile/Makefile
+++ b/drivers/clk/versatile/Makefile
@@ -2,6 +2,5 @@
 obj-$(CONFIG_ICST)              += clk-icst.o clk-versatile.o
 obj-$(CONFIG_INTEGRATOR_IMPD1)  += clk-impd1.o
 obj-$(CONFIG_ARCH_REALVIEW)     += clk-realview.o
-obj-$(CONFIG_ARCH_VEXPRESS)     += clk-vexpress.o
 obj-$(CONFIG_CLK_SP810)         += clk-sp810.o
 obj-$(CONFIG_CLK_VEXPRESS_OSC)  += clk-vexpress-osc.o
diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c
index 529a59c0fbfa..765f1e0eeeb2 100644
--- a/drivers/clk/versatile/clk-vexpress-osc.c
+++ b/drivers/clk/versatile/clk-vexpress-osc.c
@@ -70,7 +70,6 @@ static struct clk_ops vexpress_osc_ops = {
 
 static int vexpress_osc_probe(struct platform_device *pdev)
 {
-        struct clk_lookup *cl = pdev->dev.platform_data; /* Non-DT lookup */
         struct clk_init_data init;
         struct vexpress_osc *osc;
         struct clk *clk;
@@ -106,12 +105,6 @@ static int vexpress_osc_probe(struct platform_device *pdev)
 
         of_clk_add_provider(pdev->dev.of_node, of_clk_src_simple_get, clk);
 
-        /* Only happens for non-DT cases */
-        if (cl) {
-                cl->clk = clk;
-                clkdev_add(cl);
-        }
-
         dev_dbg(&pdev->dev, "Registered clock '%s'\n", init.name);
 
         return 0;
diff --git a/drivers/clk/versatile/clk-vexpress.c b/drivers/clk/versatile/clk-vexpress.c
deleted file mode 100644
index 2d5e1b4820e0..000000000000
--- a/drivers/clk/versatile/clk-vexpress.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Copyright (C) 2012 ARM Limited
- */
-
-#include <linux/amba/sp810.h>
-#include <linux/clkdev.h>
-#include <linux/clk-provider.h>
-#include <linux/err.h>
-#include <linux/vexpress.h>
-
-static struct clk *vexpress_sp810_timerclken[4];
-static DEFINE_SPINLOCK(vexpress_sp810_lock);
-
-static void __init vexpress_sp810_init(void __iomem *base)
-{
-        int i;
-
-        if (WARN_ON(!base))
-                return;
-
-        for (i = 0; i < ARRAY_SIZE(vexpress_sp810_timerclken); i++) {
-                char name[12];
-                const char *parents[] = {
-                        "v2m:refclk32khz", /* REFCLK */
-                        "v2m:refclk1mhz" /* TIMCLK */
-                };
-
-                snprintf(name, ARRAY_SIZE(name), "timerclken%d", i);
-
-                vexpress_sp810_timerclken[i] = clk_register_mux(NULL, name,
-                                parents, 2, CLK_SET_RATE_NO_REPARENT,
-                                base + SCCTRL, SCCTRL_TIMERENnSEL_SHIFT(i), 1,
-                                0, &vexpress_sp810_lock);
-
-                if (WARN_ON(IS_ERR(vexpress_sp810_timerclken[i])))
-                        break;
-        }
-}
-
-
-static const char * const vexpress_clk_24mhz_periphs[] __initconst = {
-        "mb:uart0", "mb:uart1", "mb:uart2", "mb:uart3",
-        "mb:mmci", "mb:kmi0", "mb:kmi1"
-};
-
-void __init vexpress_clk_init(void __iomem *sp810_base)
-{
-        struct clk *clk;
-        int i;
-
-        clk = clk_register_fixed_rate(NULL, "dummy_apb_pclk", NULL,
-                        CLK_IS_ROOT, 0);
-        WARN_ON(clk_register_clkdev(clk, "apb_pclk", NULL));
-
-        clk = clk_register_fixed_rate(NULL, "v2m:clk_24mhz", NULL,
-                        CLK_IS_ROOT, 24000000);
-        for (i = 0; i < ARRAY_SIZE(vexpress_clk_24mhz_periphs); i++)
-                WARN_ON(clk_register_clkdev(clk, NULL,
-                                vexpress_clk_24mhz_periphs[i]));
-
-        clk = clk_register_fixed_rate(NULL, "v2m:refclk32khz", NULL,
-                        CLK_IS_ROOT, 32768);
-        WARN_ON(clk_register_clkdev(clk, NULL, "v2m:wdt"));
-
-        clk = clk_register_fixed_rate(NULL, "v2m:refclk1mhz", NULL,
-                        CLK_IS_ROOT, 1000000);
-
-        vexpress_sp810_init(sp810_base);
-
-        for (i = 0; i < ARRAY_SIZE(vexpress_sp810_timerclken); i++)
-                WARN_ON(clk_set_parent(vexpress_sp810_timerclken[i], clk));
-
-        WARN_ON(clk_register_clkdev(vexpress_sp810_timerclken[0],
-                                "v2m-timer0", "sp804"));
-        WARN_ON(clk_register_clkdev(vexpress_sp810_timerclken[1],
-                                "v2m-timer1", "sp804"));
-}