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

Commit 9a6b0c73 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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



The ColdFire 527x 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 b62384af

arch/m68k/include/asm/m527xsim.h

+11 −3
Original line number Diff line number Diff line
@@ -63,9 +63,17 @@ 
/*

 *	UART module.

 */

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

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

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

#define MCFUART_BASE1		(MCF_IPSBAR + 0x200)

#define MCFUART_BASE2		(MCF_IPSBAR + 0x240)

#define MCFUART_BASE3		(MCF_IPSBAR + 0x280)



/*

 *	FEC ethernet module.

 */

#define	MCFFEC_BASE0		(MCF_IPSBAR + 0x1000)

#define	MCFFEC_SIZE0		0x800

#define	MCFFEC_BASE1		(MCF_IPSBAR + 0x1800)

#define	MCFFEC_SIZE1		0x800



#ifdef CONFIG_M5271

#define MCFGPIO_PODR_ADDR	(MCF_IPSBAR + 0x100000)

arch/m68knommu/platform/527x/config.c

+7 −7
Original line number Diff line number Diff line
@@ -28,15 +28,15 @@ 


static struct mcf_platform_uart m527x_uart_platform[] = {

	{

		.mapbase	= MCF_MBAR + MCFUART_BASE1,

		.mapbase	= MCFUART_BASE1,

		.irq		= MCFINT_VECBASE + MCFINT_UART0,

	},

	{

		.mapbase 	= MCF_MBAR + MCFUART_BASE2,

		.mapbase 	= MCFUART_BASE2,

		.irq		= MCFINT_VECBASE + MCFINT_UART1,

	},

	{

		.mapbase 	= MCF_MBAR + MCFUART_BASE3,

		.mapbase 	= MCFUART_BASE3,

		.irq		= MCFINT_VECBASE + MCFINT_UART2,

	},

	{ },
@@ -50,8 +50,8 @@ static struct platform_device m527x_uart = { 


static struct resource m527x_fec0_resources[] = {

	{

		.start		= MCF_MBAR + 0x1000,

		.end		= MCF_MBAR + 0x1000 + 0x7ff,

		.start		= MCFFEC_BASE0,

		.end		= MCFFEC_BASE0 + MCFFEC_SIZE0 - 1,

		.flags		= IORESOURCE_MEM,

	},

	{
@@ -73,8 +73,8 @@ static struct resource m527x_fec0_resources[] = { 


static struct resource m527x_fec1_resources[] = {

	{

		.start		= MCF_MBAR + 0x1800,

		.end		= MCF_MBAR + 0x1800 + 0x7ff,

		.start		= MCFFEC_BASE1,

		.end		= MCFFEC_BASE1 + MCFFEC_SIZE1 - 1,

		.flags		= IORESOURCE_MEM,

	},

	{