diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 10:34:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 10:34:31 -0700 |
| commit | 2321fbd2b87539edc1fbfc2e186528a1ef93835f (patch) | |
| tree | cd7d22794eb262b040b6c2f99f9a46d0293935f2 /arch/arm/mach-sa1100/cerf.c | |
| parent | 3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 (diff) | |
| parent | 323cdfc191b7c1597dc748175062c368568d6af4 (diff) | |
| download | kernel-crypto-2321fbd2b87539edc1fbfc2e186528a1ef93835f.tar.gz kernel-crypto-2321fbd2b87539edc1fbfc2e186528a1ef93835f.tar.xz kernel-crypto-2321fbd2b87539edc1fbfc2e186528a1ef93835f.zip | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
Diffstat (limited to 'arch/arm/mach-sa1100/cerf.c')
| -rw-r--r-- | arch/arm/mach-sa1100/cerf.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c index 0aa918e24c3..9484be7dc67 100644 --- a/arch/arm/mach-sa1100/cerf.c +++ b/arch/arm/mach-sa1100/cerf.c @@ -29,6 +29,7 @@ #include <asm/mach/serial_sa1100.h> #include <asm/arch/cerf.h> +#include <asm/arch/mcp.h> #include "generic.h" static struct resource cerfuart2_resources[] = { @@ -116,10 +117,16 @@ static void __init cerf_map_io(void) GPDR |= CERF_GPIO_CF_RESET; } +static struct mcp_plat_data cerf_mcp_data = { + .mccr0 = MCCR0_ADM, + .sclk_rate = 11981000, +}; + static void __init cerf_init(void) { platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices)); sa11x0_set_flash_data(&cerf_flash_data, &cerf_flash_resource, 1); + sa11x0_set_mcp_data(&cerf_mcp_data); } MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube") |