diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-16 12:51:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-16 12:51:23 -0400 |
| commit | 20913018fbce5a2e3c93b6eeb56e67460e29542c (patch) | |
| tree | 9888a4ca3c9124ac4a298ebea270e4163560c56b /drivers/gpio | |
| parent | a32d27912961040230320268d6cde80e9442dc33 (diff) | |
| parent | 6c739c5d8a3466f8ef2f8543636484957bcca6ee (diff) | |
| download | talos-obmc-uboot-20913018fbce5a2e3c93b6eeb56e67460e29542c.tar.gz talos-obmc-uboot-20913018fbce5a2e3c93b6eeb56e67460e29542c.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/sunxi_gpio.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index 62960929ad..510123fdf8 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -21,6 +21,9 @@ #ifdef CONFIG_AXP209_POWER #include <axp209.h> #endif +#ifdef CONFIG_AXP221_POWER +#include <axp221.h> +#endif DECLARE_GLOBAL_DATA_PTR; @@ -115,6 +118,20 @@ int gpio_set_value(unsigned gpio, int value) return sunxi_gpio_output(gpio, value); } +int sunxi_name_to_gpio_bank(const char *name) +{ + int group = 0; + + if (*name == 'P' || *name == 'p') + name++; + if (*name >= 'A') { + group = *name - (*name > 'a' ? 'a' : 'A'); + return group; + } + + return -1; +} + int sunxi_name_to_gpio(const char *name) { int group = 0; @@ -125,6 +142,12 @@ int sunxi_name_to_gpio(const char *name) #ifdef AXP_GPIO if (strncasecmp(name, "AXP0-", 5) == 0) { name += 5; + if (strcmp(name, "VBUS-DETECT") == 0) + return SUNXI_GPIO_AXP0_START + + SUNXI_GPIO_AXP0_VBUS_DETECT; + if (strcmp(name, "VBUS-ENABLE") == 0) + return SUNXI_GPIO_AXP0_START + + SUNXI_GPIO_AXP0_VBUS_ENABLE; pin = simple_strtol(name, &eptr, 10); if (!*name || *eptr) return -1; |
