Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/timer

From Tony Lindgren <tony@atomide.com>:

Here are some omap dmtimer changes to make it easier to add
device tree support for dmtimer by simplifying the platform
data structure used by dmtimr.

* tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Simplify dmtimer clock aliases
  ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver
  ARM: OMAP1: Fix dmtimer support
  ARM: OMAP: Add flag to indicate if a timer needs a manual reset
  ARM: OMAP: Remove timer function pointer for context loss counter
  ARM: OMAP: Remove loses_context variable from timer platform data
  ARM: OMAP2+: Fix external clock support for dmtimers
  ARM: OMAP2+: HWMOD: Correct timer device attributes
  ARM: OMAP: Add DMTIMER capability variable to represent timer features
  ARM: OMAP2+: Add dmtimer platform function to reserve systimers
  ARM: OMAP2+: Remove unused max number of timers definition
  ARM: OMAP: Remove unnecessary clk structure

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

11 files changed, 118 insertions, 262 deletions

diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
index 64c65bcb2d67..aa81593db1af 100644
--- a/arch/arm/mach-omap1/timer.c
+++ b/arch/arm/mach-omap1/timer.c
@@ -140,7 +140,8 @@ static int __init omap1_dm_timer_init(void)
                 }
 
                 pdata->set_timer_src = omap1_dm_timer_set_src;
