From: Tony Lindgren <tony@atomide.com>
Date: Fri, 9 Nov 2012 22:54:17 +0000 (-0800)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for... 
X-Git-Tag: v3.8-rc1~135^2~2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt

Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolved as suggested by Jon Hunter.
---

f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37
diff --cc arch/arm/plat-omap/dmtimer.c
index b09e556,82231a7..9dca23e
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@@ -40,13 -40,8 +40,10 @@@
  #include <linux/device.h>
  #include <linux/err.h>
  #include <linux/pm_runtime.h>
 +#include <linux/of.h>
 +#include <linux/of_device.h>
  
  #include <plat/dmtimer.h>
- #include <plat/omap-pm.h>
- 
- #include <mach/hardware.h>
  
  static u32 omap_reserved_systimers;
  static LIST_HEAD(omap_timer_list);
@@@ -785,23 -725,12 +786,24 @@@ static int __devinit omap_dm_timer_prob
  		return -ENOMEM;
  	}
  
 -	timer->id = pdev->id;
 +	if (dev->of_node) {
 +		if (of_find_property(dev->of_node, "ti,timer-alwon", NULL))
 +			timer->capability |= OMAP_TIMER_ALWON;
 +		if (of_find_property(dev->of_node, "ti,timer-dsp", NULL))
 +			timer->capability |= OMAP_TIMER_HAS_DSP_IRQ;
 +		if (of_find_property(dev->of_node, "ti,timer-pwm", NULL))
 +			timer->capability |= OMAP_TIMER_HAS_PWM;
 +		if (of_find_property(dev->of_node, "ti,timer-secure", NULL))
 +			timer->capability |= OMAP_TIMER_SECURE;
 +	} else {
 +		timer->id = pdev->id;
 +		timer->capability = pdata->timer_capability;
 +		timer->reserved = omap_dm_timer_reserved_systimer(timer->id);
++		timer->get_context_loss_count = pdata->get_context_loss_count;
 +	}
 +
  	timer->irq = irq->start;
 -	timer->reserved = omap_dm_timer_reserved_systimer(timer->id);
  	timer->pdev = pdev;
 -	timer->capability = pdata->timer_capability;
 -	timer->get_context_loss_count = pdata->get_context_loss_count;
  
  	/* Skip pm_runtime_enable for OMAP1 */
  	if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {