[ARM] S3C: Add SDHCI (HSMMC) channel 1 device definition

Add device definition and support code for the Samsung
HSMMC channel 1 device.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/arch/arm/mach-s3c6410/cpu.c b/arch/arm/mach-s3c6410/cpu.c
index 84fb65b..137918e 100644 (file)
--- a/arch/arm/mach-s3c6410/cpu.c
+++ b/arch/arm/mach-s3c6410/cpu.c
@@ -55,6 +55,7 @@ void __init s3c6410_map_io(void)
 
        /* initialise device information early */
        s3c6410_default_sdhci0();
+       s3c6410_default_sdhci1();
 }
 
 void __init s3c6410_init_clocks(int xtal)

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

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

diff --cc arch/arm/plat-s3c/dev-hsmmc1.c
Simple merge

diff --cc arch/arm/plat-s3c/include/plat/sdhci.h
Simple merge