Merge branch 'omap-for-v4.13/clkctrl' into omap-for-v4.13/soc-v4

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/prm3xxx.c
Simple merge

diff --cc arch/arm/mach-omap2/prm44xx.c
Simple merge

diff --cc arch/arm/mach-omap2/prm_common.c
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
index ce982d1930463ae1bdab60c9ccb321d2e6860b5d,af90f95c2433894ed2950538d73451847eb32816..6a861c0ac34360782bfe13b75f37e41e14824133
--- 1/arch/arm/mach-omap2/timer.c
--- 2/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -258,21 -239,32 +258,23 @@@ static int __init omap_dm_timer_init_on
        struct clk *src;
        int r = 0;
  
 -      if (of_have_populated_dt()) {
 -              np = omap_get_timer_dt(omap_timer_match, property);
 -              if (!np)
 -                      return -ENODEV;
 +      np = omap_get_timer_dt(omap_timer_match, property);
 +      if (!np)
 +              return -ENODEV;
  
 -              of_property_read_string_index(np, "ti,hwmods", 0, &oh_name);
 -              if (!oh_name)
 -                      return -ENODEV;
 +      of_property_read_string_index(np, "ti,hwmods", 0, &oh_name);
 +      if (!oh_name)
 +              return -ENODEV;
  
 -              timer->irq = irq_of_parse_and_map(np, 0);
 -              if (!timer->irq)
 -                      return -ENXIO;
 +      timer->irq = irq_of_parse_and_map(np, 0);
 +      if (!timer->irq)
 +              return -ENXIO;
  
 -              timer->io_base = of_iomap(np, 0);
 +      timer->io_base = of_iomap(np, 0);
  
 -              timer->fclk = of_clk_get_by_name(np, "fck");
++      timer->fclk = of_clk_get_by_name(np, "fck");
+ 
 -              of_node_put(np);
 -      } else {
 -              if (omap_dm_timer_reserve_systimer(timer->id))
 -                      return -ENODEV;
 -
 -              sprintf(name, "timer%d", timer->id);
 -              oh_name = name;
 -      }
 +      of_node_put(np);
  
        oh = omap_hwmod_lookup(oh_name);
        if (!oh)