OF: MIPS: lantiq: implement OF support

Activate USE_OF, add a sample DTS file and convert the core soc code to OF.

Signed-off-by: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3803/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 44 insertions, 13 deletions

diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index cd568921f191..413ed53a4ae1 100644
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -8,6 +8,7 @@
 
 #include <linux/export.h>
 #include <linux/clk.h>
+#include <linux/of_platform.h>
 #include <asm/bootinfo.h>
 #include <asm/time.h>
 
@@ -16,13 +17,15 @@
 #include "prom.h"
 #include "clk.h"
 
-static struct ltq_soc_info soc_info;
+/* access to the ebu needs to be locked between different drivers */
+DEFINE_SPINLOCK(ebu_lock);
+EXPORT_SYMBOL_GPL(ebu_lock);
 
-unsigned int ltq_get_cpu_ver(void)
-{
-        return soc_info.rev;
-}
-EXPORT_SYMBOL(ltq_get_cpu_ver);
+/*
+ * this struct is filled by the soc specific detection code and holds
+ * information about the specific soc type, revision and name
+ */
+static struct ltq_soc_info soc_info;
 
 unsigned int ltq_get_soc_type(void)
 {
@@ -57,16 +60,28 @@ static void __init prom_init_cmdline(void)
         }
 }
 
-void __init prom_init(void)
+void __init plat_mem_setup(void)
 {
-        struct clk *clk;
+        ioport_resource.start = IOPORT_RESOURCE_START;
+        ioport_resource.end = IOPORT_RESOURCE_END;
+        iomem_resource.start = IOMEM_RESOURCE_START;
+        iomem_resource.end = IOMEM_RESOURCE_END;
+
+        set_io_port_base((unsigned long) KSEG1);
+
+        /*
+         * Load the builtin devicetree. This causes the chosen node to be
+         * parsed resulting in our memory appearing
+         */
+        __dt_setup_arch(&__dtb_start);
+}
 
+void __init prom_init(void)
+{
+        /* call the soc specific detetcion code and get it to fill soc_info */
         ltq_soc_detect(&soc_info);
-        clk_init();
-        clk = clk_get(0, "cpu");
-        snprintf(soc_info.sys_type, LTQ_SYS_TYPE_LEN - 1, "%s rev1.%d",
-                soc_info.name, soc_info.rev);
-        clk_put(clk);
+        snprintf(soc_info.sys_type, LTQ_SYS_TYPE_LEN - 1, "%s rev %s",
+                soc_info.name, soc_info.rev_type);
         soc_info.sys_type[LTQ_SYS_TYPE_LEN - 1] = '\0';
         pr_info("SoC: %s\n", soc_info.sys_type);
         prom_init_cmdline();
@@ -76,3 +91,19 @@ void __init prom_init(void)
                 panic("failed to register_vsmp_smp_ops()");
 #endif
 }
+
+int __init plat_of_setup(void)
+{
+        static struct of_device_id of_ids[3];
+
+        if (!of_have_populated_dt())
+                panic("device tree not present");
+
+        strncpy(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_bus_probe(NULL, of_ids, NULL);
+}
+
+arch_initcall(plat_of_setup);