microblaze: timer: Use CLKSRC_OF initialization

Simplify timer initialization and prepare the driver
for moving to drivers/clocksource folder.
Also remove system-timer property from binding because
the name is too generic.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 4fab52294d9874b5b07558682ec5160a470c1092..3f6659cbc969134e14f8a5500a8bc119368a2d7f 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -29,6 +29,7 @@ config MICROBLAZE
        select GENERIC_IDLE_POLL_SETUP
        select MODULES_USE_ELF_RELA
        select CLONE_BACKWARDS3
+       select CLKSRC_OF
 
 config SWAP
        def_bool n

diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 4259f8b0f1134a0bcb4bf4f328ad45c1b00bccef..0775e036c526532918be2d22babe6fa5df91e416 100644 (file)
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/clocksource.h>
 #include <linux/string.h>
 #include <linux/seq_file.h>
 #include <linux/cpu.h>
@@ -192,6 +193,11 @@ void __init machine_early_init(const char *cmdline, unsigned int ram,
        per_cpu(CURRENT_SAVE, 0) = (unsigned long)current;
 }
 
+void __init time_init(void)
+{
+       clocksource_of_init();
+}
+
 #ifdef CONFIG_DEBUG_FS
 struct dentry *of_debugfs_root;
 

diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index d00a60e62e05e985e97fd3f7ebec32b138474e0c..6cb7f3b1914a63205f493a92cda0d909be57306a 100644 (file)
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -238,24 +238,12 @@ static int __init microblaze_clocksource_init(void)
  */
 static int timer_initialized;
 
-void __init time_init(void)
+static void __init xilinx_timer_init(struct device_node *timer)
 {
        u32 irq;
        u32 timer_num = 1;
-       struct device_node *timer = NULL;
        const void *prop;
 
-       prop = of_get_property(of_chosen, "system-timer", NULL);
-       if (prop)
-               timer = of_find_node_by_phandle(be32_to_cpup(prop));
-       else
-               pr_info("No chosen timer found, using default\n");
-
-       if (!timer)
-               timer = of_find_compatible_node(NULL, NULL,
-                                               "xlnx,xps-timer-1.00.a");
-       BUG_ON(!timer);
-
        timer_baseaddr = be32_to_cpup(of_get_property(timer, "reg", NULL));
        timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE);
        irq = irq_of_parse_and_map(timer, 0);
@@ -297,3 +285,6 @@ unsigned long long notrace sched_clock(void)
        }
        return 0;
 }
+
+CLOCKSOURCE_OF_DECLARE(xilinx_timer, "xlnx,xps-timer-1.00.a",
+                      xilinx_timer_init);