Commit b62384af authored by Greg Ungerer's avatar Greg Ungerer

m68knommu: remove use of MBAR value for ColdFire 523x peripheral addressing

The ColdFire 523x family of CPUs does not have an MBAR register, so don't
define its peripheral addresses relative to one. Its internal peripherals
are relative to the IPSBAR register, so make sure to use that.
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 571f0608
...@@ -58,10 +58,19 @@ ...@@ -58,10 +58,19 @@
/* /*
* UART module. * UART module.
*/ */
#define MCFUART_BASE1 0x200 /* Base address of UART1 */ #define MCFUART_BASE1 (MCF_IPSBAR + 0x200)
#define MCFUART_BASE2 0x240 /* Base address of UART2 */ #define MCFUART_BASE2 (MCF_IPSBAR + 0x240)
#define MCFUART_BASE3 0x280 /* Base address of UART3 */ #define MCFUART_BASE3 (MCF_IPSBAR + 0x280)
/*
* FEC ethernet module.
*/
#define MCFFEC_BASE (MCF_IPSBAR + 0x1000)
#define MCFFEC_SIZE 0x800
/*
* GPIO module.
*/
#define MCFGPIO_PODR_ADDR (MCF_IPSBAR + 0x100000) #define MCFGPIO_PODR_ADDR (MCF_IPSBAR + 0x100000)
#define MCFGPIO_PODR_DATAH (MCF_IPSBAR + 0x100001) #define MCFGPIO_PODR_DATAH (MCF_IPSBAR + 0x100001)
#define MCFGPIO_PODR_DATAL (MCF_IPSBAR + 0x100002) #define MCFGPIO_PODR_DATAL (MCF_IPSBAR + 0x100002)
......
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
static struct mcf_platform_uart m523x_uart_platform[] = { static struct mcf_platform_uart m523x_uart_platform[] = {
{ {
.mapbase = MCF_MBAR + MCFUART_BASE1, .mapbase = MCFUART_BASE1,
.irq = MCFINT_VECBASE + MCFINT_UART0, .irq = MCFINT_VECBASE + MCFINT_UART0,
}, },
{ {
.mapbase = MCF_MBAR + MCFUART_BASE2, .mapbase = MCFUART_BASE2,
.irq = MCFINT_VECBASE + MCFINT_UART0 + 1, .irq = MCFINT_VECBASE + MCFINT_UART0 + 1,
}, },
{ {
.mapbase = MCF_MBAR + MCFUART_BASE3, .mapbase = MCFUART_BASE3,
.irq = MCFINT_VECBASE + MCFINT_UART0 + 2, .irq = MCFINT_VECBASE + MCFINT_UART0 + 2,
}, },
{ }, { },
...@@ -50,8 +50,8 @@ static struct platform_device m523x_uart = { ...@@ -50,8 +50,8 @@ static struct platform_device m523x_uart = {
static struct resource m523x_fec_resources[] = { static struct resource m523x_fec_resources[] = {
{ {
.start = MCF_MBAR + 0x1000, .start = MCFFEC_BASE,
.end = MCF_MBAR + 0x1000 + 0x7ff, .end = MCFFEC_BASE + MCFFEC_SIZE - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment