diff options
| author | Tom Rini <trini@konsulko.com> | 2015-06-06 07:03:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-06 07:03:07 -0400 |
| commit | 290ac3bb1a1fbd85abcecfd8ff8cb837029d067a (patch) | |
| tree | 4c39ddea7744e46fb15c778f394a77f55bd28a84 /drivers | |
| parent | f1737152c01734749c3694d30e1aa86ab28f374e (diff) | |
| parent | 277af820b5207d43473869da2c86412d2b51d461 (diff) | |
| download | u-boot-290ac3bb1a1fbd85abcecfd8ff8cb837029d067a.zip u-boot-290ac3bb1a1fbd85abcecfd8ff8cb837029d067a.tar.gz u-boot-290ac3bb1a1fbd85abcecfd8ff8cb837029d067a.tar.bz2 | |
Merge git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/sunxi_gpio.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/sunxi_mmc.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index f988130..afa165a 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -304,6 +304,7 @@ static const struct udevice_id sunxi_gpio_ids[] = { { .compatible = "allwinner,sun6i-a31s-pinctrl" }, { .compatible = "allwinner,sun7i-a20-pinctrl" }, { .compatible = "allwinner,sun8i-a23-pinctrl" }, + { .compatible = "allwinner,sun8i-a33-pinctrl" }, { .compatible = "allwinner,sun9i-a80-pinctrl" }, { } }; diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index bb08147..e7ab828 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -75,8 +75,10 @@ static int mmc_resource_init(int sdc_no) cd_pin = sunxi_mmc_getcd_gpio(sdc_no); if (cd_pin >= 0) { ret = gpio_request(cd_pin, "mmc_cd"); - if (!ret) + if (!ret) { + sunxi_gpio_set_pull(cd_pin, SUNXI_GPIO_PULL_UP); ret = gpio_direction_input(cd_pin); + } } return ret; |