From: Tony Lindgren <tony@atomide.com>
Date: Mon, 12 Jun 2017 10:27:30 +0000 (-0700)
Subject: Merge branch 'omap-for-v4.13/clkctrl' into omap-for-v4.13/soc-v4
X-Git-Tag: Ubuntu-5.0.0-8.9~4602^2~12^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=67d00470accf5c58abbb23a44c867c5f15437976;p=mirror_ubuntu-disco-kernel.git

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

67d00470accf5c58abbb23a44c867c5f15437976
diff --cc arch/arm/mach-omap2/timer.c
index ce982d193046,af90f95c2433..6a861c0ac343
--- a/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)