[v2,2/7] arm: omap: Move dmtimer.h out of plat-omap

Message ID 1510144108-29563-3-git-send-email-j-keerthy@ti.com
State New
Headers show
Series
  • omap: dmtimer: Move driver out of plat-omap
Related show

Commit Message

Keerthy Nov. 8, 2017, 12:28 p.m.
The header file is currently under plat-omap directory
under arch/omap. Move this out to an accessible place.

No Code changes done to the header file.

Signed-off-by: Keerthy <j-keerthy@ti.com>
---

No code changes in this v2 version. Only enhanced patch
statistics for renames.

 arch/arm/mach-omap1/pm.c                                           | 2 +-
 arch/arm/mach-omap1/timer.c                                        | 2 +-
 arch/arm/mach-omap2/omap_hwmod_2420_data.c                         | 2 +-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c                         | 2 +-
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c                 | 2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c                         | 2 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c                         | 2 +-
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c                         | 2 +-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c                          | 2 +-
 arch/arm/mach-omap2/omap_hwmod_81xx_data.c                         | 2 +-
 arch/arm/mach-omap2/pdata-quirks.c                                 | 2 +-
 arch/arm/mach-omap2/timer.c                                        | 2 +-
 arch/arm/plat-omap/dmtimer.c                                       | 2 +-
 {arch/arm/plat-omap/include/plat => include/clocksource}/dmtimer.h | 0
 14 files changed, 13 insertions(+), 13 deletions(-)
 rename {arch/arm/plat-omap/include/plat => include/clocksource}/dmtimer.h (100%)

Comments

Tony Lindgren Nov. 8, 2017, 4:42 p.m. | #1
* Keerthy <j-keerthy@ti.com> [171108 12:31]:
> The header file is currently under plat-omap directory
> under arch/omap. Move this out to an accessible place.
> 
> No Code changes done to the header file.

Some of the dmtimer functions are in this header to optimize the
size of the system timer code. Can you please check if some of them
can be left out of dmtimer.h and be made private to mach-omap1/timer.c
and mach-omap2/timer.c?

Again, we don't want driver code to start mis-using these as that's
immediately going to be big mess out of control.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-pwm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keerthy Nov. 9, 2017, 4:25 a.m. | #2
On Wednesday 08 November 2017 10:12 PM, Tony Lindgren wrote:
> * Keerthy <j-keerthy@ti.com> [171108 12:31]:
>> The header file is currently under plat-omap directory
>> under arch/omap. Move this out to an accessible place.
>>
>> No Code changes done to the header file.
> 
> Some of the dmtimer functions are in this header to optimize the
> size of the system timer code. Can you please check if some of them
> can be left out of dmtimer.h and be made private to mach-omap1/timer.c
> and mach-omap2/timer.c?

Okay. I will try to clean that as well.

> 
> Again, we don't want driver code to start mis-using these as that's
> immediately going to be big mess out of control.

Sure.

> 
> Regards,
> 
> Tony
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-pwm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keerthy Nov. 9, 2017, 8:06 a.m. | #3
On Thursday 09 November 2017 09:55 AM, Keerthy wrote:
> 
> 
> On Wednesday 08 November 2017 10:12 PM, Tony Lindgren wrote:
>> * Keerthy <j-keerthy@ti.com> [171108 12:31]:
>>> The header file is currently under plat-omap directory
>>> under arch/omap. Move this out to an accessible place.
>>>
>>> No Code changes done to the header file.
>>
>> Some of the dmtimer functions are in this header to optimize the
>> size of the system timer code. Can you please check if some of them
>> can be left out of dmtimer.h and be made private to mach-omap1/timer.c
>> and mach-omap2/timer.c?
> 
> Okay. I will try to clean that as well.

Tony,

Only function that i could push out of dmtimer.h was
__omap_dm_timer_override_errata

which is being currently called by mach-omap2/timer.c alone.

Rest all are used both my dmtimer.c as well as mach-omap2/timer.c.
Here is the list:

__omap_dm_timer_read
__omap_dm_timer_write
__omap_dm_timer_init_regs
__omap_dm_timer_enable_posted
__omap_dm_timer_stop
__omap_dm_timer_load_start
__omap_dm_timer_int_enable
__omap_dm_timer_read_counter
__omap_dm_timer_write_status

