1 files changed, 33 insertions, 2 deletions

diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index 0fe53b39cb2f..5875da0ae0eb 100644
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -33,6 +33,7 @@
 
 #include <asm/plat-s3c24xx/devs.h>
 #include <asm/plat-s3c24xx/cpu.h>
+#include <asm/arch/regs-spi.h>
 
 /* Serial port registrations */
 
@@ -402,6 +403,36 @@ struct platform_device s3c_device_sdi = {
 
 EXPORT_SYMBOL(s3c_device_sdi);
 
+/* High-speed MMC/SD */
+
+static struct resource s3c_hsmmc_resource[] = {
+        [0] = {
+                .start = S3C2443_PA_HSMMC,
+                .end   = S3C2443_PA_HSMMC + S3C2443_SZ_HSMMC - 1,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_S3C2443_HSMMC,
+                .end   = IRQ_S3C2443_HSMMC,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
+static u64 s3c_device_hsmmc_dmamask = 0xffffffffUL;
+
+struct platform_device s3c_device_hsmmc = {
+        .name             = "s3c-sdhci",
+        .id               = -1,
+        .num_resources    = ARRAY_SIZE(s3c_hsmmc_resource),
+        .resource         = s3c_hsmmc_resource,
+        .dev              = {
+                .dma_mask = &s3c_device_hsmmc_dmamask,
+                .coherent_dma_mask = 0xffffffffUL
+        }
+};
+
+
+
 /* SPI (0) */
 
 static struct resource s3c_spi0_resource[] = {
@@ -437,8 +468,8 @@ EXPORT_SYMBOL(s3c_device_spi0);
 
 static struct resource s3c_spi1_resource[] = {
         [0] = {
-                .start = S3C24XX_PA_SPI + 0x20,
-                .end   = S3C24XX_PA_SPI + 0x20 + 0x1f,
+                .start = S3C24XX_PA_SPI + S3C2410_SPI1,
+                .end   = S3C24XX_PA_SPI + S3C2410_SPI1 + 0x1f,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {