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

Commit 755ae860 authored by Jon Hunter's avatar Jon Hunter
Browse files

ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration 



Remove unnecessary declaration of structure omap_dm_timer from dmtimer.h and
move the actual declaration of structure omap_dm_timer towards top of dmtimer.h
to avoid any compilation errors.

Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
parent f88095ba

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

+25 −27
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ struct omap_timer_capability_dev_attr { 
	u32 timer_capability;

};



struct omap_dm_timer;



struct timer_regs {

	u32 tidr;

	u32 tier;
@@ -101,6 +99,31 @@ struct timer_regs { 
	u32 towr;

};



struct omap_dm_timer {

	int id;

	int irq;

	struct clk *fclk;



	void __iomem	*io_base;

	void __iomem	*irq_stat;	/* TISR/IRQSTATUS interrupt status */

	void __iomem	*irq_ena;	/* irq enable */

	void __iomem	*irq_dis;	/* irq disable, only on v2 ip */

	void __iomem	*pend;		/* write pending */

	void __iomem	*func_base;	/* function register base */



	unsigned long rate;

	unsigned reserved:1;

	unsigned posted:1;

	struct timer_regs context;

	int (*get_context_loss_count)(struct device *);

	int ctx_loss_count;

	int revision;

	u32 capability;

	u32 errata;

	struct platform_device *pdev;

	struct list_head node;

};



struct dmtimer_platform_data {

	/* set_timer_src - Only used for OMAP1 devices */

	int (*set_timer_src)(struct platform_device *pdev, int source);
@@ -260,31 +283,6 @@ int omap_dm_timers_active(void); 
#define OMAP_TIMER_TICK_INT_MASK_COUNT_REG				\

		(_OMAP_TIMER_TICK_INT_MASK_COUNT_OFFSET | (WP_TOWR << WPSHIFT))



struct omap_dm_timer {

	int id;

	int irq;

	struct clk *fclk;



	void __iomem	*io_base;

	void __iomem	*irq_stat;	/* TISR/IRQSTATUS interrupt status */

	void __iomem	*irq_ena;	/* irq enable */

	void __iomem	*irq_dis;	/* irq disable, only on v2 ip */

	void __iomem	*pend;		/* write pending */

	void __iomem	*func_base;	/* function register base */



	unsigned long rate;

	unsigned reserved:1;

	unsigned posted:1;

	struct timer_regs context;

	int (*get_context_loss_count)(struct device *);

	int ctx_loss_count;

	int revision;

	u32 capability;

	u32 errata;

	struct platform_device *pdev;

	struct list_head node;

};



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

						int posted)

{