diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-07 02:59:11 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-07 02:59:11 +0200 |
| commit | 8a19ebb0938752af8da142c4731f310bb8f9d130 (patch) | |
| tree | 49870722daecaebbfd741327feac87f405653211 /arch/arm/mach-s3c2410 | |
| parent | ARM: n30: Add support for power on/off on Acer n30 / Acer n35 MMC card reader (diff) | |
| download | linux-8a19ebb0938752af8da142c4731f310bb8f9d130.tar.xz linux-8a19ebb0938752af8da142c4731f310bb8f9d130.zip | |
ARM: n30: Fixup gpiolib calls for mmc power
Move to using gpio_request() and gpio_set_value() for the MMC power
control calls.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-n30.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index f25275ef8bc8..dfa09eac160c 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c @@ -88,10 +88,10 @@ static void n30_udc_pullup(enum s3c2410_udc_cmd_e cmd) { switch (cmd) { case S3C2410_UDC_P_ENABLE : - s3c2410_gpio_setpin(S3C2410_GPB(3), 1); + gpio_set_value(S3C2410_GPB(3), 1); break; case S3C2410_UDC_P_DISABLE : - s3c2410_gpio_setpin(S3C2410_GPB(3), 0); + gpio_set_value(S3C2410_GPB(3), 0); break; case S3C2410_UDC_P_RESET : break; @@ -357,11 +357,11 @@ static void n30_sdi_set_power(unsigned char power_mode, unsigned short vdd) switch (power_mode) { case MMC_POWER_ON: case MMC_POWER_UP: - s3c2410_gpio_setpin(S3C2410_GPG(4), 1); + gpio_set_value(S3C2410_GPG(4), 1); break; case MMC_POWER_OFF: default: - s3c2410_gpio_setpin(S3C2410_GPG(4), 0); + gpio_set_value(S3C2410_GPG(4), 0); break; } } @@ -561,6 +561,8 @@ static void __init n30_init_irq(void) static void __init n30_init(void) { + WARN_ON(gpio_request(S3C2410_GPG(4), "mmc power")); + s3c24xx_fb_set_platdata(&n30_fb_info); s3c24xx_udc_set_platdata(&n30_udc_cfg); s3c24xx_mci_set_platdata(&n30_mci_cfg); |