| Message ID | 1518674511-26421-5-git-send-email-j-keerthy@ti.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | omap: dmtimer: Move driver out of plat-omap | expand |
On Thu, Feb 15, 2018 at 11:31:45AM +0530, Keerthy wrote: > Replace architecture specific guard with clocksource guard. > > Signed-off-by: Keerthy <j-keerthy@ti.com> > Replace architecture specific defines with clocksource This looks like a bit unussual commit log. Also, what about merging it with previous patch? Btw, I tested whole serie again on the top of today's -next and it is still working fine. What is preventing these patches from being merged? Thank you, ladis > --- > include/clocksource/timer-ti-dm.h | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/include/clocksource/timer-ti-dm.h b/include/clocksource/timer-ti-dm.h > index 831174f..4f31095 100644 > --- a/include/clocksource/timer-ti-dm.h > +++ b/include/clocksource/timer-ti-dm.h > @@ -1,6 +1,4 @@ > /* > - * arch/arm/plat-omap/include/plat/dmtimer.h > - * > * OMAP Dual-Mode Timers > * > * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ > @@ -36,8 +34,8 @@ > #include <linux/io.h> > #include <linux/platform_device.h> > > -#ifndef __ASM_ARCH_DMTIMER_H > -#define __ASM_ARCH_DMTIMER_H > +#ifndef __CLOCKSOURCE_DMTIMER_H > +#define __CLOCKSOURCE_DMTIMER_H > > /* clock sources */ > #define OMAP_TIMER_SRC_SYS_CLK 0x00 > @@ -426,4 +424,4 @@ static inline void __omap_dm_timer_write_status(struct omap_dm_timer *timer, > writel_relaxed(value, timer->irq_stat); > } > #endif /* CONFIG_ARCH_OMAP1 || CONFIG_ARCH_OMAP2PLUS */ > -#endif /* __ASM_ARCH_DMTIMER_H */ > +#endif /* __CLOCKSOURCE_DMTIMER_H */ > -- > 1.9.1 -- 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
* Ladislav Michl <ladis@linux-mips.org> [180222 10:58]: > On Thu, Feb 15, 2018 at 11:31:45AM +0530, Keerthy wrote: > > Replace architecture specific guard with clocksource guard. > > > > Signed-off-by: Keerthy <j-keerthy@ti.com> > > Replace architecture specific defines with clocksource > > This looks like a bit unussual commit log. Also, what about merging > it with previous patch? I'll just remove that line locally to avoid yet another set of patches being posted :) > Btw, I tested whole serie again on the top of today's -next and it is > still working fine. What is preventing these patches from being merged? Well I noticed we need a fix for omap1 that I just posted. And patch 4/10 needs the following select for omap16xx that I'll fold in. I'll push it all to omap-for-v4.17/timer and will merge into my for-next after some more testing. It seems any further patching can be done after move to drivers. Regards, Tony 8< ----------------- --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -30,6 +30,7 @@ config ARCH_OMAP16XX bool "OMAP16xx Based System" select ARCH_OMAP_OTG select CPU_ARM926T + select OMAP_DM_TIMER config OMAP_MUX bool "OMAP multiplexing support" -- 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
On Friday 23 February 2018 12:15 AM, Tony Lindgren wrote: > * Ladislav Michl <ladis@linux-mips.org> [180222 10:58]: >> On Thu, Feb 15, 2018 at 11:31:45AM +0530, Keerthy wrote: >>> Replace architecture specific guard with clocksource guard. >>> >>> Signed-off-by: Keerthy <j-keerthy@ti.com> >>> Replace architecture specific defines with clocksource >> >> This looks like a bit unussual commit log. Also, what about merging >> it with previous patch? > > I'll just remove that line locally to avoid yet another set > of patches being posted :) Thanks! > >> Btw, I tested whole serie again on the top of today's -next and it is >> still working fine. What is preventing these patches from being merged? Ladis, Thanks once again. > > Well I noticed we need a fix for omap1 that I just posted. > And patch 4/10 needs the following select for omap16xx that > I'll fold in. > > I'll push it all to omap-for-v4.17/timer and will merge into > my for-next after some more testing. It seems any further > patching can be done after move to drivers. Yes that would be great. > > Regards, > > Tony > > 8< ----------------- > --- a/arch/arm/mach-omap1/Kconfig > +++ b/arch/arm/mach-omap1/Kconfig > @@ -30,6 +30,7 @@ config ARCH_OMAP16XX > bool "OMAP16xx Based System" > select ARCH_OMAP_OTG > select CPU_ARM926T > + select OMAP_DM_TIMER > > config OMAP_MUX > bool "OMAP multiplexing support" > -- 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
diff --git a/include/clocksource/timer-ti-dm.h b/include/clocksource/timer-ti-dm.h index 831174f..4f31095 100644 --- a/include/clocksource/timer-ti-dm.h +++ b/include/clocksource/timer-ti-dm.h @@ -1,6 +1,4 @@ /* - * arch/arm/plat-omap/include/plat/dmtimer.h - * * OMAP Dual-Mode Timers * * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ @@ -36,8 +34,8 @@ #include <linux/io.h> #include <linux/platform_device.h> -#ifndef __ASM_ARCH_DMTIMER_H -#define __ASM_ARCH_DMTIMER_H +#ifndef __CLOCKSOURCE_DMTIMER_H +#define __CLOCKSOURCE_DMTIMER_H /* clock sources */ #define OMAP_TIMER_SRC_SYS_CLK 0x00 @@ -426,4 +424,4 @@ static inline void __omap_dm_timer_write_status(struct omap_dm_timer *timer, writel_relaxed(value, timer->irq_stat); } #endif /* CONFIG_ARCH_OMAP1 || CONFIG_ARCH_OMAP2PLUS */ -#endif /* __ASM_ARCH_DMTIMER_H */ +#endif /* __CLOCKSOURCE_DMTIMER_H */
Replace architecture specific guard with clocksource guard. Signed-off-by: Keerthy <j-keerthy@ti.com> Replace architecture specific defines with clocksource --- include/clocksource/timer-ti-dm.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)