Any preferences on moving them to dmtimer.c or leaving them in header file?

Regards,
Keerthy

> 
>>
>> Again, we don't want driver code to start mis-using these as that's
>> immediately going to be big mess out of control.
> 
> Sure.
> 
>>
>> Regards,
>>
>> Tony
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-pwm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren Nov. 9, 2017, 2:52 p.m. | #4
* Keerthy <j-keerthy@ti.com> [171109 08:09]:
> 
> 
> On Thursday 09 November 2017 09:55 AM, Keerthy wrote:
> > 
> > 
> > On Wednesday 08 November 2017 10:12 PM, Tony Lindgren wrote:
> >> * Keerthy <j-keerthy@ti.com> [171108 12:31]:
> >>> The header file is currently under plat-omap directory
> >>> under arch/omap. Move this out to an accessible place.
> >>>
> >>> No Code changes done to the header file.
> >>
> >> Some of the dmtimer functions are in this header to optimize the
> >> size of the system timer code. Can you please check if some of them
> >> can be left out of dmtimer.h and be made private to mach-omap1/timer.c
> >> and mach-omap2/timer.c?
> > 
> > Okay. I will try to clean that as well.
> 
> Tony,
> 
> Only function that i could push out of dmtimer.h was
> __omap_dm_timer_override_errata
> 
> which is being currently called by mach-omap2/timer.c alone.

Hmm OK thanks for checking.

> Rest all are used both my dmtimer.c as well as mach-omap2/timer.c.
> Here is the list:
> 
> __omap_dm_timer_read
> __omap_dm_timer_write
> __omap_dm_timer_init_regs
> __omap_dm_timer_enable_posted
> __omap_dm_timer_stop
> __omap_dm_timer_load_start
> __omap_dm_timer_int_enable
> __omap_dm_timer_read_counter
> __omap_dm_timer_write_status
> 
> Any preferences on moving them to dmtimer.c or leaving them in header file?

How about we make the system timer functions and these header
functions private to the dmtimer.c. Then we can have the SoC specific
system timer functions be selected based on comaptible value like
drivers typically do :)

I think only the SoC specific init code should be left in
arch/arm/mach-omap[12]/timer.c.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-pwm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sebastian Reichel Nov. 9, 2017, 4:16 p.m. | #5
Hi,

On Wed, Nov 08, 2017 at 05:58:23PM +0530, Keerthy wrote:
> The header file is currently under plat-omap directory
> under arch/omap. Move this out to an accessible place.
> 
> No Code changes done to the header file.
> 
> Signed-off-by: Keerthy <j-keerthy@ti.com>
> ---
> 
> No code changes in this v2 version. Only enhanced patch
> statistics for renames.

Thanks, this is much easier to review.

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

-- Sebastian

