Merge branches 'master' and 'devel' into for-linus

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig

1 files changed, 25 insertions, 4 deletions

diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 411a4a9cbfc7..c7e0b8a65c4a 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -32,8 +32,13 @@
 #include <plat/devs.h>
 #include <plat/clock.h>
 #include <plat/s5pv210.h>
+#include <plat/adc-core.h>
+#include <plat/ata-core.h>
+#include <plat/fimc-core.h>
 #include <plat/iic-core.h>
+#include <plat/keypad-core.h>
 #include <plat/sdhci.h>
+#include <plat/reset.h>
 
 /* Initial IO mappings */
 
@@ -69,6 +74,11 @@ static void s5pv210_idle(void)
         local_irq_enable();
 }
 
+static void s5pv210_sw_reset(void)
+{
+        __raw_writel(0x1, S5P_SWRESET);
+}
+
 /* s5pv210_map_io
  *
  * register the standard cpu IO areas
@@ -76,21 +86,29 @@ 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();
+        s5pv210_default_sdhci3();
+
+        s3c_adc_setname("s3c64xx-adc");
+
+        s3c_cfcon_setname("s5pv210-pata");
+
+        s3c_fimc_setname(0, "s5pv210-fimc");
+        s3c_fimc_setname(1, "s5pv210-fimc");
+        s3c_fimc_setname(2, "s5pv210-fimc");
 
         /* the i2c devices are directly compatible with s3c2440 */
         s3c_i2c0_setname("s3c2440-i2c");
         s3c_i2c1_setname("s3c2440-i2c");
         s3c_i2c2_setname("s3c2440-i2c");
+
+        /* Use s5pv210-keypad instead of samsung-keypad */
+        samsung_keypad_setname("s5pv210-keypad");
 }
 
 void __init s5pv210_init_clocks(int xtal)
@@ -138,5 +156,8 @@ int __init s5pv210_init(void)
         /* set idle function */
         pm_idle = s5pv210_idle;
 
+        /* set sw_reset function */
+        s5p_reset_hook = s5pv210_sw_reset;
+
         return sysdev_register(&s5pv210_sysdev);
 }