From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 03:18:05 +0000 (-0700)
Subject: Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
X-Git-Tag: v3.2-rc1~96
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ac5761a650d22dd7dfad4d417463a0981d2da0a4;hp=-c

Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc

* 'next/timer' of git://git.linaro.org/people/arnd/arm-soc:
  clocksource: fixup ux500 build problems
  ARM: omap: use __devexit_p in dmtimer driver
  ARM: ux500: Reprogram timers upon resume
  ARM: plat-nomadik: timer: Export reset functions
  ARM: plat-nomadik: timer: Add support for periodic timers
  ARM: ux500: Move timer code to separate file
  ARM: ux500: add support for clocksource DBX500 PRCMU
  clocksource: add DBX500 PRCMU Timer support
  ARM: plat-nomadik: MTU sched_clock as an option
  ARM: OMAP: dmtimer: add error handling to export APIs
  ARM: OMAP: dmtimer: low-power mode support
  ARM: OMAP: dmtimer: skip reserved timers
  ARM: OMAP: dmtimer: pm_runtime support
  ARM: OMAP: dmtimer: switch-over to platform device driver
  ARM: OMAP: dmtimer: platform driver
  ARM: OMAP2+: dmtimer: convert to platform devices
  ARM: OMAP1: dmtimer: conversion to platform devices
  ARM: OMAP2+: dmtimer: add device names to flck nodes
  ARM: OMAP: Add support for dmtimer v2 ip
---

ac5761a650d22dd7dfad4d417463a0981d2da0a4
diff --combined arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index fd1074a024b8,393afac9caf6..7695e5d43316
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -29,6 -29,7 +29,7 @@@
  #include <plat/mcbsp.h>
  #include <plat/mmc.h>
  #include <plat/i2c.h>
+ #include <plat/dmtimer.h>
  
  #include "omap_hwmod_common_data.h"
  
@@@ -4201,6 -4202,16 +4202,16 @@@ static struct omap_hwmod_class omap44xx
  	.sysc	= &omap44xx_timer_sysc,
  };
  
+ /* always-on timers dev attribute */
+ static struct omap_timer_capability_dev_attr capability_alwon_dev_attr = {
+ 	.timer_capability	= OMAP_TIMER_ALWON,
+ };
+ 
+ /* pwm timers dev attribute */
+ static struct omap_timer_capability_dev_attr capability_pwm_dev_attr = {
+ 	.timer_capability	= OMAP_TIMER_HAS_PWM,
+ };
+ 
  /* timer1 */
  static struct omap_hwmod omap44xx_timer1_hwmod;
  static struct omap_hwmod_irq_info omap44xx_timer1_irqs[] = {
@@@ -4244,6 -4255,7 +4255,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_alwon_dev_attr,
  	.slaves		= omap44xx_timer1_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer1_slaves),
  };
@@@ -4291,6 -4303,7 +4303,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_alwon_dev_attr,
  	.slaves		= omap44xx_timer2_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer2_slaves),
  };
@@@ -4338,6 -4351,7 +4351,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_alwon_dev_attr,
  	.slaves		= omap44xx_timer3_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer3_slaves),
  };
@@@ -4385,6 -4399,7 +4399,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_alwon_dev_attr,
  	.slaves		= omap44xx_timer4_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer4_slaves),
  };
@@@ -4451,6 -4466,7 +4466,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_alwon_dev_attr,
  	.slaves		= omap44xx_timer5_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer5_slaves),
  };
@@@ -4518,6 -4534,7 +4534,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_alwon_dev_attr,
  	.slaves		= omap44xx_timer6_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer6_slaves),
  };
@@@ -4584,6 -4601,7 +4601,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_alwon_dev_attr,
  	.slaves		= omap44xx_timer7_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer7_slaves),
  };
@@@ -4650,6 -4668,7 +4668,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_pwm_dev_attr,
  	.slaves		= omap44xx_timer8_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer8_slaves),
  };
@@@ -4697,6 -4716,7 +4716,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_pwm_dev_attr,
  	.slaves		= omap44xx_timer9_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer9_slaves),
  };
@@@ -4744,6 -4764,7 +4764,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_pwm_dev_attr,
  	.slaves		= omap44xx_timer10_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer10_slaves),
  };
@@@ -4791,6 -4812,7 +4812,7 @@@ static struct omap_hwmod omap44xx_timer
  			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
+ 	.dev_attr	= &capability_pwm_dev_attr,
  	.slaves		= omap44xx_timer11_slaves,
  	.slaves_cnt	= ARRAY_SIZE(omap44xx_timer11_slaves),
  };
@@@ -5348,7 -5370,7 +5370,7 @@@ static __initdata struct omap_hwmod *om
  	&omap44xx_mcbsp4_hwmod,
  
  	/* mcpdm class */
 -/*	&omap44xx_mcpdm_hwmod, */
 +	&omap44xx_mcpdm_hwmod,
  
  	/* mcspi class */
  	&omap44xx_mcspi1_hwmod,