openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2011-04-23 15:28:34 +08:00 committed by Arnd Bergmann
parent 02f8c6aee8
commit 21d08b9d55
54 changed files with 232 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-at91/Makefile
View File

@ -2,7 +2,7 @@
# Makefile for the linux kernel. # Makefile for the linux kernel.
# #
obj-y := irq.o gpio.o obj-y := irq.o gpio.o setup.o
obj-m := obj-m :=
obj-n := obj-n :=
obj- := obj- :=

21
arch/arm/mach-at91/at91cap9.c
View File

@ -25,16 +25,12 @@
#include <mach/at91_rstc.h> #include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h> #include <mach/at91_shdwc.h>
#include "soc.h"
#include "generic.h" #include "generic.h"
#include "clock.h" #include "clock.h"
static struct map_desc at91cap9_io_desc[] __initdata = { static struct map_desc at91cap9_sram_desc[] __initdata = {
{ {
.virtual = AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
.virtual = AT91_IO_VIRT_BASE - AT91CAP9_SRAM_SIZE, .virtual = AT91_IO_VIRT_BASE - AT91CAP9_SRAM_SIZE,
.pfn = __phys_to_pfn(AT91CAP9_SRAM_BASE), .pfn = __phys_to_pfn(AT91CAP9_SRAM_BASE),
.length = AT91CAP9_SRAM_SIZE, .length = AT91CAP9_SRAM_SIZE,
@ -339,14 +335,12 @@ static void at91cap9_poweroff(void)
* AT91CAP9 processor initialization * AT91CAP9 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
void __init at91cap9_map_io(void) static void __init at91cap9_map_io(void)
{ {
/* Map peripherals */ iotable_init(at91cap9_sram_desc, ARRAY_SIZE(at91cap9_sram_desc));
iotable_init(at91cap9_io_desc, ARRAY_SIZE(at91cap9_io_desc));
} }
void __init at91cap9_initialize(unsigned long main_clock) static void __init at91cap9_initialize(unsigned long main_clock)
{
at91_arch_reset = at91cap9_reset; at91_arch_reset = at91cap9_reset;
pm_power_off = at91cap9_poweroff; pm_power_off = at91cap9_poweroff;
at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1); at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
@ -420,3 +414,8 @@ void __init at91cap9_init_interrupts(unsigned int priority[NR_AIC_IRQS])
/* Enable GPIO interrupts */ /* Enable GPIO interrupts */
at91_gpio_irq_setup(); at91_gpio_irq_setup();
} }
struct at91_soc __initdata at91cap9_soc = {
.map_io = at91cap9_map_io,
.init = at91cap9_initialize,
};

15
arch/arm/mach-at91/at91rm9200.c
View File

@ -20,16 +20,12 @@
#include <mach/at91_st.h> #include <mach/at91_st.h>
#include <mach/cpu.h> #include <mach/cpu.h>
#include "soc.h"
#include "generic.h" #include "generic.h"
#include "clock.h" #include "clock.h"
static struct map_desc at91rm9200_io_desc[] __initdata = { static struct map_desc at91rm9200_io_desc[] __initdata = {
{ {
.virtual = AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
.length = SZ_4K,
.type = MT_DEVICE,
}, {
.virtual = AT91_VA_BASE_EMAC, .virtual = AT91_VA_BASE_EMAC,
.pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC), .pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC),
.length = SZ_16K, .length = SZ_16K,
@ -315,13 +311,13 @@ void __init at91rm9200_set_type(int type)
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* AT91RM9200 processor initialization * AT91RM9200 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
void __init at91rm9200_map_io(void) static void __init at91rm9200_map_io(void)
{ {
/* Map peripherals */ /* Map peripherals */
iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc)); iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));
} }
void __init at91rm9200_initialize(unsigned long main_clock) static void __init at91rm9200_initialize(unsigned long main_clock)
{ {
at91_arch_reset = at91rm9200_reset; at91_arch_reset = at91rm9200_reset;
at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1) at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)
@ -394,3 +390,8 @@ void __init at91rm9200_init_interrupts(unsigned int priority[NR_AIC_IRQS])
/* Enable GPIO interrupts */ /* Enable GPIO interrupts */
at91_gpio_irq_setup(); at91_gpio_irq_setup();
} }
struct at91_soc __initdata at91rm9200_soc = {
.map_io = at91rm9200_map_io,
.init = at91rm9200_initialize,
};

22
arch/arm/mach-at91/at91sam9260.c
View File

@ -22,18 +22,10 @@
#include <mach/at91_rstc.h> #include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h> #include <mach/at91_shdwc.h>
#include "soc.h"
#include "generic.h" #include "generic.h"
#include "clock.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 = { static struct map_desc at91sam9260_sram_desc[] __initdata = {
{ {
.virtual = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE, .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)); 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()) if (cpu_is_at91sam9xe())
at91sam9xe_map_io(); at91sam9xe_map_io();
else if (cpu_is_at91sam9g20()) 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)); 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; at91_arch_reset = at91sam9_alt_reset;
pm_power_off = at91sam9260_poweroff; pm_power_off = at91sam9260_poweroff;
@ -432,3 +421,8 @@ void __init at91sam9260_init_interrupts(unsigned int priority[NR_AIC_IRQS])
/* Enable GPIO interrupts */ /* Enable GPIO interrupts */
at91_gpio_irq_setup(); at91_gpio_irq_setup();
} }
struct at91_soc __initdata at91sam9260_soc = {
.map_io = at91sam9260_map_io,
.init = at91sam9260_initialize,
};

22
arch/arm/mach-at91/at91sam9261.c
View File

