ARM: Merge for-2635-4/watchdog

Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s3c64xx/mach-smdk6410.c
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6440/include/mach/map.h
	arch/arm/mach-s5p6440/mach-smdk6440.c
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/include/mach/map.h
	arch/arm/mach-s5pv210/mach-smdkv210.c

diff --cc arch/arm/mach-s3c64xx/Kconfig
index 11d2353,d0c5743..44a9def
--- 1/arch/arm/mach-s3c64xx/Kconfig
--- 2/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@@ -90,9 -90,10 +90,11 @@@ config MACH_SMDK641
        select S3C_DEV_HSMMC1
        select S3C_DEV_I2C1
        select S3C_DEV_FB
 +      select SAMSUNG_DEV_TS
        select S3C_DEV_USB_HOST
        select S3C_DEV_USB_HSOTG
+       select S3C_DEV_WDT
+       select HAVE_S3C2410_WATCHDOG
        select S3C64XX_SETUP_SDHCI
        select S3C64XX_SETUP_I2C1
        select S3C64XX_SETUP_FB_24BPP

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
index d0c6e9b,c299455..d9a0355
--- 1/arch/arm/mach-s3c64xx/mach-smdk6410.c
--- 2/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@@ -264,8 -262,7 +264,9 @@@ static struct platform_device *smdk6410
        &smdk6410_lcd_powerdev,
  
        &smdk6410_smsc911x,
 +      &s3c_device_adc,
 +      &s3c_device_ts,
+       &s3c_device_wdt,
  };
  
  #ifdef CONFIG_REGULATOR

diff --cc arch/arm/mach-s5p6440/Kconfig
index ef00cb7,d34eda1..f066fae
--- 1/arch/arm/mach-s5p6440/Kconfig
--- 2/arch/arm/mach-s5p6440/Kconfig
+++ b/arch/arm/mach-s5p6440/Kconfig
@@@ -16,8 -16,8 +16,10 @@@ config CPU_S5P644
  config MACH_SMDK6440
        bool "SMDK6440"
        select CPU_S5P6440
 +      select SAMSUNG_DEV_TS
 +      select SAMSUNG_DEV_ADC
+       select S3C_DEV_WDT
+       select HAVE_S3C2410_WATCHDOG
        help
          Machine support for the Samsung SMDK6440
  

diff --cc arch/arm/mach-s5p6440/include/mach/map.h
index d0124f3,049f1b9..44011b9
--- 1/arch/arm/mach-s5p6440/include/mach/map.h
--- 2/arch/arm/mach-s5p6440/include/mach/map.h
+++ b/arch/arm/mach-s5p6440/include/mach/map.h
@@@ -77,6 -72,6 +77,8 @@@
  /* compatibiltiy defines. */
  #define S3C_PA_UART           S5P6440_PA_UART
  #define S3C_PA_IIC            S5P6440_PA_IIC0
+ #define S3C_PA_WDT            S5P6440_PA_WDT
+ 
 +#define SAMSUNG_PA_ADC                S5P6440_PA_ADC
 +
  #endif /* __ASM_ARCH_MAP_H */

diff --cc arch/arm/mach-s5p6440/mach-smdk6440.c
index f994817,af6abc6..8291fec
--- 1/arch/arm/mach-s5p6440/mach-smdk6440.c
--- 2/arch/arm/mach-s5p6440/mach-smdk6440.c
+++ b/arch/arm/mach-s5p6440/mach-smdk6440.c
@@@ -87,16 -85,9 +87,17 @@@ static struct s3c2410_uartcfg smdk6440_
  
  static struct platform_device *smdk6440_devices[] __initdata = {
        &s5p6440_device_iis,
 +      &s3c_device_adc,
 +      &s3c_device_ts,
+       &s3c_device_wdt,
  };
  
 +static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
 +      .delay                  = 10000,
 +      .presc                  = 49,
 +      .oversampling_shift     = 2,
 +};
 +
  static void __init smdk6440_map_io(void)
  {
        s5p_init_io(NULL, 0, S5P_SYS_ID);

diff --cc arch/arm/mach-s5pv210/Kconfig
index 88f81ce,231c485..96f4d9b
--- 1/arch/arm/mach-s5pv210/Kconfig
--- 2/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@@ -66,8 -25,8 +66,10 @@@ config MACH_SMDKV21
        bool "SMDKV210"
        select CPU_S5PV210
        select ARCH_SPARSEMEM_ENABLE
 +      select SAMSUNG_DEV_ADC
 +      select SAMSUNG_DEV_TS
+       select S3C_DEV_WDT
+       select HAVE_S3C2410_WATCHDOG
        help
          Machine support for Samsung SMDKV210
  

diff --cc arch/arm/mach-s5pv210/include/mach/map.h
index 6fb7bfd,1131553..3a44e1e
--- 1/arch/arm/mach-s5pv210/include/mach/map.h
--- 2/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@@ -85,18 -77,9 +87,19 @@@
  /* AC97 */
  #define S5PV210_PA_AC97               0xE2200000
  
 +#define S5PV210_PA_ADC                (0xE1700000)
 +
  /* compatibiltiy defines. */
  #define S3C_PA_UART           S5PV210_PA_UART
 +#define S3C_PA_HSMMC0         S5PV210_PA_HSMMC(0)
 +#define S3C_PA_HSMMC1         S5PV210_PA_HSMMC(1)
 +#define S3C_PA_HSMMC2         S5PV210_PA_HSMMC(2)
  #define S3C_PA_IIC            S5PV210_PA_IIC0
 +#define S3C_PA_IIC1           S5PV210_PA_IIC1
 +#define S3C_PA_IIC2           S5PV210_PA_IIC2
 +#define S3C_PA_FB             S5PV210_PA_FB
+ #define S3C_PA_WDT            S5PV210_PA_WATCHDOG
  
 +#define SAMSUNG_PA_ADC                S5PV210_PA_ADC
 +
  #endif /* __ASM_ARCH_MAP_H */

diff --cc arch/arm/mach-s5pv210/mach-smdkv210.c
index b92beb6,d65ab2a..0d46279
--- 1/arch/arm/mach-s5pv210/mach-smdkv210.c
--- 2/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@@ -76,16 -74,9 +76,17 @@@ static struct s3c2410_uartcfg smdkv210_
  static struct platform_device *smdkv210_devices[] __initdata = {
        &s5pv210_device_iis0,
        &s5pv210_device_ac97,
 +      &s3c_device_adc,
 +      &s3c_device_ts,
+       &s3c_device_wdt,
  };
  
 +static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
 +      .delay                  = 10000,
 +      .presc                  = 49,
 +      .oversampling_shift     = 2,
 +};
 +
  static void __init smdkv210_map_io(void)
  {
        s5p_init_io(NULL, 0, S5P_VA_CHIPID);

diff --cc arch/arm/plat-samsung/Kconfig
Simple merge

diff --cc arch/arm/plat-samsung/Makefile
Simple merge