Merge tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next

Pull nios2 update from Ley Foon Tan:
 "Check number of timer instances"

* tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next:
  nios2: check number of timer instances

diff --combined arch/nios2/kernel/time.c
index be186a7,bea8839..9e3cc8a
--- 1/arch/nios2/kernel/time.c
--- 2/arch/nios2/kernel/time.c
+++ b/arch/nios2/kernel/time.c
@@@ -8,7 -8,6 +8,7 @@@
   * for more details.
   */
  
 +#include <linux/export.h>
  #include <linux/interrupt.h>
  #include <linux/clockchips.h>
  #include <linux/clocksource.h>
@@@ -19,7 -18,9 +19,9 @@@
  #include <linux/io.h>
  #include <linux/slab.h>
  
- #define ALTERA_TIMER_STATUS_REG               0
+ #define ALTR_TIMER_COMPATIBLE         "altr,timer-1.0"
+ 
+ #define ALTERA_TIMER_STATUS_REG       0
  #define ALTERA_TIMER_CONTROL_REG      4
  #define ALTERA_TIMER_PERIODL_REG      8
  #define ALTERA_TIMER_PERIODH_REG      12
@@@ -107,7 -108,6 +109,7 @@@ cycles_t get_cycles(void
  {
        return nios2_timer_read(&nios2_cs.cs);
  }
 +EXPORT_SYMBOL(get_cycles);
  
  static void nios2_timer_start(struct nios2_timer *timer)
  {
@@@ -304,7 -304,16 +306,16 @@@ void read_persistent_clock(struct times
  
  void __init time_init(void)
  {
+       struct device_node *np;
+       int count = 0;
+ 
+       for_each_compatible_node(np, NULL,  ALTR_TIMER_COMPATIBLE)
+               count++;
+ 
+       if (count < 2)
+               panic("%d timer is found, it needs 2 timers in system\n", count);
+ 
        clocksource_of_init();
  }
  
- CLOCKSOURCE_OF_DECLARE(nios2_timer, "altr,timer-1.0", nios2_time_init);
+ CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);