Commit 944c3d81 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: clean up ColdFire 54xx General Timer definitions 



Convert the ColdFire 54xx CPU General Timer register address definitions to
include the MCF_MBAR peripheral region offset. This makes them consistent
with all other 54xx address register definitions (in m54xxsim.h).

The goal is to reduce different definitions used (some including offsets and
others not) causing bugs when used incorrectly.

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

arch/m68k/include/asm/m54xxgpt.h

+20 −20
Original line number Diff line number Diff line
@@ -16,26 +16,26 @@ 
*********************************************************************/



/* Register read/write macros */

#define MCF_GPT_GMS0       0x000800

#define MCF_GPT_GCIR0      0x000804

#define MCF_GPT_GPWM0      0x000808

#define MCF_GPT_GSR0       0x00080C

#define MCF_GPT_GMS1       0x000810

#define MCF_GPT_GCIR1      0x000814

#define MCF_GPT_GPWM1      0x000818

#define MCF_GPT_GSR1       0x00081C

#define MCF_GPT_GMS2       0x000820

#define MCF_GPT_GCIR2      0x000824

#define MCF_GPT_GPWM2      0x000828

#define MCF_GPT_GSR2       0x00082C

#define MCF_GPT_GMS3       0x000830

#define MCF_GPT_GCIR3      0x000834

#define MCF_GPT_GPWM3      0x000838

#define MCF_GPT_GSR3       0x00083C

#define MCF_GPT_GMS(x)     (0x000800+((x)*0x010))

#define MCF_GPT_GCIR(x)    (0x000804+((x)*0x010))

#define MCF_GPT_GPWM(x)    (0x000808+((x)*0x010))

#define MCF_GPT_GSR(x)     (0x00080C+((x)*0x010))

#define MCF_GPT_GMS0       (MCF_MBAR + 0x000800)

#define MCF_GPT_GCIR0      (MCF_MBAR + 0x000804)

#define MCF_GPT_GPWM0      (MCF_MBAR + 0x000808)

#define MCF_GPT_GSR0       (MCF_MBAR + 0x00080C)

#define MCF_GPT_GMS1       (MCF_MBAR + 0x000810)

#define MCF_GPT_GCIR1      (MCF_MBAR + 0x000814)

#define MCF_GPT_GPWM1      (MCF_MBAR + 0x000818)

#define MCF_GPT_GSR1       (MCF_MBAR + 0x00081C)

#define MCF_GPT_GMS2       (MCF_MBAR + 0x000820)

#define MCF_GPT_GCIR2      (MCF_MBAR + 0x000824)

#define MCF_GPT_GPWM2      (MCF_MBAR + 0x000828)

#define MCF_GPT_GSR2       (MCF_MBAR + 0x00082C)

#define MCF_GPT_GMS3       (MCF_MBAR + 0x000830)

#define MCF_GPT_GCIR3      (MCF_MBAR + 0x000834)

#define MCF_GPT_GPWM3      (MCF_MBAR + 0x000838)

#define MCF_GPT_GSR3       (MCF_MBAR + 0x00083C)

#define MCF_GPT_GMS(x)     (MCF_MBAR + 0x000800 + ((x) * 0x010))

#define MCF_GPT_GCIR(x)    (MCF_MBAR + 0x000804 + ((x) * 0x010))

#define MCF_GPT_GPWM(x)    (MCF_MBAR + 0x000808 + ((x) * 0x010))

#define MCF_GPT_GSR(x)     (MCF_MBAR + 0x00080C + ((x) * 0x010))



/* Bit definitions and macros for MCF_GPT_GMS */

#define MCF_GPT_GMS_TMS(x)         (((x)&0x00000007)<<0)

arch/m68k/platform/coldfire/m54xx.c

+3 −3
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ static void mcf54xx_reset(void) 
{

	/* disable interrupts and enable the watchdog */

	asm("movew #0x2700, %sr\n");

	__raw_writel(0, MCF_MBAR + MCF_GPT_GMS0);

	__raw_writel(MCF_GPT_GCIR_CNT(1), MCF_MBAR + MCF_GPT_GCIR0);

	__raw_writel(0, MCF_GPT_GMS0);

	__raw_writel(MCF_GPT_GCIR_CNT(1), MCF_GPT_GCIR0);

	__raw_writel(MCF_GPT_GMS_WDEN | MCF_GPT_GMS_CE | MCF_GPT_GMS_TMS(4),

						MCF_MBAR + MCF_GPT_GMS0);

		MCF_GPT_GMS0);

}



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

drivers/watchdog/m54xx_wdt.c

+10 −11
Original line number Diff line number Diff line
@@ -46,17 +46,17 @@ static void wdt_enable(void) 
	unsigned int gms0;



	/* preserve GPIO usage, if any */

	gms0 = __raw_readl(MCF_MBAR + MCF_GPT_GMS0);

	gms0 = __raw_readl(MCF_GPT_GMS0);

	if (gms0 & MCF_GPT_GMS_TMS_GPIO)

		gms0 &= (MCF_GPT_GMS_TMS_GPIO | MCF_GPT_GMS_GPIO_MASK

							| MCF_GPT_GMS_OD);

	else

		gms0 = MCF_GPT_GMS_TMS_GPIO | MCF_GPT_GMS_OD;

	__raw_writel(gms0, MCF_MBAR + MCF_GPT_GMS0);

	__raw_writel(gms0, MCF_GPT_GMS0);

	__raw_writel(MCF_GPT_GCIR_PRE(heartbeat*(MCF_BUSCLK/0xffff)) |

			MCF_GPT_GCIR_CNT(0xffff), MCF_MBAR + MCF_GPT_GCIR0);

			MCF_GPT_GCIR_CNT(0xffff), MCF_GPT_GCIR0);

	gms0 |= MCF_GPT_GMS_OCPW(0xA5) | MCF_GPT_GMS_WDEN | MCF_GPT_GMS_CE;

	__raw_writel(gms0, MCF_MBAR + MCF_GPT_GMS0);

	__raw_writel(gms0, MCF_GPT_GMS0);

}



static void wdt_disable(void)
@@ -64,18 +64,18 @@ static void wdt_disable(void) 
	unsigned int gms0;



	/* disable watchdog */

	gms0 = __raw_readl(MCF_MBAR + MCF_GPT_GMS0);

	gms0 = __raw_readl(MCF_GPT_GMS0);

	gms0 &= ~(MCF_GPT_GMS_WDEN | MCF_GPT_GMS_CE);

	__raw_writel(gms0, MCF_MBAR + MCF_GPT_GMS0);

	__raw_writel(gms0, MCF_GPT_GMS0);

}



static void wdt_keepalive(void)

{

	unsigned int gms0;



	gms0 = __raw_readl(MCF_MBAR + MCF_GPT_GMS0);

	gms0 = __raw_readl(MCF_GPT_GMS0);

	gms0 |= MCF_GPT_GMS_OCPW(0xA5);

	__raw_writel(gms0, MCF_MBAR + MCF_GPT_GMS0);

	__raw_writel(gms0, MCF_GPT_GMS0);

}



static int m54xx_wdt_open(struct inode *inode, struct file *file)
@@ -195,8 +195,7 @@ static struct miscdevice m54xx_wdt_miscdev = { 


static int __init m54xx_wdt_init(void)

{

	if (!request_mem_region(MCF_MBAR + MCF_GPT_GCIR0, 4,

						"Coldfire M54xx Watchdog")) {

	if (!request_mem_region(MCF_GPT_GCIR0, 4, "Coldfire M54xx Watchdog")) {

		pr_warn("I/O region busy\n");

		return -EBUSY;

	}
@@ -208,7 +207,7 @@ static int __init m54xx_wdt_init(void) 
static void __exit m54xx_wdt_exit(void)

{

	misc_deregister(&m54xx_wdt_miscdev);

	release_mem_region(MCF_MBAR + MCF_GPT_GCIR0, 4);

	release_mem_region(MCF_GPT_GCIR0, 4);

}



module_init(m54xx_wdt_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE