hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Anholt 2015-04-23 10:49:11 -07:00 committed by Lee Jones
parent b787f68c36
commit 2383321183
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/mach-bcm/board_bcm2835.c
View File

@ -31,10 +31,6 @@
#define PM_RSTC_WRCFG_FULL_RESET 0x00000020 #define PM_RSTC_WRCFG_FULL_RESET 0x00000020
#define PM_RSTS_HADWRH_SET 0x00000040 #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; static void __iomem *wdt_regs;
/* /*
@ -93,18 +89,6 @@ static void bcm2835_power_off(void)
bcm2835_restart(REBOOT_HARD, ""); 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) static void __init bcm2835_init(void)
{ {
int ret; int ret;
@ -129,7 +113,6 @@ static const char * const bcm2835_compat[] = {
}; };
DT_MACHINE_START(BCM2835, "BCM2835") DT_MACHINE_START(BCM2835, "BCM2835")
.map_io = bcm2835_map_io,
.init_irq = irqchip_init, .init_irq = irqchip_init,
.init_machine = bcm2835_init, .init_machine = bcm2835_init,
.restart = bcm2835_restart, .restart = bcm2835_restart,