-                pdata->needs_manual_reset = 1;
+                pdata->timer_capability = OMAP_TIMER_ALWON |
+                                OMAP_TIMER_NEEDS_RESET;
 
                 ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
                 if (ret) {
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c
index bace9308a4db..861767ed1a3a 100644
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -1901,42 +1901,9 @@ static struct omap_clk omap2420_clks[] = {
         CLK(NULL,       "pka_ick",      &pka_ick,       CK_242X),
         CLK(NULL,       "usb_fck",      &usb_fck,       CK_242X),
         CLK("musb-hdrc",        "fck",  &osc_ck,        CK_242X),
-        CLK("omap_timer.1",     "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.2",     "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.3",     "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.4",     "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.5",     "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.6",     "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.7",     "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.8",     "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.9",     "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.10",    "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.11",    "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.12",    "32k_ck",       &func_32k_ck,   CK_243X),
-        CLK("omap_timer.1",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.2",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.3",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.4",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.5",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.6",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.7",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.8",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.9",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.10",    "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.11",    "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.12",    "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.1",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.2",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.3",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.4",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.5",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.6",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.7",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.8",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.9",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.10",    "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.11",    "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.12",    "alt_ck",       &alt_ck,        CK_243X),
+        CLK(NULL,       "timer_32k_ck", &func_32k_ck,   CK_243X),
+        CLK(NULL,       "timer_sys_ck", &sys_ck,        CK_243X),
+        CLK(NULL,       "timer_ext_ck", &alt_ck,        CK_243X),
 };
 
 /*
diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c
index 3b4d09a50399..5577810dbc26 100644
--- a/arch/arm/mach-omap2/clock2430_data.c
+++ b/arch/arm/mach-omap2/clock2430_data.c
@@ -2000,42 +2000,9 @@ static struct omap_clk omap2430_clks[] = {
         CLK(NULL,       "mdm_intc_ick", &mdm_intc_ick,  CK_243X),
         CLK("omap_hsmmc.0", "mmchsdb_fck",      &mmchsdb1_fck,  CK_243X),
         CLK("omap_hsmmc.1", "mmchsdb_fck",      &mmchsdb2_fck,  CK_243X),
-        CLK("omap_timer.1",     "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.2",     "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.3",     "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.4",     "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.5",     "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.6",     "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.7",     "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.8",     "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.9",     "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.10",    "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.11",    "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.12",    "32k_ck",  &func_32k_ck,   CK_243X),
-        CLK("omap_timer.1",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.2",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.3",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.4",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.5",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.6",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.7",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.8",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.9",     "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.10",    "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.11",    "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.12",    "sys_ck",       &sys_ck,        CK_243X),
-        CLK("omap_timer.1",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.2",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.3",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.4",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.5",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.6",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.7",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.8",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.9",     "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.10",    "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.11",    "alt_ck",       &alt_ck,        CK_243X),
-        CLK("omap_timer.12",    "alt_ck",       &alt_ck,        CK_243X),
+        CLK(NULL,       "timer_32k_ck",  &func_32k_ck,   CK_243X),
+        CLK(NULL,       "timer_sys_ck", &sys_ck,        CK_243X),
+        CLK(NULL,       "timer_ext_ck", &alt_ck,        CK_243X),
 };
 
 /*
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 1efdec236ae8..0d814620b69c 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3482,30 +3482,8 @@ static struct omap_clk omap3xxx_clks[] = {
         CLK("musb-am35x",       "fck",          &hsotgusb_fck_am35xx,   CK_AM35XX),
         CLK(NULL,       "hecc_ck",      &hecc_ck,       CK_AM35XX),
         CLK(NULL,       "uart4_ick",    &uart4_ick_am35xx,      CK_AM35XX),
-        CLK("omap_timer.1",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.2",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.3",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.4",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.5",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.6",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.7",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.8",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.9",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.10",    "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.11",    "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.12",    "32k_ck",       &omap_32k_fck,  CK_3XXX),
-        CLK("omap_timer.1",     "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.2",     "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.3",     "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.4",     "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.5",     "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.6",     "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.7",     "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.8",     "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.9",     "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.10",    "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.11",    "sys_ck",       &sys_ck,        CK_3XXX),
-        CLK("omap_timer.12",    "sys_ck",       &sys_ck,        CK_3XXX),
+        CLK(NULL,       "timer_32k_ck", &omap_32k_fck,  CK_3XXX),
+        CLK(NULL,       "timer_sys_ck", &sys_ck,        CK_3XXX),
 };
 
 
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index ba6f9a0a43e9..de53b7014b80 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -3385,28 +3385,18 @@ static struct omap_clk omap44xx_clks[] = {
         CLK("usbhs_omap",       "usbhost_ick",          &dummy_ck,              CK_443X),
         CLK("usbhs_omap",       "usbtll_fck",           &dummy_ck,      CK_443X),
         CLK("omap_wdt", "ick",                          &dummy_ck,      CK_443X),
-        CLK("omap_timer.1",     "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.2",     "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.3",     "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.4",     "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.5",     "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.6",     "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.7",     "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.8",     "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.9",     "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.10",    "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.11",    "32k_ck",       &sys_32k_ck,    CK_443X),
-        CLK("omap_timer.1",     "sys_ck",       &sys_clkin_ck,  CK_443X),
-        CLK("omap_timer.2",     "sys_ck",       &sys_clkin_ck,  CK_443X),
-        CLK("omap_timer.3",     "sys_ck",       &sys_clkin_ck,  CK_443X),
-        CLK("omap_timer.4",     "sys_ck",       &sys_clkin_ck,  CK_443X),
-        CLK("omap_timer.9",     "sys_ck",       &sys_clkin_ck,  CK_443X),
-        CLK("omap_timer.10",    "sys_ck",       &sys_clkin_ck,  CK_443X),
-        CLK("omap_timer.11",    "sys_ck",       &sys_clkin_ck,  CK_443X),
-        CLK("omap_timer.5",     "sys_ck",       &syc_clk_div_ck,        CK_443X),
-        CLK("omap_timer.6",     "sys_ck",       &syc_clk_div_ck,        CK_443X),
-        CLK("omap_timer.7",     "sys_ck",       &syc_clk_div_ck,        CK_443X),
-        CLK("omap_timer.8",     "sys_ck",       &syc_clk_div_ck,        CK_443X),
+        CLK(NULL,       "timer_32k_ck", &sys_32k_ck,    CK_443X),
+        CLK("omap_timer.1",     "timer_sys_ck", &sys_clkin_ck,  CK_443X),
+        CLK("omap_timer.2",     "timer_sys_ck", &sys_clkin_ck,  CK_443X),
+        CLK("omap_timer.3",     "timer_sys_ck", &sys_clkin_ck,  CK_443X),
+        CLK("omap_timer.4",     "timer_sys_ck", &sys_clkin_ck,  CK_443X),
+        CLK("omap_timer.9",     "timer_sys_ck", &sys_clkin_ck,  CK_443X),
+        CLK("omap_timer.10",    "timer_sys_ck", &sys_clkin_ck,  CK_443X),
+        CLK("omap_timer.11",    "timer_sys_ck", &sys_clkin_ck,  CK_443X),
+        CLK("omap_timer.5",     "timer_sys_ck", &syc_clk_div_ck,        CK_443X),
+        CLK("omap_timer.6",     "timer_sys_ck", &syc_clk_div_ck,        CK_443X),
+        CLK("omap_timer.7",     "timer_sys_ck", &syc_clk_div_ck,        CK_443X),
+        CLK("omap_timer.8",     "timer_sys_ck", &syc_clk_div_ck,        CK_443X),
 };
 
 int __init omap4xxx_clk_init(void)
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
index 83eafd96ecaa..afad69c6ba6e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -68,7 +68,6 @@ static struct omap_hwmod_class_sysconfig omap2xxx_timer_sysc = {
 struct omap_hwmod_class omap2xxx_timer_hwmod_class = {
         .name   = "timer",
         .sysc   = &omap2xxx_timer_sysc,
-        .rev    = OMAP_TIMER_IP_VERSION_1,
 };
 
 /*
@@ -257,7 +256,6 @@ struct omap_hwmod omap2xxx_timer2_hwmod = {
                         .idlest_idle_bit = OMAP24XX_ST_GPT2_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap2xxx_timer_hwmod_class,
 };
 
@@ -276,7 +274,6 @@ struct omap_hwmod omap2xxx_timer3_hwmod = {
                         .idlest_idle_bit = OMAP24XX_ST_GPT3_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap2xxx_timer_hwmod_class,
 };
 
@@ -295,7 +292,6 @@ struct omap_hwmod omap2xxx_timer4_hwmod = {
                         .idlest_idle_bit = OMAP24XX_ST_GPT4_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap2xxx_timer_hwmod_class,
 };
 
@@ -314,7 +310,6 @@ struct omap_hwmod omap2xxx_timer5_hwmod = {
                         .idlest_idle_bit = OMAP24XX_ST_GPT5_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap2xxx_timer_hwmod_class,
 };
 
@@ -333,7 +328,6 @@ struct omap_hwmod omap2xxx_timer6_hwmod = {
                         .idlest_idle_bit = OMAP24XX_ST_GPT6_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap2xxx_timer_hwmod_class,
 };
 
@@ -352,7 +346,6 @@ struct omap_hwmod omap2xxx_timer7_hwmod = {
                         .idlest_idle_bit = OMAP24XX_ST_GPT7_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap2xxx_timer_hwmod_class,
 };
 
@@ -371,7 +364,6 @@ struct omap_hwmod omap2xxx_timer8_hwmod = {
                         .idlest_idle_bit = OMAP24XX_ST_GPT8_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap2xxx_timer_hwmod_class,
 };
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index b26d3c9bca16..0ea53bcc7d18 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -129,7 +129,6 @@ static struct omap_hwmod_class_sysconfig omap3xxx_timer_1ms_sysc = {
 static struct omap_hwmod_class omap3xxx_timer_1ms_hwmod_class = {
         .name = "timer",
         .sysc = &omap3xxx_timer_1ms_sysc,
-        .rev = OMAP_TIMER_IP_VERSION_1,
 };
 
 static struct omap_hwmod_class_sysconfig omap3xxx_timer_sysc = {
@@ -145,12 +144,11 @@ static struct omap_hwmod_class_sysconfig omap3xxx_timer_sysc = {
 static struct omap_hwmod_class omap3xxx_timer_hwmod_class = {
         .name = "timer",
         .sysc = &omap3xxx_timer_sysc,
-        .rev =  OMAP_TIMER_IP_VERSION_1,
 };
 
 /* secure timers dev attribute */
 static struct omap_timer_capability_dev_attr capability_secure_dev_attr = {
-        .timer_capability       = OMAP_TIMER_SECURE,
+        .timer_capability       = OMAP_TIMER_ALWON | OMAP_TIMER_SECURE,
 };
 
 /* always-on timers dev attribute */
@@ -195,7 +193,6 @@ static struct omap_hwmod omap3xxx_timer2_hwmod = {
                         .idlest_idle_bit = OMAP3430_ST_GPT2_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap3xxx_timer_1ms_hwmod_class,
 };
 
@@ -213,7 +210,6 @@ static struct omap_hwmod omap3xxx_timer3_hwmod = {
                         .idlest_idle_bit = OMAP3430_ST_GPT3_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap3xxx_timer_hwmod_class,
 };
 
@@ -231,7 +227,6 @@ static struct omap_hwmod omap3xxx_timer4_hwmod = {
                         .idlest_idle_bit = OMAP3430_ST_GPT4_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap3xxx_timer_hwmod_class,
 };
 
@@ -249,7 +244,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = {
                         .idlest_idle_bit = OMAP3430_ST_GPT5_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap3xxx_timer_hwmod_class,
 };
 
@@ -267,7 +261,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = {
                         .idlest_idle_bit = OMAP3430_ST_GPT6_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap3xxx_timer_hwmod_class,
 };
 
@@ -285,7 +278,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = {
                         .idlest_idle_bit = OMAP3430_ST_GPT7_SHIFT,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
         .class          = &omap3xxx_timer_hwmod_class,
 };
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index f30e861ce6d9..afddec835ece 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2947,7 +2947,6 @@ static struct omap_hwmod omap44xx_timer2_hwmod = {
                         .modulemode   = MODULEMODE_SWCTRL,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
 };
 
 /* timer3 */
@@ -2969,7 +2968,6 @@ static struct omap_hwmod omap44xx_timer3_hwmod = {
                         .modulemode   = MODULEMODE_SWCTRL,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
 };
 
 /* timer4 */
@@ -2991,7 +2989,6 @@ static struct omap_hwmod omap44xx_timer4_hwmod = {
                         .modulemode   = MODULEMODE_SWCTRL,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
 };
 
 /* timer5 */
@@ -3013,7 +3010,6 @@ static struct omap_hwmod omap44xx_timer5_hwmod = {
                         .modulemode   = MODULEMODE_SWCTRL,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
 };
 
 /* timer6 */
@@ -3036,7 +3032,6 @@ static struct omap_hwmod omap44xx_timer6_hwmod = {
                         .modulemode   = MODULEMODE_SWCTRL,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
 };
 
 /* timer7 */
@@ -3058,7 +3053,6 @@ static struct omap_hwmod omap44xx_timer7_hwmod = {
                         .modulemode   = MODULEMODE_SWCTRL,
                 },
         },
