at91: introduce commom AT91_BASE_SYS
On all at91 except rm9200 and x40 have the System Controller starts at address 0xffffc000 and has a size of 16KiB. On rm9200 it's start at 0xfffe4000 of 111KiB with non reserved data starting at 0xfffff000 This patch removes the individual definitions of AT91_BASE_SYS and replaces them with a common version at base 0xfffffc000 and size 16KiB and map the same memory space Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
此提交包含在:

提交者
Arnd Bergmann

父節點
02f8c6aee8
當前提交
21d08b9d55
@@ -22,18 +22,10 @@
|
||||
#include <mach/at91_rstc.h>
|
||||
#include <mach/at91_shdwc.h>
|
||||
|
||||
#include "soc.h"
|
||||
#include "generic.h"
|
||||
#include "clock.h"
|
||||
|
||||
static struct map_desc at91sam9260_io_desc[] __initdata = {
|
||||
{
|
||||
.virtual = AT91_VA_BASE_SYS,
|
||||
.pfn = __phys_to_pfn(AT91_BASE_SYS),
|
||||
.length = SZ_16K,
|
||||
.type = MT_DEVICE,
|
||||
}
|
||||
};
|
||||
|
||||
static struct map_desc at91sam9260_sram_desc[] __initdata = {
|
||||
{
|
||||
.virtual = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE,
|
||||
@@ -349,11 +341,8 @@ static void __init at91sam9xe_map_io(void)
|
||||
iotable_init(at91sam9xe_sram_desc, ARRAY_SIZE(at91sam9xe_sram_desc));
|
||||
}
|
||||
|
||||
void __init at91sam9260_map_io(void)
|
||||
static void __init at91sam9260_map_io(void)
|
||||
{
|
||||
/* Map peripherals */
|
||||
iotable_init(at91sam9260_io_desc, ARRAY_SIZE(at91sam9260_io_desc));
|
||||
|
||||
if (cpu_is_at91sam9xe())
|
||||
at91sam9xe_map_io();
|
||||
else if (cpu_is_at91sam9g20())
|
||||
@@ -362,7 +351,7 @@ void __init at91sam9260_map_io(void)
|
||||
iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc));
|
||||
}
|
||||
|
||||
void __init at91sam9260_initialize(unsigned long main_clock)
|
||||
static void __init at91sam9260_initialize(unsigned long main_clock)
|
||||
{
|
||||
at91_arch_reset = at91sam9_alt_reset;
|
||||
pm_power_off = at91sam9260_poweroff;
|
||||
@@ -432,3 +421,8 @@ void __init at91sam9260_init_interrupts(unsigned int priority[NR_AIC_IRQS])
|
||||
/* Enable GPIO interrupts */
|
||||
at91_gpio_irq_setup();
|
||||
}
|
||||
|
||||
struct at91_soc __initdata at91sam9260_soc = {
|
||||
.map_io = at91sam9260_map_io,
|
||||
.init = at91sam9260_initialize,
|
||||
};
|
||||
|
新增問題並參考
封鎖使用者