Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b65d1248 authored by Keerthy's avatar Keerthy Committed by Tony Lindgren
Browse files

ARM: OMAP: timer: Wrap the inline functions under OMAP2PLUS define 



Wrap the inline functions under OMAP2PLUS/OMAP1 defines.
This patch also inlines omap_dm_timer_get_fclk function
for non OMAP1 Config.

Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Tested-by: default avatarLadislav Michl <ladis@linux-mips.org>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent fc6db34d

arch/arm/plat-omap/include/plat/dmtimer.h

+16 −1
Original line number Original line Diff line number Diff line
@@ -132,7 +132,16 @@ void omap_dm_timer_disable(struct omap_dm_timer *timer); 
int omap_dm_timer_get_irq(struct omap_dm_timer *timer);

int omap_dm_timer_get_irq(struct omap_dm_timer *timer);





u32 omap_dm_timer_modify_idlect_mask(u32 inputmask);

u32 omap_dm_timer_modify_idlect_mask(u32 inputmask);



#ifndef CONFIG_ARCH_OMAP1

struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer);

struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer);

#else

static inline

struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)

{

	return NULL;

}

#endif





int omap_dm_timer_trigger(struct omap_dm_timer *timer);

int omap_dm_timer_trigger(struct omap_dm_timer *timer);

int omap_dm_timer_start(struct omap_dm_timer *timer);

int omap_dm_timer_start(struct omap_dm_timer *timer);
@@ -272,6 +281,12 @@ int omap_dm_timers_active(void); 
#define OMAP_TIMER_TICK_INT_MASK_COUNT_REG				\

#define OMAP_TIMER_TICK_INT_MASK_COUNT_REG				\

		(_OMAP_TIMER_TICK_INT_MASK_COUNT_OFFSET | (WP_TOWR << WPSHIFT))

		(_OMAP_TIMER_TICK_INT_MASK_COUNT_OFFSET | (WP_TOWR << WPSHIFT))





/*

 * The below are inlined to optimize code size for system timers. Other code

 * should not need these at all, see

 * include/linux/platform_data/pwm_omap_dmtimer.h

 */

#if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2PLUS)

static inline u32 __omap_dm_timer_read(struct omap_dm_timer *timer, u32 reg,

static inline u32 __omap_dm_timer_read(struct omap_dm_timer *timer, u32 reg,

						int posted)

						int posted)

{

{
@@ -410,5 +425,5 @@ static inline void __omap_dm_timer_write_status(struct omap_dm_timer *timer, 
{

{

	writel_relaxed(value, timer->irq_stat);

	writel_relaxed(value, timer->irq_stat);

}

}



#endif /* CONFIG_ARCH_OMAP1 || CONFIG_ARCH_OMAP2PLUS */

#endif /* __ASM_ARCH_DMTIMER_H */
 
#endif /* __ASM_ARCH_DMTIMER_H */