dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-28 05:51:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

mmc: sunxi: Fix misuse of gpio_direction_input()

Browse Source 
It does not make sense to make gpio_direction_input() return the gpio input
status. The return value of gpio_direction_input() is inconsistent if
CONFIG_DM_GPIO is defined.
And we don't need to call gpio_direction_input() int sunxi_mmc_getcd().
Just init the gpio once in mmc_resource_init() is enough.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Axel Lin
2014-12-20 11:41:25 +08:00
committed by Hans de Goede
parent 3f6242eb30
commit b0c4ae1a51
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpio/sunxi_gpio.c
View File

@@ -75,7 +75,7 @@ int gpio_direction_input(unsigned gpio)
{ {
sunxi_gpio_set_cfgpin(gpio, SUNXI_GPIO_INPUT); sunxi_gpio_set_cfgpin(gpio, SUNXI_GPIO_INPUT);
return sunxi_gpio_input(gpio); return 0;
} }
int gpio_direction_output(unsigned gpio, int value) int gpio_direction_output(unsigned gpio, int value)

7
drivers/mmc/sunxi_mmc.c
View File

@@ -72,8 +72,11 @@ static int mmc_resource_init(int sdc_no)
mmchost->mmc_no = sdc_no; mmchost->mmc_no = sdc_no;
cd_pin = sunxi_mmc_getcd_gpio(sdc_no); cd_pin = sunxi_mmc_getcd_gpio(sdc_no);
if (cd_pin != -1) if (cd_pin != -1) {
ret = gpio_request(cd_pin, "mmc_cd"); ret = gpio_request(cd_pin, "mmc_cd");
if (!ret)
ret = gpio_direction_input(cd_pin);
}
return ret; return ret;
} }
@@ -414,7 +417,7 @@ static int sunxi_mmc_getcd(struct mmc *mmc)
if (cd_pin == -1) if (cd_pin == -1)
return 1; return 1;
return !gpio_direction_input(cd_pin); return !gpio_get_value(cd_pin);
} }
static const struct mmc_ops sunxi_mmc_ops = { static const struct mmc_ops sunxi_mmc_ops = {