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

Commit e605ecd7 authored by Deepak Saxena's avatar Deepak Saxena Committed by Russell King
Browse files

[ARM] 2834/1: Remove IXP4xx board-specific map_io routines 



Patch from Deepak Saxena

None of the board-specific map_io routines do anything, so kill them.

Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bf4e70e5

arch/arm/mach-ixp4xx/coyote-setup.c

+2 −7
Original line number Diff line number Diff line
@@ -24,11 +24,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/flash.h>



void __init coyote_map_io(void)

{

	ixp4xx_map_io();

}



static struct flash_platform_data coyote_flash_data = {

	.map_name	= "cfi_probe",

	.width		= 2,
@@ -107,7 +102,7 @@ MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote") 
	.phys_ram	= PHYS_OFFSET,

	.phys_io	= IXP4XX_PERIPHERAL_BASE_PHYS,

	.io_pg_offst	= ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

	.map_io		= coyote_map_io,

	.map_io		= ixp4xx_map_io,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.boot_params	= 0x0100,
@@ -125,7 +120,7 @@ MACHINE_START(IXDPG425, "Intel IXDPG425") 
	.phys_ram	= PHYS_OFFSET,

	.phys_io	= IXP4XX_PERIPHERAL_BASE_PHYS,

	.io_pg_offst	= ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

	.map_io		= coyote_map_io,

	.map_io		= ixp4xx_map_io,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.boot_params	= 0x0100,

arch/arm/mach-ixp4xx/gtwx5715-setup.c

+1 −7
Original line number Diff line number Diff line
@@ -101,12 +101,6 @@ static struct platform_device gtwx5715_uart_device = { 
	.resource	= gtwx5715_uart_resources,

};





void __init gtwx5715_map_io(void)

{

	ixp4xx_map_io();

}



static struct flash_platform_data gtwx5715_flash_data = {

	.map_name	= "cfi_probe",

	.width		= 2,
@@ -144,7 +138,7 @@ MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)") 
	.phys_ram	= PHYS_OFFSET,

	.phys_io	= IXP4XX_UART2_BASE_PHYS,

	.io_pg_offst	= ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,

	.map_io		= gtwx5715_map_io,

	.map_io		= ixp4xx_map_io,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.boot_params	= 0x0100,

arch/arm/mach-ixp4xx/ixdp425-setup.c

+4 −9
Original line number Diff line number Diff line
@@ -24,11 +24,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/flash.h>



void __init ixdp425_map_io(void) 

{

	ixp4xx_map_io();

}



static struct flash_platform_data ixdp425_flash_data = {

	.map_name	= "cfi_probe",

	.width		= 2,
@@ -133,7 +128,7 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") 
	.phys_ram	= PHYS_OFFSET,

	.phys_io	= IXP4XX_PERIPHERAL_BASE_PHYS,

	.io_pg_offst	= ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

	.map_io		= ixdp425_map_io,

	.map_io		= ixp4xx_map_io,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.boot_params	= 0x0100,
@@ -145,7 +140,7 @@ MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") 
	.phys_ram	= PHYS_OFFSET,

	.phys_io	= IXP4XX_PERIPHERAL_BASE_PHYS,

	.io_pg_offst	= ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

	.map_io		= ixdp425_map_io,

	.map_io		= ixp4xx_map_io,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.boot_params	= 0x0100,
@@ -157,7 +152,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") 
	.phys_ram	= PHYS_OFFSET,

	.phys_io	= IXP4XX_PERIPHERAL_BASE_PHYS,

	.io_pg_offst	= ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

	.map_io		= ixdp425_map_io,

	.map_io		= ixp4xx_map_io,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.boot_params	= 0x0100,
@@ -176,7 +171,7 @@ MACHINE_START(AVILA, "Gateworks Avila Network Platform") 
	.phys_ram	= PHYS_OFFSET,

	.phys_io	= IXP4XX_PERIPHERAL_BASE_PHYS,

	.io_pg_offst	= ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

	.map_io		= ixdp425_map_io,

	.map_io		= ixp4xx_map_io,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.boot_params	= 0x0100,