Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable

[cascardo/linux.git] / arch / arm / mach-s5pv210 / cpu.c

diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 2b776eb..411a4a9 100644 (file)
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -32,6 +32,8 @@
 #include <plat/devs.h>
 #include <plat/clock.h>
 #include <plat/s5pv210.h>
+#include <plat/iic-core.h>
+#include <plat/sdhci.h>
 
 /* Initial IO mappings */
 
@@ -74,7 +76,21 @@ static void s5pv210_idle(void)
 
 void __init s5pv210_map_io(void)
 {
+#ifdef CONFIG_S3C_DEV_ADC
+       s3c_device_adc.name     = "s3c64xx-adc";
+#endif
+
        iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));
+
+       /* initialise device information early */
+       s5pv210_default_sdhci0();
+       s5pv210_default_sdhci1();
+       s5pv210_default_sdhci2();
+
+       /* the i2c devices are directly compatible with s3c2440 */
+       s3c_i2c0_setname("s3c2440-i2c");
+       s3c_i2c1_setname("s3c2440-i2c");
+       s3c_i2c2_setname("s3c2440-i2c");
 }
 
 void __init s5pv210_init_clocks(int xtal)