diff options
| author | arnaud.patard@rtp-net.org <arnaud.patard@rtp-net.org> | 2009-11-17 14:54:56 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-01 01:35:04 +0000 |
| commit | 3909b9f7a3d7271539db491d3a83d47363a1f855 (patch) | |
| tree | b925b1e7c9dc0c43ca9a6a17d30c0918a7e8a10c /arch/arm/mach-s3c2410 | |
| parent | 7bcb7eda99f1091055d547aee1a1d8e65b59c592 (diff) | |
| download | op-kernel-dev-3909b9f7a3d7271539db491d3a83d47363a1f855.zip op-kernel-dev-3909b9f7a3d7271539db491d3a83d47363a1f855.tar.gz | |
ARM: H1940: add mmc device
Add mmc host support to h1940
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
[ben-linux@fluff.org: tidy description]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 20f3400..329f6ff 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c @@ -21,6 +21,9 @@ #include <linux/serial_core.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/gpio.h> + +#include <linux/mmc/host.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -32,9 +35,12 @@ #include <plat/regs-serial.h> #include <mach/regs-lcd.h> -#include <mach/regs-gpio.h> #include <mach/regs-clock.h> +#include <mach/regs-gpio.h> +#include <mach/gpio-fns.h> +#include <mach/gpio-nrs.h> + #include <mach/h1940.h> #include <mach/h1940-latch.h> #include <mach/fb.h> @@ -46,6 +52,7 @@ #include <plat/cpu.h> #include <plat/pll.h> #include <plat/pm.h> +#include <plat/mci.h> static struct map_desc h1940_iodesc[] __initdata = { [0] = { @@ -181,6 +188,13 @@ static struct platform_device h1940_device_bluetooth = { .id = -1, }; +static struct s3c24xx_mci_pdata h1940_mmc_cfg = { + .gpio_detect = S3C2410_GPF(5), + .gpio_wprotect = S3C2410_GPH(8), + .set_power = NULL, + .ocr_avail = MMC_VDD_32_33, +}; + static struct platform_device *h1940_devices[] __initdata = { &s3c_device_usb, &s3c_device_lcd, @@ -190,6 +204,7 @@ static struct platform_device *h1940_devices[] __initdata = { &s3c_device_usbgadget, &h1940_device_leds, &h1940_device_bluetooth, + &s3c_device_sdi, }; static void __init h1940_map_io(void) @@ -219,6 +234,8 @@ static void __init h1940_init(void) s3c24xx_udc_set_platdata(&h1940_udc_cfg); s3c_i2c0_set_platdata(NULL); + s3c_device_sdi.dev.platform_data = &h1940_mmc_cfg; + /* Turn off suspend on both USB ports, and switch the * selectable USB port to USB device mode. */ |
