Merge tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[karo-tx-linux.git] / arch / arm64 / kernel / setup.c

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 2981f1bdd07336c29f50c83a628fef43ce597db5..536dce22fe76d0c3b3c404a5a74aeb9d10a66e23 100644 (file)
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -39,9 +39,7 @@
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
 #include <linux/memblock.h>
-#include <linux/of_iommu.h>
 #include <linux/of_fdt.h>
-#include <linux/of_platform.h>
 #include <linux/efi.h>
 #include <linux/psci.h>
 
@@ -303,19 +301,6 @@ void __init setup_arch(char **cmdline_p)
        }
 }
 
-static int __init arm64_device_init(void)
-{
-       if (of_have_populated_dt()) {
-               of_iommu_init();
-               of_platform_populate(NULL, of_default_bus_match_table,
-                                    NULL, NULL);
-       } else if (acpi_disabled) {
-               pr_crit("Device tree not populated\n");
-       }
-       return 0;
-}
-arch_initcall_sync(arm64_device_init);
-
 static int __init topology_init(void)
 {
        int i;