-        .dev_attr       = &capability_alwon_dev_attr,
 };
 
 /* timer8 */
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 840929bd9dae..8fe75a81e12d 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -69,11 +69,6 @@
 #define OMAP3_SECURE_TIMER      1
 #endif
 
-/* MAX_GPTIMER_ID: number of GPTIMERs on the chip */
-#define MAX_GPTIMER_ID          12
-
-static u32 sys_timer_reserved;
-
 /* Clockevent code */
 
 static struct omap_dm_timer clkev;
@@ -180,7 +175,8 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
 
         omap_hwmod_enable(oh);
 
-        sys_timer_reserved |= (1 << (gptimer_id - 1));
+        if (omap_dm_timer_reserve_systimer(gptimer_id))
+                return -ENODEV;
 
         if (gptimer_id != 12) {
                 struct clk *src;
@@ -394,66 +390,6 @@ OMAP_SYS_TIMER(4)
 #endif
 
 /**
- * omap2_dm_timer_set_src - change the timer input clock source
- * @pdev:       timer platform device pointer
- * @source:     array index of parent clock source
- */
-static int omap2_dm_timer_set_src(struct platform_device *pdev, int source)
-{
-        int ret;
-        struct dmtimer_platform_data *pdata = pdev->dev.platform_data;
-        struct clk *fclk, *parent;
-        char *parent_name = NULL;
-
-        fclk = clk_get(&pdev->dev, "fck");
-        if (IS_ERR_OR_NULL(fclk)) {
-                dev_err(&pdev->dev, "%s: %d: clk_get() FAILED\n",
-                                __func__, __LINE__);
-                return -EINVAL;
-        }
-
-        switch (source) {
-        case OMAP_TIMER_SRC_SYS_CLK:
-                parent_name = "sys_ck";
-                break;
-
-        case OMAP_TIMER_SRC_32_KHZ:
-                parent_name = "32k_ck";
-                break;
-
-        case OMAP_TIMER_SRC_EXT_CLK:
-                if (pdata->timer_ip_version == OMAP_TIMER_IP_VERSION_1) {
-                        parent_name = "alt_ck";
-                        break;
-                }
-                dev_err(&pdev->dev, "%s: %d: invalid clk src.\n",
-                        __func__, __LINE__);
-                clk_put(fclk);
-                return -EINVAL;
-        }
-
-        parent = clk_get(&pdev->dev, parent_name);
-        if (IS_ERR_OR_NULL(parent)) {
-                dev_err(&pdev->dev, "%s: %d: clk_get() %s FAILED\n",
-                        __func__, __LINE__, parent_name);
-                clk_put(fclk);
-                return -EINVAL;
-        }
-
-        ret = clk_set_parent(fclk, parent);
-        if (IS_ERR_VALUE(ret)) {
-                dev_err(&pdev->dev, "%s: clk_set_parent() to %s FAILED\n",
-                        __func__, parent_name);
-                ret = -EINVAL;
-        }
-
-        clk_put(parent);
-        clk_put(fclk);
-
-        return ret;
-}
-
-/**
  * omap_timer_init - build and register timer device with an
  * associated timer hwmod
  * @oh: timer hwmod pointer to be used to build timer device
@@ -473,7 +409,6 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
         struct dmtimer_platform_data *pdata;
         struct platform_device *pdev;
         struct omap_timer_capability_dev_attr *timer_dev_attr;
-        struct powerdomain *pwrdm;
 
         pr_debug("%s: %s\n", __func__, oh->name);
 
@@ -501,18 +436,9 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
          */
         sscanf(oh->name, "timer%2d", &id);
 
-        pdata->set_timer_src = omap2_dm_timer_set_src;
-        pdata->timer_ip_version = oh->class->rev;
-
-        /* Mark clocksource and clockevent timers as reserved */
-        if ((sys_timer_reserved >> (id - 1)) & 0x1)
-                pdata->reserved = 1;
+        if (timer_dev_attr)
+                pdata->timer_capability = timer_dev_attr->timer_capability;
 
-        pwrdm = omap_hwmod_get_pwrdm(oh);
-        pdata->loses_context = pwrdm_can_ever_lose_context(pwrdm);
-#ifdef CONFIG_PM
-        pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;
-#endif
         pdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata),
                                  NULL, 0, 0);
 
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 3b0cfeb33d05..54ed4e6e429e 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -42,9 +42,11 @@
 #include <linux/pm_runtime.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);
 static DEFINE_SPINLOCK(dm_timer_lock);
 
