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

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

Resolved as suggested by Jon Hunter.

diff --cc arch/arm/Kconfig
Simple merge

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

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

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

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

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

diff --cc arch/arm/plat-omap/dmtimer.c
index b09e55632f4bc3d76179e3fc1d5d3381f58cac5f,82231a75abd601ed6e6cf55ff0d7f393237eefa9..9dca23e4d6b0596fa6c1476a894b4a373e891abc
--- 1/arch/arm/plat-omap/dmtimer.c
--- 2/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)) {

diff --cc arch/arm/plat-omap/include/plat/dmtimer.h
Simple merge

diff --cc drivers/staging/tidspbridge/include/dspbridge/host_os.h
Simple merge

diff --cc drivers/usb/musb/musb_dsps.c
Simple merge