Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[cascardo/linux.git] / arch / mips / pistachio / init.c

diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
index ab79828..1c91cad 100644 (file)
--- a/arch/mips/pistachio/init.c
+++ b/arch/mips/pistachio/init.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/of_address.h>
 #include <linux/of_fdt.h>
-#include <linux/of_platform.h>
 
 #include <asm/cacheflush.h>
 #include <asm/dma-coherence.h>
@@ -60,29 +59,6 @@ const char *get_system_type(void)
        return sys_type;
 }
 
-static void __init plat_setup_iocoherency(void)
-{
-       /*
-        * Kernel has been configured with software coherency
-        * but we might choose to turn it off and use hardware
-        * coherency instead.
-        */
-       if (mips_cm_numiocu() != 0) {
-               /* Nothing special needs to be done to enable coherency */
-               pr_info("CMP IOCU detected\n");
-               hw_coherentio = 1;
-               if (coherentio == 0)
-                       pr_info("Hardware DMA cache coherency disabled\n");
-               else
-                       pr_info("Hardware DMA cache coherency enabled\n");
-       } else {
-               if (coherentio == 1)
-                       pr_info("Hardware DMA cache coherency unsupported, but enabled from command line!\n");
-               else
-                       pr_info("Software DMA cache coherency enabled\n");
-       }
-}
-
 void __init *plat_get_fdt(void)
 {
        if (fw_arg0 != -2)
@@ -93,8 +69,6 @@ void __init *plat_get_fdt(void)
 void __init plat_mem_setup(void)
 {
        __dt_setup_arch(plat_get_fdt());
-
-       plat_setup_iocoherency();
 }
 
 #define DEFAULT_CPC_BASE_ADDR  0x1bde0000
@@ -159,15 +133,3 @@ void __init device_tree_init(void)
 
        unflatten_and_copy_device_tree();
 }
-
-static int __init plat_of_setup(void)
-{
-       if (!of_have_populated_dt())
-               panic("Device tree not present");
-
-       if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL))
-               panic("Failed to populate DT");
-
-       return 0;
-}
-arch_initcall(plat_of_setup);