@@ -133,17 +135,22 @@ static void omap_dm_timer_reset(struct omap_dm_timer *timer)
 
 int omap_dm_timer_prepare(struct omap_dm_timer *timer)
 {
-        struct dmtimer_platform_data *pdata = timer->pdev->dev.platform_data;
         int ret;
 
-        timer->fclk = clk_get(&timer->pdev->dev, "fck");
-        if (WARN_ON_ONCE(IS_ERR_OR_NULL(timer->fclk))) {
-                timer->fclk = NULL;
-                dev_err(&timer->pdev->dev, ": No fclk handle.\n");
-                return -EINVAL;
+        /*
+         * FIXME: OMAP1 devices do not use the clock framework for dmtimers so
+         * do not call clk_get() for these devices.
+         */
+        if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {
+                timer->fclk = clk_get(&timer->pdev->dev, "fck");
+                if (WARN_ON_ONCE(IS_ERR_OR_NULL(timer->fclk))) {
+                        timer->fclk = NULL;
+                        dev_err(&timer->pdev->dev, ": No fclk handle.\n");
+                        return -EINVAL;
+                }
         }
 
-        if (pdata->needs_manual_reset)
+        if (timer->capability & OMAP_TIMER_NEEDS_RESET)
                 omap_dm_timer_reset(timer);
 
         ret = omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ);
@@ -152,6 +159,21 @@ int omap_dm_timer_prepare(struct omap_dm_timer *timer)
         return ret;
 }
 
+static inline u32 omap_dm_timer_reserved_systimer(int id)
+{
+        return (omap_reserved_systimers & (1 << (id - 1))) ? 1 : 0;
+}
+
+int omap_dm_timer_reserve_systimer(int id)
+{
+        if (omap_dm_timer_reserved_systimer(id))
+                return -ENODEV;
+
+        omap_reserved_systimers |= (1 << (id - 1));
+
+        return 0;
+}
+
 struct omap_dm_timer *omap_dm_timer_request(void)
 {
         struct omap_dm_timer *timer = NULL, *t;
@@ -325,10 +347,9 @@ int omap_dm_timer_start(struct omap_dm_timer *timer)
 
         omap_dm_timer_enable(timer);
 
-        if (timer->loses_context) {
-                u32 ctx_loss_cnt_after =
-                        timer->get_context_loss_count(&timer->pdev->dev);
-                if (ctx_loss_cnt_after != timer->ctx_loss_count)
+        if (!(timer->capability & OMAP_TIMER_ALWON)) {
+                if (omap_pm_get_dev_context_loss_count(&timer->pdev->dev) !=
+                                timer->ctx_loss_count)
                         omap_timer_restore_context(timer);
         }
 
@@ -347,20 +368,18 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_start);
 int omap_dm_timer_stop(struct omap_dm_timer *timer)
 {
         unsigned long rate = 0;
-        struct dmtimer_platform_data *pdata;
 
         if (unlikely(!timer))
                 return -EINVAL;
 
-        pdata = timer->pdev->dev.platform_data;
-        if (!pdata->needs_manual_reset)
+        if (!(timer->capability & OMAP_TIMER_NEEDS_RESET))
                 rate = clk_get_rate(timer->fclk);
 
         __omap_dm_timer_stop(timer, timer->posted, rate);
 
-        if (timer->loses_context && timer->get_context_loss_count)
+        if (!(timer->capability & OMAP_TIMER_ALWON))
                 timer->ctx_loss_count =
-                        timer->get_context_loss_count(&timer->pdev->dev);
+                        omap_pm_get_dev_context_loss_count(&timer->pdev->dev);
 
         /*
          * Since the register values are computed and written within
@@ -378,6 +397,8 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_stop);
 int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
 {
         int ret;
+        char *parent_name = NULL;
+        struct clk *fclk, *parent;
         struct dmtimer_platform_data *pdata;
 
         if (unlikely(!timer))
@@ -388,7 +409,49 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
         if (source < 0 || source >= 3)
                 return -EINVAL;
 
-        ret = pdata->set_timer_src(timer->pdev, source);
+        /*
+         * FIXME: Used for OMAP1 devices only because they do not currently
+         * use the clock framework to set the parent clock. To be removed
+         * once OMAP1 migrated to using clock framework for dmtimers
+         */
+        if (pdata->set_timer_src)
+                return pdata->set_timer_src(timer->pdev, source);
+
+        fclk = clk_get(&timer->pdev->dev, "fck");
+        if (IS_ERR_OR_NULL(fclk)) {
+                pr_err("%s: fck not found\n", __func__);
+                return -EINVAL;
+        }
+
+        switch (source) {
+        case OMAP_TIMER_SRC_SYS_CLK:
+                parent_name = "timer_sys_ck";
+                break;
+
+        case OMAP_TIMER_SRC_32_KHZ:
+                parent_name = "timer_32k_ck";
+                break;
+
+        case OMAP_TIMER_SRC_EXT_CLK:
+                parent_name = "timer_ext_ck";
+                break;
+        }
+
+        parent = clk_get(&timer->pdev->dev, parent_name);
+        if (IS_ERR_OR_NULL(parent)) {
+                pr_err("%s: %s not found\n", __func__, parent_name);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        ret = clk_set_parent(fclk, parent);
+        if (IS_ERR_VALUE(ret))
+                pr_err("%s: failed to set %s as parent\n", __func__,
+                        parent_name);
+
+        clk_put(parent);
+out:
+        clk_put(fclk);
 
         return ret;
 }
@@ -431,10 +494,9 @@ int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload,
 
         omap_dm_timer_enable(timer);
 
-        if (timer->loses_context) {
-                u32 ctx_loss_cnt_after =
-                        timer->get_context_loss_count(&timer->pdev->dev);
-                if (ctx_loss_cnt_after != timer->ctx_loss_count)
+        if (!(timer->capability & OMAP_TIMER_ALWON)) {
+                if (omap_pm_get_dev_context_loss_count(&timer->pdev->dev) !=
+                                timer->ctx_loss_count)
                         omap_timer_restore_context(timer);
         }
 
@@ -674,13 +736,12 @@ static int __devinit omap_dm_timer_probe(struct platform_device *pdev)
 
         timer->id = pdev->id;
         timer->irq = irq->start;
-        timer->reserved = pdata->reserved;
+        timer->reserved = omap_dm_timer_reserved_systimer(timer->id);
         timer->pdev = pdev;
-        timer->loses_context = pdata->loses_context;
-        timer->get_context_loss_count = pdata->get_context_loss_count;
+        timer->capability = pdata->timer_capability;
 
         /* Skip pm_runtime_enable for OMAP1 */
-        if (!pdata->needs_manual_reset) {
+        if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {
                 pm_runtime_enable(&pdev->dev);
                 pm_runtime_irq_safe(&pdev->dev);
         }
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h
index 5da73562e486..19e7fa577bd0 100644
--- a/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -55,23 +55,17 @@
 #define OMAP_TIMER_TRIGGER_OVERFLOW             0x01
 #define OMAP_TIMER_TRIGGER_OVERFLOW_AND_COMPARE 0x02
 
-/*
- * IP revision identifier so that Highlander IP
- * in OMAP4 can be distinguished.
- */
-#define OMAP_TIMER_IP_VERSION_1                        0x1
-
 /* timer capabilities used in hwmod database */
 #define OMAP_TIMER_SECURE                               0x80000000
 #define OMAP_TIMER_ALWON                                0x40000000
 #define OMAP_TIMER_HAS_PWM                              0x20000000
+#define OMAP_TIMER_NEEDS_RESET                          0x10000000
 
 struct omap_timer_capability_dev_attr {
         u32 timer_capability;
 };
 
 struct omap_dm_timer;
-struct clk;
 
 struct timer_regs {
         u32 tidr;
@@ -96,16 +90,12 @@ struct timer_regs {
 };
 
 struct dmtimer_platform_data {
+        /* set_timer_src - Only used for OMAP1 devices */
         int (*set_timer_src)(struct platform_device *pdev, int source);
-        int timer_ip_version;
-        u32 needs_manual_reset:1;
-        bool reserved;
-
-        bool loses_context;
-
-        int (*get_context_loss_count)(struct device *dev);
+        u32 timer_capability;
 };
 
+int omap_dm_timer_reserve_systimer(int id);
 struct omap_dm_timer *omap_dm_timer_request(void);
 struct omap_dm_timer *omap_dm_timer_request_specific(int timer_id);
 int omap_dm_timer_free(struct omap_dm_timer *timer);
@@ -272,13 +262,11 @@ struct omap_dm_timer {
         unsigned reserved:1;
         unsigned posted:1;
         struct timer_regs context;
-        bool loses_context;
         int ctx_loss_count;
         int revision;
+        u32 capability;
         struct platform_device *pdev;
         struct list_head node;
-
-        int (*get_context_loss_count)(struct device *dev);
 };
 
 int omap_dm_timer_prepare(struct omap_dm_timer *timer);