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

Commit 7cc2e272 authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: more base address cleanup 



remove all redundant peripheral base address defines, fix
all affected boards and drivers.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/2700/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b9581b84

arch/mips/alchemy/common/platform.c

+6 −6
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ static void __init alchemy_setup_usb(int ctype) 
#ifdef CONFIG_FB_AU1100

static struct resource au1100_lcd_resources[] = {

	[0] = {

		.start          = LCD_PHYS_ADDR,

		.end            = LCD_PHYS_ADDR + 0x800 - 1,

		.start          = AU1100_LCD_PHYS_ADDR,

		.end            = AU1100_LCD_PHYS_ADDR + 0x800 - 1,

		.flags          = IORESOURCE_MEM,

	},

	[1] = {
@@ -223,8 +223,8 @@ static struct platform_device au1100_lcd_device = { 


static struct resource au1200_lcd_resources[] = {

	[0] = {

		.start          = LCD_PHYS_ADDR,

		.end            = LCD_PHYS_ADDR + 0x800 - 1,

		.start          = AU1200_LCD_PHYS_ADDR,

		.end            = AU1200_LCD_PHYS_ADDR + 0x800 - 1,

		.flags          = IORESOURCE_MEM,

	},

	[1] = {
@@ -328,8 +328,8 @@ static struct platform_device au1200_mmc1_device = { 
#ifdef SMBUS_PSC_BASE

static struct resource pbdb_smbus_resources[] = {

	{

		.start	= CPHYSADDR(SMBUS_PSC_BASE),

		.end	= CPHYSADDR(SMBUS_PSC_BASE + 0xfffff),

		.start	= SMBUS_PSC_BASE,

		.end	= SMBUS_PSC_BASE + 0xfff,

		.flags	= IORESOURCE_MEM,

	},

};

arch/mips/alchemy/devboards/db1200/platform.c

+24 −28
Original line number Diff line number Diff line
@@ -343,8 +343,8 @@ struct au1xmmc_platform_data au1xmmc_platdata[] = { 


static struct resource au1200_psc0_res[] = {

	[0] = {

		.start	= PSC0_PHYS_ADDR,

		.end	= PSC0_PHYS_ADDR + 0x000fffff,

		.start	= AU1550_PSC0_PHYS_ADDR,

		.end	= AU1550_PSC0_PHYS_ADDR + 0xfff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -401,8 +401,8 @@ static struct platform_device db1200_spi_dev = { 


static struct resource au1200_psc1_res[] = {

	[0] = {

		.start	= PSC1_PHYS_ADDR,

		.end	= PSC1_PHYS_ADDR + 0x000fffff,

		.start	= AU1550_PSC1_PHYS_ADDR,

		.end	= AU1550_PSC1_PHYS_ADDR + 0xfff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -510,32 +510,28 @@ static int __init db1200_dev_init(void) 


	/* Audio PSC clock is supplied externally. (FIXME: platdata!!) */

	__raw_writel(PSC_SEL_CLK_SERCLK,

		(void __iomem *)KSEG1ADDR(PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);

		(void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);

	wmb();



	db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR,

				    PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,

				    PCMCIA_MEM_PHYS_ADDR,

				    PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,

				    PCMCIA_IO_PHYS_ADDR,

				    PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,

				    DB1200_PC0_INT,

				    DB1200_PC0_INSERT_INT,

				    /*DB1200_PC0_STSCHG_INT*/0,

				    DB1200_PC0_EJECT_INT,

				    0);



	db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR + 0x004000000,

				    PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,

				    PCMCIA_MEM_PHYS_ADDR  + 0x004000000,

				    PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,

				    PCMCIA_IO_PHYS_ADDR   + 0x004000000,

				    PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,

				    DB1200_PC1_INT,

				    DB1200_PC1_INSERT_INT,

				    /*DB1200_PC1_STSCHG_INT*/0,

				    DB1200_PC1_EJECT_INT,

				    1);

	db1x_register_pcmcia_socket(

		AU1000_PCMCIA_ATTR_PHYS_ADDR,

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,

		AU1000_PCMCIA_MEM_PHYS_ADDR,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,

		AU1000_PCMCIA_IO_PHYS_ADDR,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,

		DB1200_PC0_INT, DB1200_PC0_INSERT_INT,

		/*DB1200_PC0_STSCHG_INT*/0, DB1200_PC0_EJECT_INT, 0);



	db1x_register_pcmcia_socket(

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,

		DB1200_PC1_INT, DB1200_PC1_INSERT_INT,

		/*DB1200_PC1_STSCHG_INT*/0, DB1200_PC1_EJECT_INT, 1);



	swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1200_SWAPBOOT;

	db1x_register_norflash(64 << 20, 2, swapped);

arch/mips/alchemy/devboards/db1x00/platform.c

+18 −22
Original line number Diff line number Diff line
@@ -88,29 +88,25 @@ 
static int __init db1xxx_dev_init(void)

{

#ifdef DB1XXX_HAS_PCMCIA

	db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR,

				    PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,

				    PCMCIA_MEM_PHYS_ADDR,

				    PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,

				    PCMCIA_IO_PHYS_ADDR,

				    PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,

				    DB1XXX_PCMCIA_CARD0,

				    DB1XXX_PCMCIA_CD0,

				    /*DB1XXX_PCMCIA_STSCHG0*/0,

				    0,

				    0);

	db1x_register_pcmcia_socket(

		AU1000_PCMCIA_ATTR_PHYS_ADDR,

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,

		AU1000_PCMCIA_MEM_PHYS_ADDR,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,

		AU1000_PCMCIA_IO_PHYS_ADDR,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,

		DB1XXX_PCMCIA_CARD0, DB1XXX_PCMCIA_CD0,

		/*DB1XXX_PCMCIA_STSCHG0*/0, 0, 0);



	db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR + 0x004000000,

				    PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,

				    PCMCIA_MEM_PHYS_ADDR  + 0x004000000,

				    PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,

				    PCMCIA_IO_PHYS_ADDR   + 0x004000000,

				    PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,

				    DB1XXX_PCMCIA_CARD1,

				    DB1XXX_PCMCIA_CD1,

				    /*DB1XXX_PCMCIA_STSCHG1*/0,

				    0,

				    1);

	db1x_register_pcmcia_socket(

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,

		DB1XXX_PCMCIA_CARD1, DB1XXX_PCMCIA_CD1,

		/*DB1XXX_PCMCIA_STSCHG1*/0, 0, 1);

#endif

	db1x_register_norflash(BOARD_FLASH_SIZE, BOARD_FLASH_WIDTH, F_SWAPPED);

	return 0;

arch/mips/alchemy/devboards/pb1100/platform.c

+9 −11
Original line number Diff line number Diff line
@@ -30,17 +30,15 @@ static int __init pb1100_dev_init(void) 
	int swapped;



	/* PCMCIA. single socket, identical to Pb1500 */

	db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR,

				    PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,

				    PCMCIA_MEM_PHYS_ADDR,

				    PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,

				    PCMCIA_IO_PHYS_ADDR,

				    PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,

				    AU1100_GPIO11_INT,	 /* card */

				    AU1100_GPIO9_INT,	 /* insert */

				    /*AU1100_GPIO10_INT*/0, /* stschg */

				    0,			 /* eject */

				    0);			 /* id */

	db1x_register_pcmcia_socket(

		AU1000_PCMCIA_ATTR_PHYS_ADDR,

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,

		AU1000_PCMCIA_MEM_PHYS_ADDR,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,

		AU1000_PCMCIA_IO_PHYS_ADDR,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,

		AU1100_GPIO11_INT, AU1100_GPIO9_INT,	 /* card / insert */

		/*AU1100_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */



	swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1000_SWAPBOOT;

	db1x_register_norflash(64 * 1024 * 1024, 4, swapped);

arch/mips/alchemy/devboards/pb1200/platform.c

+19 −23
Original line number Diff line number Diff line
@@ -170,29 +170,25 @@ static int __init board_register_devices(void) 
{

	int swapped;



	db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR,

				    PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,

				    PCMCIA_MEM_PHYS_ADDR,

				    PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,

				    PCMCIA_IO_PHYS_ADDR,

				    PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,

				    PB1200_PC0_INT,

				    PB1200_PC0_INSERT_INT,

				    /*PB1200_PC0_STSCHG_INT*/0,

				    PB1200_PC0_EJECT_INT,

				    0);



	db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR + 0x008000000,

				    PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1,

				    PCMCIA_MEM_PHYS_ADDR  + 0x008000000,

				    PCMCIA_MEM_PHYS_ADDR  + 0x008400000 - 1,

				    PCMCIA_IO_PHYS_ADDR   + 0x008000000,

				    PCMCIA_IO_PHYS_ADDR   + 0x008010000 - 1,

				    PB1200_PC1_INT,

				    PB1200_PC1_INSERT_INT,

				    /*PB1200_PC1_STSCHG_INT*/0,

				    PB1200_PC1_EJECT_INT,

				    1);

	db1x_register_pcmcia_socket(

		AU1000_PCMCIA_ATTR_PHYS_ADDR,

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,

		AU1000_PCMCIA_MEM_PHYS_ADDR,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,

		AU1000_PCMCIA_IO_PHYS_ADDR,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,

		PB1200_PC0_INT, PB1200_PC0_INSERT_INT,

		/*PB1200_PC0_STSCHG_INT*/0, PB1200_PC0_EJECT_INT, 0);



	db1x_register_pcmcia_socket(

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008000000,

		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008000000,

		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008400000 - 1,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008000000,

		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008010000 - 1,

		PB1200_PC1_INT, PB1200_PC1_INSERT_INT,

		/*PB1200_PC1_STSCHG_INT*/0, PB1200_PC1_EJECT_INT, 1);



	swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1200_SWAPBOOT;

	db1x_register_norflash(128 * 1024 * 1024, 2, swapped);