>  arch/arm/mach-omap1/pm.c                                           | 2 +-
>  arch/arm/mach-omap1/timer.c                                        | 2 +-
>  arch/arm/mach-omap2/omap_hwmod_2420_data.c                         | 2 +-
>  arch/arm/mach-omap2/omap_hwmod_2430_data.c                         | 2 +-
>  arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c                 | 2 +-
>  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c                         | 2 +-
>  arch/arm/mach-omap2/omap_hwmod_44xx_data.c                         | 2 +-
>  arch/arm/mach-omap2/omap_hwmod_54xx_data.c                         | 2 +-
>  arch/arm/mach-omap2/omap_hwmod_7xx_data.c                          | 2 +-
>  arch/arm/mach-omap2/omap_hwmod_81xx_data.c                         | 2 +-
>  arch/arm/mach-omap2/pdata-quirks.c                                 | 2 +-
>  arch/arm/mach-omap2/timer.c                                        | 2 +-
>  arch/arm/plat-omap/dmtimer.c                                       | 2 +-
>  {arch/arm/plat-omap/include/plat => include/clocksource}/dmtimer.h | 0
>  14 files changed, 13 insertions(+), 13 deletions(-)
>  rename {arch/arm/plat-omap/include/plat => include/clocksource}/dmtimer.h (100%)
> 
> diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
> index f1135bf..a07d47cf 100644
> --- a/arch/arm/mach-omap1/pm.c
> +++ b/arch/arm/mach-omap1/pm.c
> @@ -55,7 +55,7 @@
>  #include <mach/tc.h>
>  #include <mach/mux.h>
>  #include <linux/omap-dma.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include <mach/irqs.h>
>  
> diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
> index 8fb1ec6..7c057ab 100644
> --- a/arch/arm/mach-omap1/timer.c
> +++ b/arch/arm/mach-omap1/timer.c
> @@ -27,7 +27,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/platform_data/dmtimer-omap.h>
>  
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include "soc.h"
>  
> diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
> index 1a15a34..45c1043 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
> @@ -16,7 +16,7 @@
>  #include <linux/i2c-omap.h>
>  #include <linux/platform_data/spi-omap2-mcspi.h>
>  #include <linux/omap-dma.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include "omap_hwmod.h"
>  #include "l3_2xxx.h"
> diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
> index 3801850..892ca58 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
> @@ -18,7 +18,7 @@
>  #include <linux/platform_data/hsmmc-omap.h>
>  #include <linux/platform_data/spi-omap2-mcspi.h>
>  #include <linux/omap-dma.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include "omap_hwmod.h"
>  #include "l3_2xxx.h"
> 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 beec4cd..82b51c0 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
> @@ -11,7 +11,7 @@
>  
>  #include <linux/platform_data/gpio-omap.h>
>  #include <linux/omap-dma.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  #include <linux/platform_data/spi-omap2-mcspi.h>
>  
>  #include "omap_hwmod.h"
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> index 9cfba41..2423c51 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -25,7 +25,7 @@
>  #include "l4_3xxx.h"
>  #include <linux/platform_data/asoc-ti-mcbsp.h>
>  #include <linux/platform_data/spi-omap2-mcspi.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include "soc.h"
>  #include "omap_hwmod.h"
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index c477096..22e0e38 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -30,7 +30,7 @@
>  
>  #include <linux/platform_data/spi-omap2-mcspi.h>
>  #include <linux/platform_data/asoc-ti-mcbsp.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include "omap_hwmod.h"
>  #include "omap_hwmod_common_data.h"
> diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
> index 988e7ea..530334e 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
> @@ -26,7 +26,7 @@
>  #include <linux/omap-dma.h>
>  #include <linux/platform_data/spi-omap2-mcspi.h>
>  #include <linux/platform_data/asoc-ti-mcbsp.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include "omap_hwmod.h"
>  #include "omap_hwmod_common_data.h"
> diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
> index d05e553d..adabdef 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
> @@ -26,7 +26,7 @@
>  #include <linux/omap-dma.h>
>  #include <linux/platform_data/spi-omap2-mcspi.h>
>  #include <linux/platform_data/asoc-ti-mcbsp.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include "omap_hwmod.h"
>  #include "omap_hwmod_common_data.h"
> diff --git a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
> index 77a515b..d05dd2d 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
> @@ -18,7 +18,7 @@
>  #include <linux/platform_data/gpio-omap.h>
>  #include <linux/platform_data/hsmmc-omap.h>
>  #include <linux/platform_data/spi-omap2-mcspi.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include "omap_hwmod_common_data.h"
>  #include "cm81xx.h"
> diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
> index 6b433fc..ad9df86 100644
> --- a/arch/arm/mach-omap2/pdata-quirks.c
> +++ b/arch/arm/mach-omap2/pdata-quirks.c
> @@ -27,7 +27,7 @@
>  #include <linux/platform_data/pwm_omap_dmtimer.h>
>  #include <linux/platform_data/media/ir-rx51.h>
>  #include <linux/platform_data/asoc-ti-mcbsp.h>
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  #include "common.h"
>  #include "common-board-devices.h"
> diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
> index ece09c9..31c1b01 100644
> --- a/arch/arm/mach-omap2/timer.c
> +++ b/arch/arm/mach-omap2/timer.c
> @@ -26,6 +26,7 @@
>   * License. See the file "COPYING" in the main directory of this archive
>   * for more details.
>   */
> +#include <clocksource/dmtimer.h>
>  #include <linux/init.h>
>  #include <linux/time.h>
>  #include <linux/interrupt.h>
> @@ -49,7 +50,6 @@
>  #include "omap_hwmod.h"
>  #include "omap_device.h"
>  #include <plat/counter-32k.h>
> -#include <plat/dmtimer.h>
>  #include "omap-pm.h"
>  
>  #include "soc.h"
> diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
> index 72565fc..afe1dc9 100644
> --- a/arch/arm/plat-omap/dmtimer.c
> +++ b/arch/arm/plat-omap/dmtimer.c
> @@ -47,7 +47,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/platform_data/dmtimer-omap.h>
>  
> -#include <plat/dmtimer.h>
> +#include <clocksource/dmtimer.h>
>  
>  static u32 omap_reserved_systimers;
>  static LIST_HEAD(omap_timer_list);
> diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/include/clocksource/dmtimer.h
> similarity index 100%
> rename from arch/arm/plat-omap/include/plat/dmtimer.h
> rename to include/clocksource/dmtimer.h
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index f1135bf..a07d47cf 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -55,7 +55,7 @@ 
 #include <mach/tc.h>
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include <mach/irqs.h>
 
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
index 8fb1ec6..7c057ab 100644
--- a/arch/arm/mach-omap1/timer.c
+++ b/arch/arm/mach-omap1/timer.c
@@ -27,7 +27,7 @@ 
 #include <linux/platform_device.h>
 #include <linux/platform_data/dmtimer-omap.h>
 
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include "soc.h"
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 1a15a34..45c1043 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -16,7 +16,7 @@ 
 #include <linux/i2c-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/omap-dma.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include "omap_hwmod.h"
 #include "l3_2xxx.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 3801850..892ca58 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -18,7 +18,7 @@ 
 #include <linux/platform_data/hsmmc-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/omap-dma.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include "omap_hwmod.h"
 #include "l3_2xxx.h"
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 beec4cd..82b51c0 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -11,7 +11,7 @@ 
 
 #include <linux/platform_data/gpio-omap.h>
 #include <linux/omap-dma.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
 #include "omap_hwmod.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 9cfba41..2423c51 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -25,7 +25,7 @@ 
 #include "l4_3xxx.h"
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include "soc.h"
 #include "omap_hwmod.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index c477096..22e0e38 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -30,7 +30,7 @@ 
 
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include "omap_hwmod.h"
 #include "omap_hwmod_common_data.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 988e7ea..530334e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -26,7 +26,7 @@ 
 #include <linux/omap-dma.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include "omap_hwmod.h"
 #include "omap_hwmod_common_data.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index d05e553d..adabdef 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -26,7 +26,7 @@ 
 #include <linux/omap-dma.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include "omap_hwmod.h"
 #include "omap_hwmod_common_data.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
