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

Commit 35b7cf22 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: make 532x UART platform addressing consistent 



If we make all UART addressing consistent across all ColdFire family members
then we will be able to remove the duplicated plaform data and use a single
setup for all.

So modify the ColdFire 532x UART addressing so that:

. UARTs are numbered from 0 up
. use a common name for IRQs used

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

arch/m68k/include/asm/m532xsim.h

+7 −3
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 
#define MCFINT_UART2        28          /* Interrupt number for UART2 */

#define MCFINT_QSPI         31          /* Interrupt number for QSPI */



#define MCF_IRQ_UART0       (MCFINT_VECBASE + MCFINT_UART0)

#define MCF_IRQ_UART1       (MCFINT_VECBASE + MCFINT_UART1)

#define MCF_IRQ_UART2       (MCFINT_VECBASE + MCFINT_UART2)



#define MCF_WTM_WCR	MCF_REG16(0xFC098000)



/*
@@ -82,9 +86,9 @@ 
/*

 *  UART module.

 */

#define MCFUART_BASE1		0xFC060000	/* Base address of UART1 */

#define MCFUART_BASE2		0xFC064000	/* Base address of UART2 */

#define MCFUART_BASE3		0xFC068000	/* Base address of UART3 */

#define MCFUART_BASE0		0xFC060000	/* Base address of UART1 */

#define MCFUART_BASE1		0xFC064000	/* Base address of UART2 */

#define MCFUART_BASE2		0xFC068000	/* Base address of UART3 */



/*

 *  Timer module.

arch/m68k/platform/532x/config.c

+6 −6
Original line number Diff line number Diff line
@@ -35,16 +35,16 @@ 


static struct mcf_platform_uart m532x_uart_platform[] = {

	{

		.mapbase	= MCFUART_BASE1,

		.irq		= MCFINT_VECBASE + MCFINT_UART0,

		.mapbase	= MCFUART_BASE0,

		.irq		= MCF_IRQ_UART0,

	},

	{

		.mapbase 	= MCFUART_BASE2,

		.irq		= MCFINT_VECBASE + MCFINT_UART1,

		.mapbase 	= MCFUART_BASE1,

		.irq		= MCF_IRQ_UART1,

	},

	{

		.mapbase 	= MCFUART_BASE3,

		.irq		= MCFINT_VECBASE + MCFINT_UART2,

		.mapbase 	= MCFUART_BASE2,

		.irq		= MCF_IRQ_UART2,

	},

	{ },

};