Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / mips / lantiq / prom.c

diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index 7447d32..39ab3e7 100644 (file)
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -36,6 +36,11 @@ const char *get_system_type(void)
        return soc_info.sys_type;
 }
 
+int ltq_soc_type(void)
+{
+       return soc_info.type;
+}
+
 void prom_free_prom_memory(void)
 {
 }
@@ -72,6 +77,8 @@ void __init plat_mem_setup(void)
         * parsed resulting in our memory appearing
         */
        __dt_setup_arch(__dtb_start);
+
+       strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
 }
 
 void __init device_tree_init(void)
@@ -97,16 +104,7 @@ void __init prom_init(void)
 
 int __init plat_of_setup(void)
 {
-       static struct of_device_id of_ids[3];
-
-       if (!of_have_populated_dt())
-               panic("device tree not present");
-
-       strlcpy(of_ids[0].compatible, soc_info.compatible,
-               sizeof(of_ids[0].compatible));
-       strncpy(of_ids[1].compatible, "simple-bus",
-               sizeof(of_ids[1].compatible));
-       return of_platform_populate(NULL, of_ids, NULL, NULL);
+       return __dt_register_buses(soc_info.compatible, "simple-bus");
 }
 
 arch_initcall(plat_of_setup);