Merge git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6] / arch / arm / plat-s3c24xx / devs.c

diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index 8eca9599ef60ac6c868d29d2c7554c36a4fadb99..e546e933b3f7648204b9715e88066df1b1b93ffb 100644 (file)
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -28,12 +28,12 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-serial.h>
-#include <asm/arch/udc.h>
+#include <asm/plat-s3c/regs-serial.h>
+#include <asm/plat-s3c24xx/udc.h>
 
 #include <asm/plat-s3c24xx/devs.h>
 #include <asm/plat-s3c24xx/cpu.h>
-#include <asm/arch/regs-spi.h>
+#include <asm/plat-s3c24xx/regs-spi.h>
 
 /* Serial port registrations */
 
@@ -403,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[] = {