diff options
| author | Eric Anholt <eric@anholt.net> | 2015-04-23 19:49:11 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-05-14 11:04:17 +0200 |
| commit | 2383321183cf6c1f0e6dcb435c751ef5ebe285a0 (patch) | |
| tree | cdd19c65f40f454a0ff91e06dddf3eb17cb087d0 | |
| parent | Linux 4.1-rc1 (diff) | |
| download | linux-2383321183cf6c1f0e6dcb435c751ef5ebe285a0.tar.xz linux-2383321183cf6c1f0e6dcb435c751ef5ebe285a0.zip | |
ARM: bcm2835: Skip doing our own iotable_init() initialization
The only thing we were using this 16MB mapping of IO peripherals for
was the uart's early debug mapping. If we just drop the map_io hook,
the kernel will call debug_ll_io_init() for us, which maps the single
page needed for the device.
Signed-off-by: Eric Anholt <eric@anholt.net>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | arch/arm/mach-bcm/board_bcm2835.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c index 70f2f3925f0e..9851ee8e5e87 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -31,10 +31,6 @@ #define PM_RSTC_WRCFG_FULL_RESET 0x00000020 #define PM_RSTS_HADWRH_SET 0x00000040 -#define BCM2835_PERIPH_PHYS 0x20000000 -#define BCM2835_PERIPH_VIRT 0xf0000000 -#define BCM2835_PERIPH_SIZE SZ_16M - static void __iomem *wdt_regs; /* @@ -93,18 +89,6 @@ static void bcm2835_power_off(void) bcm2835_restart(REBOOT_HARD, ""); } -static struct map_desc io_map __initdata = { - .virtual = BCM2835_PERIPH_VIRT, - .pfn = __phys_to_pfn(BCM2835_PERIPH_PHYS), - .length = BCM2835_PERIPH_SIZE, - .type = MT_DEVICE -}; - -static void __init bcm2835_map_io(void) -{ - iotable_init(&io_map, 1); -} - static void __init bcm2835_init(void) { int ret; @@ -129,7 +113,6 @@ static const char * const bcm2835_compat[] = { }; DT_MACHINE_START(BCM2835, "BCM2835") - .map_io = bcm2835_map_io, .init_irq = irqchip_init, .init_machine = bcm2835_init, .restart = bcm2835_restart, |