Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

* 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Invert VCLK polarity for framebuffer on ORIGEN
  ARM: S3C64XX: Fix interrupt configuration for PCA935x on Cragganmore
  ARM: S3C64XX: Fix the memory mapped GPIOs on Cragganmore
  ARM: S3C64XX: Remove hsmmc1 from Cragganmore
  ARM: S3C64XX: Remove unconditional power domain disables
  ARM: SAMSUNG: Declare struct platform_device in plat/s3c64xx-spi.h
  ARM: SAMSUNG: dma-ops.h needs mach/dma.h
  ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h

1 files changed, 3 insertions, 10 deletions

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 1cc91d794c97..8077f650eb0e 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -260,6 +260,7 @@ static struct platform_device crag6410_dm9k_device = {
 
 static struct resource crag6410_mmgpio_resource[] = {
         [0] = {
+                .name   = "dat",
                 .start  = S3C64XX_PA_XM0CSN4 + 1,
                 .end    = S3C64XX_PA_XM0CSN4 + 1,
                 .flags  = IORESOURCE_MEM,
@@ -272,7 +273,7 @@ static struct platform_device crag6410_mmgpio = {
         .resource       = crag6410_mmgpio_resource,
         .num_resources  = ARRAY_SIZE(crag6410_mmgpio_resource),
         .dev.platform_data = &(struct bgpio_pdata) {
-                .base   = -1,
+                .base   = MMGPIO_GPIO_BASE,
         },
 };
 
@@ -328,7 +329,6 @@ static struct platform_device wallvdd_device = {
 
 static struct platform_device *crag6410_devices[] __initdata = {
         &s3c_device_hsmmc0,
-        &s3c_device_hsmmc1,
         &s3c_device_hsmmc2,
         &s3c_device_i2c0,
         &s3c_device_i2c1,
@@ -355,7 +355,7 @@ static struct platform_device *crag6410_devices[] __initdata = {
 
 static struct pca953x_platform_data crag6410_pca_data = {
         .gpio_base      = PCA935X_GPIO_BASE,
-        .irq_base       = 0,
+        .irq_base       = -1,
 };
 
 /* VDDARM is controlled by DVS1 connected to GPK(0) */
@@ -683,12 +683,6 @@ static struct s3c_sdhci_platdata crag6410_hsmmc2_pdata = {
         .cd_type                = S3C_SDHCI_CD_PERMANENT,
 };
 
-static struct s3c_sdhci_platdata crag6410_hsmmc1_pdata = {
-        .max_width              = 4,
-        .cd_type                = S3C_SDHCI_CD_GPIO,
-        .ext_cd_gpio            = S3C64XX_GPF(11),
-};
-
 static void crag6410_cfg_sdhci0(struct platform_device *dev, int width)
 {
         /* Set all the necessary GPG pins to special-function 2 */
@@ -723,7 +717,6 @@ static void __init crag6410_machine_init(void)
         gpio_direction_output(S3C64XX_GPF(10), 1);
 
         s3c_sdhci0_set_platdata(&crag6410_hsmmc0_pdata);
-        s3c_sdhci1_set_platdata(&crag6410_hsmmc1_pdata);
         s3c_sdhci2_set_platdata(&crag6410_hsmmc2_pdata);
 
         s3c_i2c0_set_platdata(&i2c0_pdata);