summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-09-06 19:03:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-06 19:03:31 +0100
commit3142afb568d266765bde94f90b0dfee7e5cb08ce (patch)
treed3b24f1fcc1eb8157c956b5b6e2b11cea8d7b574
parentf854d37ab6b74f5a2d768d28e9583bc2991692c1 (diff)
downloadlinux-3.10-3142afb568d266765bde94f90b0dfee7e5cb08ce.tar.gz
linux-3.10-3142afb568d266765bde94f90b0dfee7e5cb08ce.tar.bz2
linux-3.10-3142afb568d266765bde94f90b0dfee7e5cb08ce.zip
[ARM] 3774/1: S3C24XX: SMDK2413 has two machine IDs
Patch from Ben Dooks It turns out we have both SMDK2413 and S3C2413 for the same board. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-s3c2410/mach-smdk2413.c15
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,