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

Commit f2f41c68 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: move ColdFire slice timer address defiens to 54xx header 



Move the base address defines of the ColdFire 54xx CPU slice timers into the
54xx specific header (m54xxsim.h). They are CPU specific, and belong with the
CPU specific defines. Also make them relative to the MBAR peripheral region,
making the define the absolute address.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 6d8a1393

arch/m68k/include/asm/m54xxsim.h

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,12 @@ 
#define MCF_IRQ_UART2		(MCFINT_VECBASE + 33)

#define MCF_IRQ_UART3		(MCFINT_VECBASE + 32)



/*

 *	Slice Timer support.

 */

#define MCFSLT_TIMER0		(MCF_MBAR + 0x900)	/* Base addr TIMER0 */

#define MCFSLT_TIMER1		(MCF_MBAR + 0x910)	/* Base addr TIMER1 */



/*

 *	Generic GPIO support

 */

arch/m68k/include/asm/mcfslt.h

+0 −7
Original line number Diff line number Diff line
@@ -12,13 +12,6 @@ 
#define mcfslt_h

/****************************************************************************/



/*

 *	Get address specific defines for the 547x.

 */

#define MCFSLT_TIMER0		0x900	/* Base address of TIMER0 */

#define MCFSLT_TIMER1		0x910	/* Base address of TIMER1 */





/*

 *	Define the SLT timer register set addresses.

 */

arch/m68k/platform/coldfire/sltimers.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
/*

 *	By default use Slice Timer 1 as the profiler clock timer.

 */

#define	PA(a)	(MCF_MBAR + MCFSLT_TIMER1 + (a))

#define	PA(a)	(MCFSLT_TIMER1 + (a))



/*

 *	Choose a reasonably fast profile timer. Make it an odd value to
@@ -76,7 +76,7 @@ void mcfslt_profile_init(void) 
/*

 *	By default use Slice Timer 0 as the system clock timer.

 */

#define	TA(a)	(MCF_MBAR + MCFSLT_TIMER0 + (a))

#define	TA(a)	(MCFSLT_TIMER0 + (a))



static u32 mcfslt_cycles_per_jiffy;

static u32 mcfslt_cnt;