summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/board-h2-mmc.c
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2009-04-23 11:10:47 -0700
committerTony Lindgren <tony@atomide.com>2009-04-23 11:10:47 -0700
commit6a3260755fc0d86adacd912e3acf40e9ac5bbe2e (patch)
treeeeb8572b39f3c661db4f72f2aeeaeff16b8be068 /arch/arm/mach-omap1/board-h2-mmc.c
parent1748ae0e95760d62de501743f883af6833f33357 (diff)
downloadlwn-6a3260755fc0d86adacd912e3acf40e9ac5bbe2e.tar.gz
lwn-6a3260755fc0d86adacd912e3acf40e9ac5bbe2e.zip
ARM: OMAP1: Simplify board-h2 MMC setup
Simplify board-h2 MMC setup Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-h2-mmc.c')
-rw-r--r--arch/arm/mach-omap1/board-h2-mmc.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
index 44d4a966bed9..46098f546824 100644
--- a/arch/arm/mach-omap1/board-h2-mmc.c
+++ b/arch/arm/mach-omap1/board-h2-mmc.c
@@ -26,19 +26,13 @@
static int mmc_set_power(struct device *dev, int slot, int power_on,
int vdd)
{
- if (power_on)
- gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 1);
- else
- gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 0);
-
+ gpio_set_value(H2_TPS_GPIO_MMC_PWR_EN, power_on);
return 0;
}
static int mmc_late_init(struct device *dev)
{
- int ret;
-
- ret = gpio_request(H2_TPS_GPIO_MMC_PWR_EN, "MMC power");
+ int ret = gpio_request(H2_TPS_GPIO_MMC_PWR_EN, "MMC power");
if (ret < 0)
return ret;
@@ -47,7 +41,7 @@ static int mmc_late_init(struct device *dev)
return ret;
}
-static void mmc_shutdown(struct device *dev)
+static void mmc_cleanup(struct device *dev)
{
gpio_free(H2_TPS_GPIO_MMC_PWR_EN);
}
@@ -60,7 +54,7 @@ static void mmc_shutdown(struct device *dev)
static struct omap_mmc_platform_data mmc1_data = {
.nr_slots = 1,
.init = mmc_late_init,
- .shutdown = mmc_shutdown,
+ .cleanup = mmc_cleanup,
.dma_mask = 0xffffffff,
.slots[0] = {
.set_power = mmc_set_power,