1 files changed, 1 insertions, 46 deletions

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index be7a7868d210..6cce6f229799 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -21,6 +21,7 @@
 #include <linux/spi/spi.h>
 
 #include <mach/hardware.h>
+#include <mach/omap4-common.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -30,8 +31,6 @@
 #include <plat/control.h>
 #include <plat/timer-gp.h>
 #include <plat/usb.h>
-#include <asm/hardware/gic.h>
-#include <asm/hardware/cache-l2x0.h>
 
 #define ETH_KS8851_IRQ                  34
 #define ETH_KS8851_POWER_ON             48
@@ -119,50 +118,6 @@ static struct omap_board_config_kernel sdp4430_config[] __initdata = {
         { OMAP_TAG_LCD,         &sdp4430_lcd_config },
 };
 
-#ifdef CONFIG_CACHE_L2X0
-static int __init omap_l2_cache_init(void)
-{
-        extern void omap_smc1(u32 fn, u32 arg);
-        void __iomem *l2cache_base;
-
-        /* To avoid code running on other OMAPs in
-         * multi-omap builds
-         */
-        if (!cpu_is_omap44xx())
-                return -ENODEV;
-
-        /* Static mapping, never released */
-        l2cache_base = ioremap(OMAP44XX_L2CACHE_BASE, SZ_4K);
-        BUG_ON(!l2cache_base);
-
-        /* Enable PL310 L2 Cache controller */
-        omap_smc1(0x102, 0x1);
-
-        /* 32KB way size, 16-way associativity,
-        * parity disabled
-        */
-        l2x0_init(l2cache_base, 0x0e050000, 0xc0000fff);
-
-        return 0;
-}
-early_initcall(omap_l2_cache_init);
-#endif
-
-static void __init gic_init_irq(void)
-{
-        void __iomem *base;
-
-        /* Static mapping, never released */
-        base = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K);
-        BUG_ON(!base);
-        gic_dist_init(0, base, 29);
-
-        /* Static mapping, never released */
-        gic_cpu_base_addr = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_512);
-        BUG_ON(!gic_cpu_base_addr);
-        gic_cpu_init(0, gic_cpu_base_addr);
-}
-
 static void __init omap_4430sdp_init_irq(void)
 {
         omap_board_config = sdp4430_config;