index 77a515b..d05dd2d 100644
--- a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
@@ -18,7 +18,7 @@ 
 #include <linux/platform_data/gpio-omap.h>
 #include <linux/platform_data/hsmmc-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include "omap_hwmod_common_data.h"
 #include "cm81xx.h"
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 6b433fc..ad9df86 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -27,7 +27,7 @@ 
 #include <linux/platform_data/pwm_omap_dmtimer.h>
 #include <linux/platform_data/media/ir-rx51.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 #include "common.h"
 #include "common-board-devices.h"
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index ece09c9..31c1b01 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -26,6 +26,7 @@ 
  * License. See the file "COPYING" in the main directory of this archive
  * for more details.
  */
+#include <clocksource/dmtimer.h>
 #include <linux/init.h>
 #include <linux/time.h>
 #include <linux/interrupt.h>
@@ -49,7 +50,6 @@ 
 #include "omap_hwmod.h"
 #include "omap_device.h"
 #include <plat/counter-32k.h>
-#include <plat/dmtimer.h>
 #include "omap-pm.h"
 
 #include "soc.h"
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 72565fc..afe1dc9 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -47,7 +47,7 @@ 
 #include <linux/platform_device.h>
 #include <linux/platform_data/dmtimer-omap.h>
 
-#include <plat/dmtimer.h>
+#include <clocksource/dmtimer.h>
 
 static u32 omap_reserved_systimers;
 static LIST_HEAD(omap_timer_list);
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/include/clocksource/dmtimer.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/dmtimer.h
rename to include/clocksource/dmtimer.h