ARM: OMAP4: Enhance support for DPLLs with 4X multiplier

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / io.c

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 007dc4d85d54815b8bf5366cae2f6ed8e31aa4fd..2c3fdd65387b56c542d6d97cbc093fcf69a51b9a 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -25,9 +25,7 @@
 #include <asm/tlb.h>
 #include <asm/mach/map.h>
 
-#include <plat-omap/dma-omap.h>
-
-#include "../plat-omap/sram.h"
+#include <linux/omap-dma.h>
 
 #include "omap_hwmod.h"
 #include "soc.h"
@@ -44,6 +42,7 @@
 #include "sdrc.h"
 #include "control.h"
 #include "serial.h"
+#include "sram.h"
 #include "cm2xxx.h"
 #include "cm3xxx.h"
 #include "prm.h"
@@ -365,11 +364,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)
        return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);
 }
 
-static void __init omap_common_init_early(void)
-{
-       omap_init_consistent_dma_size();
-}
-
 static void __init omap_hwmod_init_postsetup(void)
 {
        u8 postsetup_state;
@@ -398,7 +392,6 @@ void __init omap2420_init_early(void)
        omap2xxx_check_revision();
        omap2xxx_prm_init();
        omap2xxx_cm_init();
-       omap_common_init_early();
        omap2xxx_voltagedomains_init();
        omap242x_powerdomains_init();
        omap242x_clockdomains_init();
@@ -429,7 +422,6 @@ void __init omap2430_init_early(void)
        omap2xxx_check_revision();
        omap2xxx_prm_init();
        omap2xxx_cm_init();
-       omap_common_init_early();
        omap2xxx_voltagedomains_init();
        omap243x_powerdomains_init();
        omap243x_clockdomains_init();
@@ -465,7 +457,6 @@ void __init omap3_init_early(void)
        omap3xxx_check_features();
        omap3xxx_prm_init();
        omap3xxx_cm_init();
-       omap_common_init_early();
        omap3xxx_voltagedomains_init();
        omap3xxx_powerdomains_init();
        omap3xxx_clockdomains_init();
@@ -504,7 +495,6 @@ void __init ti81xx_init_early(void)
        omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE), NULL);
        omap3xxx_check_revision();
        ti81xx_check_features();
-       omap_common_init_early();
        omap3xxx_voltagedomains_init();
        omap3xxx_powerdomains_init();
        omap3xxx_clockdomains_init();
@@ -573,7 +563,6 @@ void __init am33xx_init_early(void)
        omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE), NULL);
        omap3xxx_check_revision();
        ti81xx_check_features();
-       omap_common_init_early();
        am33xx_voltagedomains_init();
        am33xx_powerdomains_init();
        am33xx_clockdomains_init();
@@ -599,7 +588,6 @@ void __init omap4430_init_early(void)
        omap4xxx_check_revision();
        omap4xxx_check_features();
        omap44xx_prm_init();
-       omap_common_init_early();
        omap44xx_voltagedomains_init();
        omap44xx_powerdomains_init();
        omap44xx_clockdomains_init();
@@ -631,7 +619,6 @@ void __init omap5_init_early(void)
        omap_prm_base_init();
        omap_cm_base_init();
        omap5xxx_check_revision();
-       omap_common_init_early();
 }
 #endif