diff options
author | Ladislav Michl <ladis@linux-mips.org> | 2009-04-23 14:10:48 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-04-23 14:10:48 -0400 |
commit | bac5b29fb9582df22b4c1386162ac31b62edf121 (patch) | |
tree | d17fc27aaa42db899963396f84474253e0406370 | |
parent | 6a3260755fc0d86adacd912e3acf40e9ac5bbe2e (diff) |
ARM: OMAP1: Fix mmc_set_power GPIO usage
Simple simplification...
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap1/board-h3-mmc.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c index 0d8a3c195e2e..5e8877ce35e0 100644 --- a/arch/arm/mach-omap1/board-h3-mmc.c +++ b/arch/arm/mach-omap1/board-h3-mmc.c | |||
@@ -26,11 +26,7 @@ | |||
26 | static int mmc_set_power(struct device *dev, int slot, int power_on, | 26 | static int mmc_set_power(struct device *dev, int slot, int power_on, |
27 | int vdd) | 27 | int vdd) |
28 | { | 28 | { |
29 | if (power_on) | 29 | gpio_set_value(H3_TPS_GPIO_MMC_PWR_EN, power_on); |
30 | gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 1); | ||
31 | else | ||
32 | gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 0); | ||
33 | |||
34 | return 0; | 30 | return 0; |
35 | } | 31 | } |
36 | 32 | ||
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 7bc7a3cb9c51..d1ed1365319e 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
@@ -181,11 +181,7 @@ static struct omap_usb_config nokia770_usb_config __initdata = { | |||
181 | static int nokia770_mmc_set_power(struct device *dev, int slot, int power_on, | 181 | static int nokia770_mmc_set_power(struct device *dev, int slot, int power_on, |
182 | int vdd) | 182 | int vdd) |
183 | { | 183 | { |
184 | if (power_on) | 184 | gpio_set_value(NOKIA770_GPIO_MMC_POWER, power_on); |
185 | gpio_set_value(NOKIA770_GPIO_MMC_POWER, 1); | ||
186 | else | ||
187 | gpio_set_value(NOKIA770_GPIO_MMC_POWER, 0); | ||
188 | |||
189 | return 0; | 185 | return 0; |
190 | } | 186 | } |
191 | 187 | ||