Merge branch 'next-samsung' into for-next

Conflicts:
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/cpu.c
	arch/arm/plat-samsung/include/plat/sdhci.h

5 files changed, 31 insertions, 15 deletions

diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
index 25ca7c686e77..ab038d090764 100644
--- a/arch/arm/mach-s5pc100/Kconfig
+++ b/arch/arm/mach-s5pc100/Kconfig
@@ -49,24 +49,22 @@ config S5PC100_SETUP_SDHCI_GPIO
 config MACH_SMDKC100
         bool "SMDKC100"
         select CPU_S5PC100
-        select SAMSUNG_DEV_ADC
         select S3C_DEV_FB
-        select S3C_DEV_I2C1
-        select SAMSUNG_DEV_IDE
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
-        select SAMSUNG_DEV_KEYPAD
+        select S3C_DEV_I2C1
         select S3C_DEV_RTC
-        select SAMSUNG_DEV_TS
         select S3C_DEV_WDT
-        select HAVE_S3C2410_WATCHDOG
+        select SAMSUNG_DEV_ADC
+        select SAMSUNG_DEV_IDE
+        select SAMSUNG_DEV_KEYPAD
+        select SAMSUNG_DEV_TS
         select S5PC100_SETUP_FB_24BPP
         select S5PC100_SETUP_I2C1
         select S5PC100_SETUP_IDE
         select S5PC100_SETUP_KEYPAD
         select S5PC100_SETUP_SDHCI
-        select HAVE_S3C_RTC
         help
           Machine support for the Samsung SMDKC100
 
diff --git a/arch/arm/mach-s5pc100/dev-audio.c b/arch/arm/mach-s5pc100/dev-audio.c
index 18cfe9ae1936..a699ed6acc23 100644
--- a/arch/arm/mach-s5pc100/dev-audio.c
+++ b/arch/arm/mach-s5pc100/dev-audio.c
@@ -10,11 +10,11 @@
 
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
 #include <plat/audio.h>
 
-#include <mach/gpio.h>
 #include <mach/map.h>
 #include <mach/dma.h>
 #include <mach/irqs.h>
diff --git a/arch/arm/mach-s5pc100/dev-spi.c b/arch/arm/mach-s5pc100/dev-spi.c
index 14618c346057..a0ef7c302c16 100644
--- a/arch/arm/mach-s5pc100/dev-spi.c
+++ b/arch/arm/mach-s5pc100/dev-spi.c
@@ -10,10 +10,10 @@
 
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/gpio.h>
 
 #include <mach/dma.h>
 #include <mach/map.h>
-#include <mach/gpio.h>
 #include <mach/spi-clocks.h>
 
 #include <plat/s3c64xx-spi.h>
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index c018697e79bf..01b9134feff0 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -99,6 +99,10 @@
 
 #define S5PC100_PA_FB           (0xEE000000)
 
+#define S5PC100_PA_FIMC0        (0xEE200000)
+#define S5PC100_PA_FIMC1        (0xEE300000)
+#define S5PC100_PA_FIMC2        (0xEE400000)
+
 #define S5PC100_PA_I2S0         (0xF2000000)
 #define S5PC100_PA_I2S1         (0xF2100000)
 #define S5PC100_PA_I2S2         (0xF2200000)
@@ -148,4 +152,8 @@
 #define SAMSUNG_PA_CFCON        S5PC100_PA_CFCON
 #define SAMSUNG_PA_KEYPAD       S5PC100_PA_KEYPAD
 
+#define S5P_PA_FIMC0            S5PC100_PA_FIMC0
+#define S5P_PA_FIMC1            S5PC100_PA_FIMC1
+#define S5P_PA_FIMC2            S5PC100_PA_FIMC2
+
 #endif /* __ASM_ARCH_C100_MAP_H */
diff --git a/arch/arm/mach-s5pc100/setup-sdhci-gpio.c b/arch/arm/mach-s5pc100/setup-sdhci-gpio.c
index 7769c760c9ef..dc7208c639ea 100644
--- a/arch/arm/mach-s5pc100/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pc100/setup-sdhci-gpio.c
@@ -20,9 +20,11 @@
 
 #include <plat/gpio-cfg.h>
 #include <plat/regs-sdhci.h>
+#include <plat/sdhci.h>
 
 void s5pc100_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
 {
+        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
         unsigned int gpio;
         unsigned int end;
         unsigned int num;
@@ -47,12 +49,15 @@ void s5pc100_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
                 }
         }
 
-        s3c_gpio_setpull(S5PC100_GPG1(2), S3C_GPIO_PULL_UP);
-        s3c_gpio_cfgpin(S5PC100_GPG1(2), S3C_GPIO_SFN(2));
+        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
+                s3c_gpio_setpull(S5PC100_GPG1(2), S3C_GPIO_PULL_UP);
+                s3c_gpio_cfgpin(S5PC100_GPG1(2), S3C_GPIO_SFN(2));
+        }
 }
 
 void s5pc100_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
 {
+        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
         unsigned int gpio;
         unsigned int end;
 
@@ -64,12 +69,15 @@ void s5pc100_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
                 s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
         }
 
-        s3c_gpio_setpull(S5PC100_GPG2(6), S3C_GPIO_PULL_UP);
-        s3c_gpio_cfgpin(S5PC100_GPG2(6), S3C_GPIO_SFN(2));
+        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
+                s3c_gpio_setpull(S5PC100_GPG2(6), S3C_GPIO_PULL_UP);
+                s3c_gpio_cfgpin(S5PC100_GPG2(6), S3C_GPIO_SFN(2));
+        }
 }
 
 void s5pc100_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
 {
+        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
         unsigned int gpio;
         unsigned int end;
 
@@ -81,6 +89,8 @@ void s5pc100_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
                 s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
         }
 
-        s3c_gpio_setpull(S5PC100_GPG3(6), S3C_GPIO_PULL_UP);
-        s3c_gpio_cfgpin(S5PC100_GPG3(6), S3C_GPIO_SFN(2));
+        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
+                s3c_gpio_setpull(S5PC100_GPG3(6), S3C_GPIO_PULL_UP);
+                s3c_gpio_cfgpin(S5PC100_GPG3(6), S3C_GPIO_SFN(2));
+        }
 }