diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:34:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:34:31 -0400 |
| commit | 2321fbd2b87539edc1fbfc2e186528a1ef93835f (patch) | |
| tree | cd7d22794eb262b040b6c2f99f9a46d0293935f2 /arch/arm/mach-sa1100/assabet.c | |
| parent | 3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 (diff) | |
| parent | 323cdfc191b7c1597dc748175062c368568d6af4 (diff) | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
Diffstat (limited to 'arch/arm/mach-sa1100/assabet.c')
| -rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index 4d4d303ee3a8..24687f511bf5 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
| 36 | #include <asm/mach/serial_sa1100.h> | 36 | #include <asm/mach/serial_sa1100.h> |
| 37 | #include <asm/arch/assabet.h> | 37 | #include <asm/arch/assabet.h> |
| 38 | #include <asm/arch/mcp.h> | ||
| 38 | 39 | ||
| 39 | #include "generic.h" | 40 | #include "generic.h" |
| 40 | 41 | ||
| @@ -198,6 +199,11 @@ static struct irda_platform_data assabet_irda_data = { | |||
| 198 | .set_speed = assabet_irda_set_speed, | 199 | .set_speed = assabet_irda_set_speed, |
| 199 | }; | 200 | }; |
| 200 | 201 | ||
| 202 | static struct mcp_plat_data assabet_mcp_data = { | ||
| 203 | .mccr0 = MCCR0_ADM, | ||
| 204 | .sclk_rate = 11981000, | ||
| 205 | }; | ||
| 206 | |||
| 201 | static void __init assabet_init(void) | 207 | static void __init assabet_init(void) |
| 202 | { | 208 | { |
| 203 | /* | 209 | /* |
| @@ -246,6 +252,7 @@ static void __init assabet_init(void) | |||
| 246 | sa11x0_set_flash_data(&assabet_flash_data, assabet_flash_resources, | 252 | sa11x0_set_flash_data(&assabet_flash_data, assabet_flash_resources, |
| 247 | ARRAY_SIZE(assabet_flash_resources)); | 253 | ARRAY_SIZE(assabet_flash_resources)); |
| 248 | sa11x0_set_irda_data(&assabet_irda_data); | 254 | sa11x0_set_irda_data(&assabet_irda_data); |
| 255 | sa11x0_set_mcp_data(&assabet_mcp_data); | ||
| 249 | } | 256 | } |
| 250 | 257 | ||
| 251 | /* | 258 | /* |