diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
| commit | 8083e1656211eb1487329923d592ee061d08d7b3 (patch) | |
| tree | 92a44787484996b82365fab21f2dec960ab4f2d3 /arch/arm/mach-s3c2410/mach-smdk2413.c | |
| parent | 6b12a3d35ff6cb09f8b777ab258ea1e32c680d62 (diff) | |
| parent | 1802ca745280b916cda4090e459741b8c9b3e8d0 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-smdk2413.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-smdk2413.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-smdk2413.c b/arch/arm/mach-s3c2410/mach-smdk2413.c index b7ef7d3c54a..3a4ca7f6f7b 100644 --- a/arch/arm/mach-s3c2410/mach-smdk2413.c +++ b/arch/arm/mach-s3c2410/mach-smdk2413.c @@ -112,7 +112,20 @@ static void __init smdk2413_machine_init(void) smdk_machine_init(); } -MACHINE_START(S3C2413, "SMDK2413") +MACHINE_START(S3C2413, "S3C2413") + /* Maintainer: Ben Dooks <ben@fluff.org> */ + .phys_io = S3C2410_PA_UART, + .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, + .boot_params = S3C2410_SDRAM_PA + 0x100, + + .fixup = smdk2413_fixup, + .init_irq = s3c24xx_init_irq, + .map_io = smdk2413_map_io, + .init_machine = smdk2413_machine_init, + .timer = &s3c24xx_timer, +MACHINE_END + +MACHINE_START(SMDK2413, "SMDK2413") /* Maintainer: Ben Dooks <ben@fluff.org> */ .phys_io = S3C2410_PA_UART, .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, |