lkml.org 
[lkml]   [2018]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v11 04/10] clocksource: timer-ti-dm: Replace architecture
    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

    \
     
     \ /
      Last update: 2018-02-22 11:57    [W:2.326 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site