1 files changed, 10 insertions, 110 deletions

diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 89f4f993cd03..c6b3b2bb50e7 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -8,35 +8,24 @@
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/pci.h>
 #include <linux/clk-provider.h>
 #include <linux/clk/mvebu.h>
-#include <linux/ata_platform.h>
-#include <linux/gpio.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-#include <asm/timex.h>
+#include <linux/platform_data/dma-mv_xor.h>
+#include <linux/platform_data/usb-ehci-orion.h>
+#include <linux/platform_device.h>
 #include <asm/hardware/cache-tauros2.h>
+#include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <asm/mach/pci.h>
-#include <mach/dove.h>
-#include <mach/pm.h>
 #include <mach/bridge-regs.h>
-#include <asm/mach/arch.h>
-#include <linux/irq.h>
-#include <plat/time.h>
-#include <linux/platform_data/usb-ehci-orion.h>
-#include <linux/platform_data/dma-mv_xor.h>
-#include <plat/irq.h>
+#include <mach/pm.h>
 #include <plat/common.h>
-#include <plat/addr-map.h>
+#include <plat/irq.h>
+#include <plat/time.h>
 #include "common.h"
 
 /*****************************************************************************
@@ -242,17 +231,13 @@ static int __init dove_find_tclk(void)
         return 166666667;
 }
 
-static void __init dove_timer_init(void)
+void __init dove_timer_init(void)
 {
         dove_tclk = dove_find_tclk();
         orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
                         IRQ_DOVE_BRIDGE, dove_tclk);
 }
 
-struct sys_timer dove_timer = {
-        .init = dove_timer_init,
-};
-
 /*****************************************************************************
  * Cryptographic Engines and Security Accelerator (CESA)
  ****************************************************************************/
@@ -375,88 +360,3 @@ void dove_restart(char mode, const char *cmd)
         while (1)
                 ;
 }
-
-#if defined(CONFIG_MACH_DOVE_DT)
-/*
- * There are still devices that doesn't even know about DT,
- * get clock gates here and add a clock lookup.
- */
-static void __init dove_legacy_clk_init(void)
-{
-        struct device_node *np = of_find_compatible_node(NULL, NULL,
-                                         "marvell,dove-gating-clock");
-        struct of_phandle_args clkspec;
-
-        clkspec.np = np;
-        clkspec.args_count = 1;
-
-        clkspec.args[0] = CLOCK_GATING_BIT_USB0;
-        orion_clkdev_add(NULL, "orion-ehci.0",
-                         of_clk_get_from_provider(&clkspec));
-
-        clkspec.args[0] = CLOCK_GATING_BIT_USB1;
-        orion_clkdev_add(NULL, "orion-ehci.1",
-                         of_clk_get_from_provider(&clkspec));
-
-        clkspec.args[0] = CLOCK_GATING_BIT_GBE;
-        orion_clkdev_add(NULL, "mv643xx_eth_port.0",
-                         of_clk_get_from_provider(&clkspec));
-
-        clkspec.args[0] = CLOCK_GATING_BIT_PCIE0;
-        orion_clkdev_add("0", "pcie",
-                         of_clk_get_from_provider(&clkspec));
-
-        clkspec.args[0] = CLOCK_GATING_BIT_PCIE1;
-        orion_clkdev_add("1", "pcie",
-                         of_clk_get_from_provider(&clkspec));
-}
-
-static void __init dove_of_clk_init(void)
-{
-        mvebu_clocks_init();
-        dove_legacy_clk_init();
-}
-
-static struct mv643xx_eth_platform_data dove_dt_ge00_data = {
-        .phy_addr = MV643XX_ETH_PHY_ADDR_DEFAULT,
-};
-
-static void __init dove_dt_init(void)
-{
-        pr_info("Dove 88AP510 SoC, TCLK = %d MHz.\n",
-                (dove_tclk + 499999) / 1000000);
-
-#ifdef CONFIG_CACHE_TAUROS2
-        tauros2_init(0);
-#endif
-        dove_setup_cpu_mbus();
-
-        /* Setup root of clk tree */
-        dove_of_clk_init();
-
-        /* Internal devices not ported to DT yet */
-        dove_rtc_init();
-
-        dove_ge00_init(&dove_dt_ge00_data);
-        dove_ehci0_init();
-        dove_ehci1_init();
-        dove_pcie_init(1, 1);
-
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
-static const char * const dove_dt_board_compat[] = {
-        "marvell,dove",
-        NULL
-};
-
-DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)")
-        .map_io         = dove_map_io,
-        .init_early     = dove_init_early,
-        .init_irq       = orion_dt_init_irq,
-        .timer          = &dove_timer,
-        .init_machine   = dove_dt_init,
-        .restart        = dove_restart,
-        .dt_compat      = dove_dt_board_compat,
-MACHINE_END
-#endif