diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 19:34:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 19:34:31 +0200 |
| commit | 2321fbd2b87539edc1fbfc2e186528a1ef93835f (patch) | |
| tree | cd7d22794eb262b040b6c2f99f9a46d0293935f2 /arch/arm/mach-sa1100/lart.c | |
| parent | Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff) | |
| parent | [MFD] Add SA11x0 MCP platform device support (diff) | |
| download | linux-2321fbd2b87539edc1fbfc2e186528a1ef93835f.tar.xz linux-2321fbd2b87539edc1fbfc2e186528a1ef93835f.zip | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
Diffstat (limited to 'arch/arm/mach-sa1100/lart.c')
| -rw-r--r-- | arch/arm/mach-sa1100/lart.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c index 870b488aeda4..ed6744d480af 100644 --- a/arch/arm/mach-sa1100/lart.c +++ b/arch/arm/mach-sa1100/lart.c @@ -13,12 +13,23 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/serial_sa1100.h> +#include <asm/arch/mcp.h> #include "generic.h" #warning "include/asm/arch-sa1100/ide.h needs fixing for lart" +static struct mcp_plat_data lart_mcp_data = { + .mccr0 = MCCR0_ADM, + .sclk_rate = 11981000, +}; + +static void __init lart_init(void) +{ + sa11x0_set_mcp_data(&lart_mcp_data); +} + static struct map_desc lart_io_desc[] __initdata = { /* virtual physical length type */ { 0xe8000000, 0x00000000, 0x00400000, MT_DEVICE }, /* main flash memory */ @@ -47,5 +58,6 @@ MACHINE_START(LART, "LART") .boot_params = 0xc0000100, .map_io = lart_map_io, .init_irq = sa1100_init_irq, + .init_machine = lart_init, .timer = &sa1100_timer, MACHINE_END |