@ -22,18 +22,10 @@
#include <mach/at91_rstc.h> #include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h> #include <mach/at91_shdwc.h>
#include "soc.h"
#include "generic.h" #include "generic.h"
#include "clock.h" #include "clock.h"
static struct map_desc at91sam9261_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 at91sam9261_sram_desc[] __initdata = { static struct map_desc at91sam9261_sram_desc[] __initdata = {
{ {
.virtual = AT91_IO_VIRT_BASE - AT91SAM9261_SRAM_SIZE, .virtual = AT91_IO_VIRT_BASE - AT91SAM9261_SRAM_SIZE,
@ -302,18 +294,15 @@ static void at91sam9261_poweroff(void)
* AT91SAM9261 processor initialization * AT91SAM9261 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
void __init at91sam9261_map_io(void) static void __init at91sam9261_map_io(void)
{ {
/* Map peripherals */
iotable_init(at91sam9261_io_desc, ARRAY_SIZE(at91sam9261_io_desc));
if (cpu_is_at91sam9g10()) if (cpu_is_at91sam9g10())
iotable_init(at91sam9g10_sram_desc, ARRAY_SIZE(at91sam9g10_sram_desc)); iotable_init(at91sam9g10_sram_desc, ARRAY_SIZE(at91sam9g10_sram_desc));
else else
iotable_init(at91sam9261_sram_desc, ARRAY_SIZE(at91sam9261_sram_desc)); iotable_init(at91sam9261_sram_desc, ARRAY_SIZE(at91sam9261_sram_desc));
} }
void __init at91sam9261_initialize(unsigned long main_clock) static void __init at91sam9261_initialize(unsigned long main_clock)
{ {
at91_arch_reset = at91sam9_alt_reset; at91_arch_reset = at91sam9_alt_reset;
pm_power_off = at91sam9261_poweroff; pm_power_off = at91sam9261_poweroff;
@ -383,3 +372,8 @@ void __init at91sam9261_init_interrupts(unsigned int priority[NR_AIC_IRQS])
/* Enable GPIO interrupts */ /* Enable GPIO interrupts */
at91_gpio_irq_setup(); at91_gpio_irq_setup();
} }
struct at91_soc __initdata at91sam9261_soc = {
.map_io = at91sam9261_map_io,
.init = at91sam9261_initialize,
};

20
arch/arm/mach-at91/at91sam9263.c
View File

@ -21,16 +21,12 @@
#include <mach/at91_rstc.h> #include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h> #include <mach/at91_shdwc.h>
#include "soc.h"
#include "generic.h" #include "generic.h"
#include "clock.h" #include "clock.h"
static struct map_desc at91sam9263_io_desc[] __initdata = { static struct map_desc at91sam9263_sram_desc[] __initdata = {
{ {
.virtual = AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
.virtual = AT91_IO_VIRT_BASE - AT91SAM9263_SRAM0_SIZE, .virtual = AT91_IO_VIRT_BASE - AT91SAM9263_SRAM0_SIZE,
.pfn = __phys_to_pfn(AT91SAM9263_SRAM0_BASE), .pfn = __phys_to_pfn(AT91SAM9263_SRAM0_BASE),
.length = AT91SAM9263_SRAM0_SIZE, .length = AT91SAM9263_SRAM0_SIZE,
@ -313,13 +309,12 @@ static void at91sam9263_poweroff(void)
* AT91SAM9263 processor initialization * AT91SAM9263 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
void __init at91sam9263_map_io(void) static void __init at91sam9263_map_io(void)
{ {
/* Map peripherals */ iotable_init(at91sam9263_sram_desc, ARRAY_SIZE(at91sam9263_sram_desc));
iotable_init(at91sam9263_io_desc, ARRAY_SIZE(at91sam9263_io_desc));
} }
void __init at91sam9263_initialize(unsigned long main_clock) static void __init at91sam9263_initialize(unsigned long main_clock)
{ {
at91_arch_reset = at91sam9_alt_reset; at91_arch_reset = at91sam9_alt_reset;
pm_power_off = at91sam9263_poweroff; pm_power_off = at91sam9263_poweroff;
@ -388,3 +383,8 @@ void __init at91sam9263_init_interrupts(unsigned int priority[NR_AIC_IRQS])
/* Enable GPIO interrupts */ /* Enable GPIO interrupts */
at91_gpio_irq_setup(); at91_gpio_irq_setup();
} }
struct at91_soc __initdata at91sam9263_soc = {
.map_io = at91sam9263_map_io,
.init = at91sam9263_initialize,
};

20
arch/arm/mach-at91/at91sam9g45.c
View File

@ -22,16 +22,12 @@
#include <mach/at91_shdwc.h> #include <mach/at91_shdwc.h>
#include <mach/cpu.h> #include <mach/cpu.h>
#include "soc.h"
#include "generic.h" #include "generic.h"
#include "clock.h" #include "clock.h"
static struct map_desc at91sam9g45_io_desc[] __initdata = { static struct map_desc at91sam9g45_sram_desc[] __initdata = {
{ {
.virtual = AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
.virtual = AT91_IO_VIRT_BASE - AT91SAM9G45_SRAM_SIZE, .virtual = AT91_IO_VIRT_BASE - AT91SAM9G45_SRAM_SIZE,
.pfn = __phys_to_pfn(AT91SAM9G45_SRAM_BASE), .pfn = __phys_to_pfn(AT91SAM9G45_SRAM_BASE),
.length = AT91SAM9G45_SRAM_SIZE, .length = AT91SAM9G45_SRAM_SIZE,
@ -329,13 +325,12 @@ static void at91sam9g45_poweroff(void)
* AT91SAM9G45 processor initialization * AT91SAM9G45 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
void __init at91sam9g45_map_io(void) static void __init at91sam9g45_map_io(void)
{ {
/* Map peripherals */ iotable_init(at91sam9g45_sram_desc, ARRAY_SIZE(at91sam9g45_sram_desc));
iotable_init(at91sam9g45_io_desc, ARRAY_SIZE(at91sam9g45_io_desc));
} }
void __init at91sam9g45_initialize(unsigned long main_clock) static void __init at91sam9g45_initialize(unsigned long main_clock)
{ {
at91_arch_reset = at91sam9g45_reset; at91_arch_reset = at91sam9g45_reset;
pm_power_off = at91sam9g45_poweroff; pm_power_off = at91sam9g45_poweroff;
@ -404,3 +399,8 @@ void __init at91sam9g45_init_interrupts(unsigned int priority[NR_AIC_IRQS])
/* Enable GPIO interrupts */ /* Enable GPIO interrupts */
at91_gpio_irq_setup(); at91_gpio_irq_setup();
} }
struct at91_soc __initdata at91sam9g45_soc = {
.map_io = at91sam9g45_map_io,
.init = at91sam9g45_initialize,
};

22
arch/arm/mach-at91/at91sam9rl.c
View File

@ -21,18 +21,10 @@
#include <mach/at91_rstc.h> #include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h> #include <mach/at91_shdwc.h>
#include "soc.h"
#include "generic.h" #include "generic.h"
#include "clock.h" #include "clock.h"
static struct map_desc at91sam9rl_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 at91sam9rl_sram_desc[] __initdata = { static struct map_desc at91sam9rl_sram_desc[] __initdata = {
{ {
.pfn = __phys_to_pfn(AT91SAM9RL_SRAM_BASE), .pfn = __phys_to_pfn(AT91SAM9RL_SRAM_BASE),
@ -287,13 +279,10 @@ static void at91sam9rl_poweroff(void)
* AT91SAM9RL processor initialization * AT91SAM9RL processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
void __init at91sam9rl_map_io(void) static void __init at91sam9rl_map_io(void)
{ {
unsigned long cidr, sram_size; unsigned long cidr, sram_size;
/* Map peripherals */
iotable_init(at91sam9rl_io_desc, ARRAY_SIZE(at91sam9rl_io_desc));
cidr = at91_sys_read(AT91_DBGU_CIDR); cidr = at91_sys_read(AT91_DBGU_CIDR);
switch (cidr & AT91_CIDR_SRAMSIZ) { switch (cidr & AT91_CIDR_SRAMSIZ) {
@ -312,7 +301,7 @@ void __init at91sam9rl_map_io(void)
iotable_init(at91sam9rl_sram_desc, ARRAY_SIZE(at91sam9rl_sram_desc)); iotable_init(at91sam9rl_sram_desc, ARRAY_SIZE(at91sam9rl_sram_desc));
} }
void __init at91sam9rl_initialize(unsigned long main_clock) static void __init at91sam9rl_initialize(unsigned long main_clock)
{ {
at91_arch_reset = at91sam9_alt_reset; at91_arch_reset = at91sam9_alt_reset;
pm_power_off = at91sam9rl_poweroff; pm_power_off = at91sam9rl_poweroff;
@ -381,3 +370,8 @@ void __init at91sam9rl_init_interrupts(unsigned int priority[NR_AIC_IRQS])
/* Enable GPIO interrupts */ /* Enable GPIO interrupts */
at91_gpio_irq_setup(); at91_gpio_irq_setup();
} }
struct at91_soc __initdata at91sam9rl_soc = {
.map_io = at91sam9rl_map_io,
.init = at91sam9rl_initialize,
};

4
arch/arm/mach-at91/board-1arm.c
View File

@ -46,7 +46,7 @@ static void __init onearm_init_early(void)
at91rm9200_set_type(ARCH_REVISON_9200_PQFP); at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -97,7 +97,7 @@ static void __init onearm_board_init(void)
MACHINE_START(ONEARM, "Ajeco 1ARM single board computer") MACHINE_START(ONEARM, "Ajeco 1ARM single board computer")
/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = onearm_init_early, .init_early = onearm_init_early,
.init_irq = onearm_init_irq, .init_irq = onearm_init_irq,
.init_machine = onearm_board_init, .init_machine = onearm_board_init,

4
arch/arm/mach-at91/board-afeb-9260v1.c
View File

@ -51,7 +51,7 @@
static void __init afeb9260_init_early(void) static void __init afeb9260_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000); at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -219,7 +219,7 @@ static void __init afeb9260_board_init(void)
MACHINE_START(AFEB9260, "Custom afeb9260 board") MACHINE_START(AFEB9260, "Custom afeb9260 board")
/* Maintainer: Sergey Lapin <slapin@ossfans.org> */ /* Maintainer: Sergey Lapin <slapin@ossfans.org> */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = afeb9260_init_early, .init_early = afeb9260_init_early,
.init_irq = afeb9260_init_irq, .init_irq = afeb9260_init_irq,
.init_machine = afeb9260_board_init, .init_machine = afeb9260_board_init,

4
arch/arm/mach-at91/board-cam60.c
View File

@ -48,7 +48,7 @@
static void __init cam60_init_early(void) static void __init cam60_init_early(void)
{ {
/* Initialize processor: 10 MHz crystal */ /* Initialize processor: 10 MHz crystal */
at91sam9260_initialize(10000000); at91_initialize(10000000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -199,7 +199,7 @@ static void __init cam60_board_init(void)
MACHINE_START(CAM60, "KwikByte CAM60") MACHINE_START(CAM60, "KwikByte CAM60")
/* Maintainer: KwikByte */ /* Maintainer: KwikByte */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = cam60_init_early, .init_early = cam60_init_early,
.init_irq = cam60_init_irq, .init_irq = cam60_init_irq,
.init_machine = cam60_board_init, .init_machine = cam60_board_init,

4
arch/arm/mach-at91/board-cap9adk.c
View File

@ -53,7 +53,7 @@
static void __init cap9adk_init_early(void) static void __init cap9adk_init_early(void)
{ {
/* Initialize processor: 12 MHz crystal */ /* Initialize processor: 12 MHz crystal */
at91cap9_initialize(12000000); at91_initialize(12000000);
/* Setup the LEDs: USER1 and USER2 LED for cpu/timer... */ /* Setup the LEDs: USER1 and USER2 LED for cpu/timer... */
at91_init_leds(AT91_PIN_PA10, AT91_PIN_PA11); at91_init_leds(AT91_PIN_PA10, AT91_PIN_PA11);
@ -397,7 +397,7 @@ static void __init cap9adk_board_init(void)
MACHINE_START(AT91CAP9ADK, "Atmel AT91CAP9A-DK") MACHINE_START(AT91CAP9ADK, "Atmel AT91CAP9A-DK")
/* Maintainer: Stelian Pop <stelian.pop@leadtechdesign.com> */ /* Maintainer: Stelian Pop <stelian.pop@leadtechdesign.com> */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91cap9_map_io, .map_io = at91_map_io,
.init_early = cap9adk_init_early, .init_early = cap9adk_init_early,
.init_irq = cap9adk_init_irq, .init_irq = cap9adk_init_irq,
.init_machine = cap9adk_board_init, .init_machine = cap9adk_board_init,

4
arch/arm/mach-at91/board-carmeva.c
View File

@ -43,7 +43,7 @@
static void __init carmeva_init_early(void) static void __init carmeva_init_early(void)
{ {
/* Initialize processor: 20.000 MHz crystal */ /* Initialize processor: 20.000 MHz crystal */
at91rm9200_initialize(20000000); at91_initialize(20000000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -163,7 +163,7 @@ static void __init carmeva_board_init(void)
MACHINE_START(CARMEVA, "Carmeva") MACHINE_START(CARMEVA, "Carmeva")
/* Maintainer: Conitec Datasystems */ /* Maintainer: Conitec Datasystems */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = carmeva_init_early, .init_early = carmeva_init_early,
.init_irq = carmeva_init_irq, .init_irq = carmeva_init_irq,
.init_machine = carmeva_board_init, .init_machine = carmeva_board_init,

4
arch/arm/mach-at91/board-cpu9krea.c
View File

@ -50,7 +50,7 @@
static void __init cpu9krea_init_early(void) static void __init cpu9krea_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000); at91_initialize(18432000);
/* DGBU on ttyS0. (Rx & Tx only) */ /* DGBU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -376,7 +376,7 @@ MACHINE_START(CPUAT9G20, "Eukrea CPU9G20")
#endif #endif
/* Maintainer: Eric Benard - EUKREA Electromatique */ /* Maintainer: Eric Benard - EUKREA Electromatique */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = cpu9krea_init_early, .init_early = cpu9krea_init_early,
.init_irq = cpu9krea_init_irq, .init_irq = cpu9krea_init_irq,
.init_machine = cpu9krea_board_init, .init_machine = cpu9krea_board_init,

4
arch/arm/mach-at91/board-cpuat91.c
View File

@ -57,7 +57,7 @@ static void __init cpuat91_init_early(void)
at91rm9200_set_type(ARCH_REVISON_9200_PQFP); at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -180,7 +180,7 @@ static void __init cpuat91_board_init(void)
MACHINE_START(CPUAT91, "Eukrea") MACHINE_START(CPUAT91, "Eukrea")
/* Maintainer: Eric Benard - EUKREA Electromatique */ /* Maintainer: Eric Benard - EUKREA Electromatique */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = cpuat91_init_early, .init_early = cpuat91_init_early,
.init_irq = cpuat91_init_irq, .init_irq = cpuat91_init_irq,
.init_machine = cpuat91_board_init, .init_machine = cpuat91_board_init,

4
arch/arm/mach-at91/board-csb337.c
View File

@ -46,7 +46,7 @@
static void __init csb337_init_early(void) static void __init csb337_init_early(void)
{ {
/* Initialize processor: 3.6864 MHz crystal */ /* Initialize processor: 3.6864 MHz crystal */
at91rm9200_initialize(3686400); at91_initialize(3686400);
/* Setup the LEDs */ /* Setup the LEDs */
at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1); at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
@ -258,7 +258,7 @@ static void __init csb337_board_init(void)
MACHINE_START(CSB337, "Cogent CSB337") MACHINE_START(CSB337, "Cogent CSB337")
/* Maintainer: Bill Gatliff */ /* Maintainer: Bill Gatliff */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = csb337_init_early, .init_early = csb337_init_early,
.init_irq = csb337_init_irq, .init_irq = csb337_init_irq,
.init_machine = csb337_board_init, .init_machine = csb337_board_init,

4
arch/arm/mach-at91/board-csb637.c
View File

@ -43,7 +43,7 @@
static void __init csb637_init_early(void) static void __init csb637_init_early(void)
{ {
/* Initialize processor: 3.6864 MHz crystal */ /* Initialize processor: 3.6864 MHz crystal */
at91rm9200_initialize(3686400); at91_initialize(3686400);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -139,7 +139,7 @@ static void __init csb637_board_init(void)
MACHINE_START(CSB637, "Cogent CSB637") MACHINE_START(CSB637, "Cogent CSB637")
/* Maintainer: Bill Gatliff */ /* Maintainer: Bill Gatliff */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = csb637_init_early, .init_early = csb637_init_early,
.init_irq = csb637_init_irq, .init_irq = csb637_init_irq,
.init_machine = csb637_board_init, .init_machine = csb637_board_init,

4
arch/arm/mach-at91/board-eb9200.c
View File

@ -43,7 +43,7 @@
static void __init eb9200_init_early(void) static void __init eb9200_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -121,7 +121,7 @@ static void __init eb9200_board_init(void)
MACHINE_START(ATEB9200, "Embest ATEB9200") MACHINE_START(ATEB9200, "Embest ATEB9200")
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = eb9200_init_early, .init_early = eb9200_init_early,
.init_irq = eb9200_init_irq, .init_irq = eb9200_init_irq,
.init_machine = eb9200_board_init, .init_machine = eb9200_board_init,

4
arch/arm/mach-at91/board-ecbat91.c
View File

@ -49,7 +49,7 @@ static void __init ecb_at91init_early(void)
at91rm9200_set_type(ARCH_REVISON_9200_PQFP); at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* Setup the LEDs */ /* Setup the LEDs */
at91_init_leds(AT91_PIN_PC7, AT91_PIN_PC7); at91_init_leds(AT91_PIN_PC7, AT91_PIN_PC7);
@ -173,7 +173,7 @@ static void __init ecb_at91board_init(void)
MACHINE_START(ECBAT91, "emQbit's ECB_AT91") MACHINE_START(ECBAT91, "emQbit's ECB_AT91")
/* Maintainer: emQbit.com */ /* Maintainer: emQbit.com */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = ecb_at91init_early, .init_early = ecb_at91init_early,
.init_irq = ecb_at91init_irq, .init_irq = ecb_at91init_irq,
.init_machine = ecb_at91board_init, .init_machine = ecb_at91board_init,

4
arch/arm/mach-at91/board-eco920.c
View File

@ -35,7 +35,7 @@ static void __init eco920_init_early(void)
/* Set cpu type: PQFP */ /* Set cpu type: PQFP */
at91rm9200_set_type(ARCH_REVISON_9200_PQFP); at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* Setup the LEDs */ /* Setup the LEDs */
at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1); at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
@ -135,7 +135,7 @@ static void __init eco920_board_init(void)
MACHINE_START(ECO920, "eco920") MACHINE_START(ECO920, "eco920")
/* Maintainer: Sascha Hauer */ /* Maintainer: Sascha Hauer */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = eco920_init_early, .init_early = eco920_init_early,
.init_irq = eco920_init_irq, .init_irq = eco920_init_irq,
.init_machine = eco920_board_init, .init_machine = eco920_board_init,

4
arch/arm/mach-at91/board-flexibity.c
View File

@ -40,7 +40,7 @@
static void __init flexibity_init_early(void) static void __init flexibity_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000); at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -155,7 +155,7 @@ static void __init flexibity_board_init(void)
MACHINE_START(FLEXIBITY, "Flexibity Connect") MACHINE_START(FLEXIBITY, "Flexibity Connect")
/* Maintainer: Maxim Osipov */ /* Maintainer: Maxim Osipov */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = flexibity_init_early, .init_early = flexibity_init_early,
.init_irq = flexibity_init_irq, .init_irq = flexibity_init_irq,
.init_machine = flexibity_board_init, .init_machine = flexibity_board_init,

4
arch/arm/mach-at91/board-foxg20.c
View File

@ -60,7 +60,7 @@
static void __init foxg20_init_early(void) static void __init foxg20_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000); at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -267,7 +267,7 @@ static void __init foxg20_board_init(void)
MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20") MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20")
/* Maintainer: Sergio Tanzilli */ /* Maintainer: Sergio Tanzilli */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = foxg20_init_early, .init_early = foxg20_init_early,
.init_irq = foxg20_init_irq, .init_irq = foxg20_init_irq,
.init_machine = foxg20_board_init, .init_machine = foxg20_board_init,

2
arch/arm/mach-at91/board-gsia18s.c
View File

@ -577,7 +577,7 @@ static void __init gsia18s_board_init(void)
MACHINE_START(GSIA18S, "GS_IA18_S") MACHINE_START(GSIA18S, "GS_IA18_S")
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = gsia18s_init_early, .init_early = gsia18s_init_early,
.init_irq = init_irq, .init_irq = init_irq,
.init_machine = gsia18s_board_init, .init_machine = gsia18s_board_init,

4
arch/arm/mach-at91/board-kafa.c
View File

@ -46,7 +46,7 @@ static void __init kafa_init_early(void)
at91rm9200_set_type(ARCH_REVISON_9200_PQFP); at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* Set up the LEDs */ /* Set up the LEDs */
at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4); at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4);
@ -99,7 +99,7 @@ static void __init kafa_board_init(void)
MACHINE_START(KAFA, "Sperry-Sun KAFA") MACHINE_START(KAFA, "Sperry-Sun KAFA")
/* Maintainer: Sergei Sharonov */ /* Maintainer: Sergei Sharonov */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = kafa_init_early, .init_early = kafa_init_early,
.init_irq = kafa_init_irq, .init_irq = kafa_init_irq,
.init_machine = kafa_board_init, .init_machine = kafa_board_init,

4
arch/arm/mach-at91/board-kb9202.c
View File

@ -48,7 +48,7 @@ static void __init kb9202_init_early(void)
at91rm9200_set_type(ARCH_REVISON_9200_PQFP); at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
/* Initialize processor: 10 MHz crystal */ /* Initialize processor: 10 MHz crystal */
at91rm9200_initialize(10000000); at91_initialize(10000000);
/* Set up the LEDs */ /* Set up the LEDs */
at91_init_leds(AT91_PIN_PC19, AT91_PIN_PC18); at91_init_leds(AT91_PIN_PC19, AT91_PIN_PC18);
@ -140,7 +140,7 @@ static void __init kb9202_board_init(void)
MACHINE_START(KB9200, "KB920x") MACHINE_START(KB9200, "KB920x")
/* Maintainer: KwikByte, Inc. */ /* Maintainer: KwikByte, Inc. */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = kb9202_init_early, .init_early = kb9202_init_early,
.init_irq = kb9202_init_irq, .init_irq = kb9202_init_irq,
.init_machine = kb9202_board_init, .init_machine = kb9202_board_init,

4
arch/arm/mach-at91/board-neocore926.c
View File

@ -54,7 +54,7 @@
static void __init neocore926_init_early(void) static void __init neocore926_init_early(void)
{ {
/* Initialize processor: 20 MHz crystal */ /* Initialize processor: 20 MHz crystal */
at91sam9263_initialize(20000000); at91_initialize(20000000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -388,7 +388,7 @@ static void __init neocore926_board_init(void)
MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926") MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926")
/* Maintainer: ADENEO */ /* Maintainer: ADENEO */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9263_map_io, .map_io = at91_map_io,
.init_early = neocore926_init_early, .init_early = neocore926_init_early,
.init_irq = neocore926_init_irq, .init_irq = neocore926_init_irq,
.init_machine = neocore926_board_init, .init_machine = neocore926_board_init,

2
arch/arm/mach-at91/board-pcontrol-g20.c
View File

@ -223,7 +223,7 @@ static void __init pcontrol_g20_board_init(void)
MACHINE_START(PCONTROL_G20, "PControl G20") MACHINE_START(PCONTROL_G20, "PControl G20")
/* Maintainer: pgsellmann@portner-elektronik.at */ /* Maintainer: pgsellmann@portner-elektronik.at */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = pcontrol_g20_init_early, .init_early = pcontrol_g20_init_early,
.init_irq = init_irq, .init_irq = init_irq,
.init_machine = pcontrol_g20_board_init, .init_machine = pcontrol_g20_board_init,

4
arch/arm/mach-at91/board-picotux200.c
View File

@ -46,7 +46,7 @@
static void __init picotux200_init_early(void) static void __init picotux200_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -124,7 +124,7 @@ static void __init picotux200_board_init(void)
MACHINE_START(PICOTUX2XX, "picotux 200") MACHINE_START(PICOTUX2XX, "picotux 200")
/* Maintainer: Kleinhenz Elektronik GmbH */ /* Maintainer: Kleinhenz Elektronik GmbH */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = picotux200_init_early, .init_early = picotux200_init_early,
.init_irq = picotux200_init_irq, .init_irq = picotux200_init_irq,
.init_machine = picotux200_board_init, .init_machine = picotux200_board_init,

4
arch/arm/mach-at91/board-qil-a9260.c
View File

@ -51,7 +51,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 12.000 MHz crystal */ /* Initialize processor: 12.000 MHz crystal */
at91sam9260_initialize(12000000); at91_initialize(12000000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -269,7 +269,7 @@ static void __init ek_board_init(void)
MACHINE_START(QIL_A9260, "CALAO QIL_A9260") MACHINE_START(QIL_A9260, "CALAO QIL_A9260")
/* Maintainer: calao-systems */ /* Maintainer: calao-systems */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-rm9200dk.c
View File

@ -48,7 +48,7 @@
static void __init dk_init_early(void) static void __init dk_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* Setup the LEDs */ /* Setup the LEDs */
at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2); at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
@ -228,7 +228,7 @@ static void __init dk_board_init(void)
MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK") MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
/* Maintainer: SAN People/Atmel */ /* Maintainer: SAN People/Atmel */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = dk_init_early, .init_early = dk_init_early,
.init_irq = dk_init_irq, .init_irq = dk_init_irq,
.init_machine = dk_board_init, .init_machine = dk_board_init,

4
arch/arm/mach-at91/board-rm9200ek.c
View File

@ -48,7 +48,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* Setup the LEDs */ /* Setup the LEDs */
at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2); at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);
@ -194,7 +194,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK") MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
/* Maintainer: SAN People/Atmel */ /* Maintainer: SAN People/Atmel */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-sam9-l9260.c
View File

@ -47,7 +47,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000); at91_initialize(18432000);
/* Setup the LEDs */ /* Setup the LEDs */
at91_init_leds(AT91_PIN_PA9, AT91_PIN_PA6); at91_init_leds(AT91_PIN_PA9, AT91_PIN_PA6);
@ -213,7 +213,7 @@ static void __init ek_board_init(void)
MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260") MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
/* Maintainer: Olimex */ /* Maintainer: Olimex */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-sam9260ek.c
View File

@ -53,7 +53,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000); at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -354,7 +354,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK") MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-sam9261ek.c
View File

@ -57,7 +57,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9261_initialize(18432000); at91_initialize(18432000);
/* Setup the LEDs */ /* Setup the LEDs */
at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14); at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);
@ -621,7 +621,7 @@ MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
#endif #endif
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9261_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-sam9263ek.c
View File

@ -56,7 +56,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 16.367 MHz crystal */ /* Initialize processor: 16.367 MHz crystal */
at91sam9263_initialize(16367660); at91_initialize(16367660);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -452,7 +452,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK") MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9263_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

6
arch/arm/mach-at91/board-sam9g20ek.c
View File

@ -64,7 +64,7 @@ static int inline ek_have_2mmc(void)
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000); at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -404,7 +404,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,
@ -413,7 +413,7 @@ MACHINE_END
MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod") MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-sam9m10g45ek.c
View File

@ -50,7 +50,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 12.000 MHz crystal */ /* Initialize processor: 12.000 MHz crystal */
at91sam9g45_initialize(12000000); at91_initialize(12000000);
/* DGBU on ttyS0. (Rx & Tx only) */ /* DGBU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -422,7 +422,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK") MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9g45_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-sam9rlek.c
View File

@ -41,7 +41,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 12.000 MHz crystal */ /* Initialize processor: 12.000 MHz crystal */
at91sam9rl_initialize(12000000); at91_initialize(12000000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -330,7 +330,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK") MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9rl_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-snapper9260.c
View File

@ -42,7 +42,7 @@
static void __init snapper9260_init_early(void) static void __init snapper9260_init_early(void)
{ {
at91sam9260_initialize(18432000); at91_initialize(18432000);
/* Debug on ttyS0 */ /* Debug on ttyS0 */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -179,7 +179,7 @@ static void __init snapper9260_board_init(void)
MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module") MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = snapper9260_init_early, .init_early = snapper9260_init_early,
.init_irq = snapper9260_init_irq, .init_irq = snapper9260_init_irq,
.init_machine = snapper9260_board_init, .init_machine = snapper9260_board_init,

6
arch/arm/mach-at91/board-stamp9g20.c
View File

@ -35,7 +35,7 @@
void __init stamp9g20_init_early(void) void __init stamp9g20_init_early(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000); at91_initialize(18432000);
/* DGBU on ttyS0. (Rx & Tx only) */ /* DGBU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -299,7 +299,7 @@ static void __init stamp9g20evb_board_init(void)
MACHINE_START(PORTUXG20, "taskit PortuxG20") MACHINE_START(PORTUXG20, "taskit PortuxG20")
/* Maintainer: taskit GmbH */ /* Maintainer: taskit GmbH */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = portuxg20_init_early, .init_early = portuxg20_init_early,
.init_irq = init_irq, .init_irq = init_irq,
.init_machine = portuxg20_board_init, .init_machine = portuxg20_board_init,
@ -308,7 +308,7 @@ MACHINE_END
MACHINE_START(STAMP9G20, "taskit Stamp9G20") MACHINE_START(STAMP9G20, "taskit Stamp9G20")
/* Maintainer: taskit GmbH */ /* Maintainer: taskit GmbH */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = stamp9g20evb_init_early, .init_early = stamp9g20evb_init_early,
.init_irq = init_irq, .init_irq = init_irq,
.init_machine = stamp9g20evb_board_init, .init_machine = stamp9g20evb_board_init,

4
arch/arm/mach-at91/board-usb-a9260.c
View File

@ -51,7 +51,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 12.000 MHz crystal */ /* Initialize processor: 12.000 MHz crystal */
at91sam9260_initialize(12000000); at91_initialize(12000000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -229,7 +229,7 @@ static void __init ek_board_init(void)
MACHINE_START(USB_A9260, "CALAO USB_A9260") MACHINE_START(USB_A9260, "CALAO USB_A9260")
/* Maintainer: calao-systems */ /* Maintainer: calao-systems */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9260_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-usb-a9263.c
View File

@ -50,7 +50,7 @@
static void __init ek_init_early(void) static void __init ek_init_early(void)
{ {
/* Initialize processor: 12.00 MHz crystal */ /* Initialize processor: 12.00 MHz crystal */
at91sam9263_initialize(12000000); at91_initialize(12000000);
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
@ -245,7 +245,7 @@ static void __init ek_board_init(void)
MACHINE_START(USB_A9263, "CALAO USB_A9263") MACHINE_START(USB_A9263, "CALAO USB_A9263")
/* Maintainer: calao-systems */ /* Maintainer: calao-systems */
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = at91sam9263_map_io, .map_io = at91_map_io,
.init_early = ek_init_early, .init_early = ek_init_early,
.init_irq = ek_init_irq, .init_irq = ek_init_irq,
.init_machine = ek_board_init, .init_machine = ek_board_init,

4
arch/arm/mach-at91/board-yl-9200.c
View File

@ -56,7 +56,7 @@ static void __init yl9200_init_early(void)
at91rm9200_set_type(ARCH_REVISON_9200_PQFP); at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000); at91_initialize(18432000);
/* Setup the LEDs D2=PB17 (timer), D3=PB16 (cpu) */ /* Setup the LEDs D2=PB17 (timer), D3=PB16 (cpu) */
at91_init_leds(AT91_PIN_PB16, AT91_PIN_PB17); at91_init_leds(AT91_PIN_PB16, AT91_PIN_PB17);
@ -599,7 +599,7 @@ static void __init yl9200_board_init(void)
MACHINE_START(YL9200, "uCdragon YL-9200") MACHINE_START(YL9200, "uCdragon YL-9200")
/* Maintainer: S.Birtles */ /* Maintainer: S.Birtles */
.timer = &at91rm9200_timer, .timer = &at91rm9200_timer,
.map_io = at91rm9200_map_io, .map_io = at91_map_io,
.init_early = yl9200_init_early, .init_early = yl9200_init_early,
.init_irq = yl9200_init_irq, .init_irq = yl9200_init_irq,
.init_machine = yl9200_board_init, .init_machine = yl9200_board_init,

17
arch/arm/mach-at91/generic.h
View File

@ -11,25 +11,12 @@
#include <linux/clkdev.h> #include <linux/clkdev.h>
/* Map io */ /* Map io */
extern void __init at91rm9200_map_io(void); extern void __init at91_map_io(void);
extern void __init at91sam9260_map_io(void);
extern void __init at91sam9261_map_io(void);
extern void __init at91sam9263_map_io(void);
extern void __init at91sam9rl_map_io(void);
extern void __init at91sam9g45_map_io(void);
extern void __init at91x40_map_io(void);
extern void __init at91cap9_map_io(void);
/* Processors */ /* Processors */
extern void __init at91rm9200_set_type(int type); extern void __init at91rm9200_set_type(int type);
extern void __init at91rm9200_initialize(unsigned long main_clock); extern void __init at91_initialize(unsigned long main_clock);
extern void __init at91sam9260_initialize(unsigned long main_clock);
extern void __init at91sam9261_initialize(unsigned long main_clock);
extern void __init at91sam9263_initialize(unsigned long main_clock);
extern void __init at91sam9rl_initialize(unsigned long main_clock);
extern void __init at91sam9g45_initialize(unsigned long main_clock);
extern void __init at91x40_initialize(unsigned long main_clock); extern void __init at91x40_initialize(unsigned long main_clock);
extern void __init at91cap9_initialize(unsigned long main_clock);
/* Interrupts */ /* Interrupts */
extern void __init at91rm9200_init_interrupts(unsigned int priority[]); extern void __init at91rm9200_init_interrupts(unsigned int priority[]);

1
arch/arm/mach-at91/include/mach/at91cap9.h
View File

@ -75,7 +75,6 @@
#define AT91CAP9_BASE_EMAC 0xfffbc000 #define AT91CAP9_BASE_EMAC 0xfffbc000
#define AT91CAP9_BASE_ADC 0xfffc0000 #define AT91CAP9_BASE_ADC 0xfffc0000
#define AT91CAP9_BASE_ISI 0xfffc4000 #define AT91CAP9_BASE_ISI 0xfffc4000
#define AT91_BASE_SYS 0xffffe200
/* /*
* System Peripherals (offset from AT91_BASE_SYS) * System Peripherals (offset from AT91_BASE_SYS)

1
arch/arm/mach-at91/include/mach/at91rm9200.h
View File

@ -74,7 +74,6 @@
#define AT91RM9200_BASE_SSC1 0xfffd4000 #define AT91RM9200_BASE_SSC1 0xfffd4000
#define AT91RM9200_BASE_SSC2 0xfffd8000 #define AT91RM9200_BASE_SSC2 0xfffd8000
#define AT91RM9200_BASE_SPI 0xfffe0000 #define AT91RM9200_BASE_SPI 0xfffe0000
#define AT91_BASE_SYS 0xfffff000
/* /*

1
arch/arm/mach-at91/include/mach/at91sam9260.h
View File

@ -76,7 +76,6 @@
#define AT91SAM9260_BASE_TC4 0xfffdc040 #define AT91SAM9260_BASE_TC4 0xfffdc040
#define AT91SAM9260_BASE_TC5 0xfffdc080 #define AT91SAM9260_BASE_TC5 0xfffdc080
#define AT91SAM9260_BASE_ADC 0xfffe0000 #define AT91SAM9260_BASE_ADC 0xfffe0000
#define AT91_BASE_SYS 0xffffe800
/* /*
* System Peripherals (offset from AT91_BASE_SYS) * System Peripherals (offset from AT91_BASE_SYS)

1
arch/arm/mach-at91/include/mach/at91sam9261.h
View File

@ -60,7 +60,6 @@
#define AT91SAM9261_BASE_SSC2 0xfffc4000 #define AT91SAM9261_BASE_SSC2 0xfffc4000
#define AT91SAM9261_BASE_SPI0 0xfffc8000 #define AT91SAM9261_BASE_SPI0 0xfffc8000
#define AT91SAM9261_BASE_SPI1 0xfffcc000 #define AT91SAM9261_BASE_SPI1 0xfffcc000
#define AT91_BASE_SYS 0xffffea00
/* /*

1
arch/arm/mach-at91/include/mach/at91sam9263.h
View File

@ -70,7 +70,6 @@
#define AT91SAM9263_BASE_EMAC 0xfffbc000 #define AT91SAM9263_BASE_EMAC 0xfffbc000
#define AT91SAM9263_BASE_ISI 0xfffc4000 #define AT91SAM9263_BASE_ISI 0xfffc4000
#define AT91SAM9263_BASE_2DGE 0xfffc8000 #define AT91SAM9263_BASE_2DGE 0xfffc8000
#define AT91_BASE_SYS 0xffffe000
/* /*
* System Peripherals (offset from AT91_BASE_SYS) * System Peripherals (offset from AT91_BASE_SYS)

1
arch/arm/mach-at91/include/mach/at91sam9g45.h
View File

@ -82,7 +82,6 @@
#define AT91SAM9G45_BASE_TC3 0xfffd4000 #define AT91SAM9G45_BASE_TC3 0xfffd4000
#define AT91SAM9G45_BASE_TC4 0xfffd4040 #define AT91SAM9G45_BASE_TC4 0xfffd4040
#define AT91SAM9G45_BASE_TC5 0xfffd4080 #define AT91SAM9G45_BASE_TC5 0xfffd4080
#define AT91_BASE_SYS 0xffffe200
/* /*
* System Peripherals (offset from AT91_BASE_SYS) * System Peripherals (offset from AT91_BASE_SYS)

1
arch/arm/mach-at91/include/mach/at91sam9rl.h
View File

@ -64,7 +64,6 @@
#define AT91SAM9RL_BASE_TSC 0xfffd0000 #define AT91SAM9RL_BASE_TSC 0xfffd0000
#define AT91SAM9RL_BASE_UDPHS 0xfffd4000 #define AT91SAM9RL_BASE_UDPHS 0xfffd4000
#define AT91SAM9RL_BASE_AC97C 0xfffd8000 #define AT91SAM9RL_BASE_AC97C 0xfffd8000
#define AT91_BASE_SYS 0xffffc000
/* /*

14
arch/arm/mach-at91/include/mach/hardware.h
View File

@ -36,6 +36,20 @@
#error "Unsupported AT91 processor" #error "Unsupported AT91 processor"
#endif #endif
#if !defined(CONFIG_ARCH_AT91X40)
/*
* 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
*
* 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
*/
#define AT91_BASE_SYS 0xffffc000
#endif
/* /*
* Peripheral identifiers/interrupts. * Peripheral identifiers/interrupts.

63
arch/arm/mach-at91/setup.c Normal file
View File

@ -0,0 +1,63 @@
/*
* Copyright (C) 2007 Atmel Corporation.
* Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
*
* Under GPLv2
*/
#include <linux/module.h>
#include <linux/io.h>
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/cpu.h>
#include "soc.h"
#include "generic.h"
struct at91_soc __initdata at91_boot_soc;
static struct map_desc at91_io_desc __initdata = {
.virtual = AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
.length = SZ_16K,
.type = MT_DEVICE,
};
void __init at91_map_io(void)
{
/* Map peripherals */
iotable_init(&at91_io_desc, 1);
if (cpu_is_at91cap9())
at91_boot_soc = at91cap9_soc;
else if (cpu_is_at91rm9200())
at91_boot_soc = at91rm9200_soc;
else if (cpu_is_at91sam9260())
at91_boot_soc = at91sam9260_soc;
else if (cpu_is_at91sam9261())
at91_boot_soc = at91sam9261_soc;
else if (cpu_is_at91sam9263())
at91_boot_soc = at91sam9263_soc;
else if (cpu_is_at91sam9g10())
at91_boot_soc = at91sam9261_soc;
else if (cpu_is_at91sam9g20())
at91_boot_soc = at91sam9260_soc;
else if (cpu_is_at91sam9g45())
at91_boot_soc = at91sam9g45_soc;
else if (cpu_is_at91sam9rl())
at91_boot_soc = at91sam9rl_soc;
else if (cpu_is_at91sam9x5())
at91_boot_soc = at91sam9x5_soc;
else
panic("Impossible to detect the SOC type");
if (at91_boot_soc.map_io)
at91_boot_soc.map_io();
}
void __init at91_initialize(unsigned long main_clock)
{
at91_boot_soc.init(main_clock);
}

20
arch/arm/mach-at91/soc.h Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
*
* Under GPLv2
*/
struct at91_soc {
void (*map_io)(void);
void (*init)(unsigned long main_clock);
};
extern struct at91_soc at91_boot_soc;
extern struct at91_soc at91cap9_soc;
extern struct at91_soc at91rm9200_soc;
extern struct at91_soc at91sam9260_soc;
extern struct at91_soc at91sam9261_soc;
extern struct at91_soc at91sam9263_soc;
extern struct at91_soc at91sam9g45_soc;
extern struct at91_soc at91sam9rl_soc;
extern struct at91_soc at91sam9x5_soc;