1 files changed, 5 insertions, 35 deletions

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 87162e1b94a5..19f1652e94cf 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -15,13 +15,10 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/irqdomain.h>
-#include <linux/clk.h>
 
 #include <asm/mach/arch.h>
 
 #include "common.h"
-#include "common-board-devices.h"
-#include "dss-common.h"
 
 #if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
 #define intc_of_init    NULL
@@ -36,40 +33,9 @@ static struct of_device_id omap_dt_match_table[] __initdata = {
         { }
 };
 
-/*
- * Create alias for USB host PHY clock.
- * Remove this when clock phandle can be provided via DT
- */
-static void __init legacy_init_ehci_clk(char *clkname)
-{
-        int ret;
-
-        ret = clk_add_alias("main_clk", NULL, clkname, NULL);
-        if (ret) {
-                pr_err("%s:Failed to add main_clk alias to %s :%d\n",
-                                                __func__, clkname, ret);
-        }
-}
-
 static void __init omap_generic_init(void)
 {
-        omap_sdrc_init(NULL, NULL);
-
-        of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
-
-        /*
-         * HACK: call display setup code for selected boards to enable omapdss.
-         * This will be removed when omapdss supports DT.
-         */
-        if (of_machine_is_compatible("ti,omap4-panda")) {
-                omap4_panda_display_init_of();
-                legacy_init_ehci_clk("auxclk3_ck");
-
-        }
-        else if (of_machine_is_compatible("ti,omap4-sdp"))
-                omap_4430sdp_display_init_of();
-        else if (of_machine_is_compatible("ti,omap5-uevm"))
-                legacy_init_ehci_clk("auxclk1_ck");
+        pdata_quirks_init(omap_dt_match_table);
 }
 
 #ifdef CONFIG_SOC_OMAP2420
@@ -180,6 +146,7 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
         .init_irq       = omap_intc_of_init,
         .handle_irq     = omap3_intc_handle_irq,
         .init_machine   = omap_generic_init,
+        .init_late      = am33xx_init_late,
         .init_time      = omap3_gptimer_timer_init,
         .dt_compat      = am33xx_boards_compat,
         .restart        = am33xx_restart,
@@ -219,6 +186,7 @@ DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)")
         .init_early     = omap5_init_early,
         .init_irq       = omap_gic_of_init,
         .init_machine   = omap_generic_init,
+        .init_late      = omap5_init_late,
         .init_time      = omap5_realtime_timer_init,
         .dt_compat      = omap5_boards_compat,
         .restart        = omap44xx_restart,
@@ -234,6 +202,7 @@ static const char *am43_boards_compat[] __initdata = {
 DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
         .map_io         = am33xx_map_io,
         .init_early     = am43xx_init_early,
+        .init_late      = am43xx_init_late,
         .init_irq       = omap_gic_of_init,
         .init_machine   = omap_generic_init,
         .init_time      = omap3_sync32k_timer_init,
@@ -252,6 +221,7 @@ DT_MACHINE_START(DRA7XX_DT, "Generic DRA7XX (Flattened Device Tree)")
         .smp            = smp_ops(omap4_smp_ops),
         .map_io         = omap5_map_io,
         .init_early     = dra7xx_init_early,
+        .init_late      = dra7xx_init_late,
         .init_irq       = omap_gic_of_init,
         .init_machine   = omap_generic_init,
         .init_time      = omap5_realtime_timer_init,