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

Commit f449588c authored by Rob Herring's avatar Rob Herring
Browse files

ARM: ixp4xx: use runtime ioremap hook 



Convert ixp4xx platforms to use run-time ioremap hook instead of the
compile time hook.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
parent 1dfe34ae

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

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static void __init avila_init(void) 
MACHINE_START(AVILA, "Gateworks Avila Network Platform")

	/* Maintainer: Deepak Saxena <dsaxena@plexity.net> */

	.map_io		= ixp4xx_map_io,

	.init_early	= ixp4xx_init_early,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.atag_offset	= 0x100,
@@ -184,6 +185,7 @@ MACHINE_END 
MACHINE_START(LOFT, "Giant Shoulder Inc Loft board")

	/* Maintainer: Tom Billman <kernel@giantshoulderinc.com> */

	.map_io		= ixp4xx_map_io,

	.init_early	= ixp4xx_init_early,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.atag_offset	= 0x100,

arch/arm/mach-ixp4xx/common.c

+33 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#include <mach/udc.h>

#include <mach/hardware.h>

#include <mach/io.h>

#include <asm/uaccess.h>

#include <asm/pgtable.h>

#include <asm/page.h>
@@ -517,3 +518,35 @@ void ixp4xx_restart(char mode, const char *cmd) 
		*IXP4XX_OSWE = IXP4XX_WDT_RESET_ENABLE | IXP4XX_WDT_COUNT_ENABLE;

	}

}



#ifdef CONFIG_IXP4XX_INDIRECT_PCI

/*

 * In the case of using indirect PCI, we simply return the actual PCI

 * address and our read/write implementation use that to drive the

 * access registers. If something outside of PCI is ioremap'd, we

 * fallback to the default.

 */



static void __iomem *ixp4xx_ioremap_caller(unsigned long addr, size_t size,

					   unsigned int mtype, void *caller)

{

	if (!is_pci_memory(addr))

		return __arm_ioremap_caller(addr, size, mtype, caller);



	return (void __iomem *)addr;

}



static void ixp4xx_iounmap(void __iomem *addr)

{

	if (!is_pci_memory((__force u32)addr))

		__iounmap(addr);

}



void __init ixp4xx_init_early(void)

{

	arch_ioremap_caller = ixp4xx_ioremap_caller;

	arch_iounmap = ixp4xx_iounmap;

}

#else

void __init ixp4xx_init_early(void) {}

#endif

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

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ static void __init coyote_init(void) 
MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")

	/* Maintainer: MontaVista Software, Inc. */

	.map_io		= ixp4xx_map_io,

	.init_early	= ixp4xx_init_early,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.atag_offset	= 0x100,
@@ -129,6 +130,7 @@ MACHINE_END 
MACHINE_START(IXDPG425, "Intel IXDPG425")

	/* Maintainer: MontaVista Software, Inc. */

	.map_io		= ixp4xx_map_io,

	.init_early	= ixp4xx_init_early,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.atag_offset	= 0x100,

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

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600 RevA") 
	/* Maintainer: www.nslu2-linux.org */

	.atag_offset	= 0x100,

	.map_io		= ixp4xx_map_io,

	.init_early	= ixp4xx_init_early,

	.init_irq	= ixp4xx_init_irq,

	.timer          = &dsmg600_timer,

	.init_machine	= dsmg600_init,

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

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ static void __init fsg_init(void) 
MACHINE_START(FSG, "Freecom FSG-3")

	/* Maintainer: www.nslu2-linux.org */

	.map_io		= ixp4xx_map_io,

	.init_early	= ixp4xx_init_early,

	.init_irq	= ixp4xx_init_irq,

	.timer		= &ixp4xx_timer,

	.atag_offset	= 0x100,