diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-04-25 18:25:14 +0300 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-05-04 17:51:53 +0300 |
| commit | 2fcf033d36618da4c86de135a0d447fd3bbaf8ea (patch) | |
| tree | 0439c47cc2e63fa98e4c347f233c9dafcaa12c7b /drivers/gpio/sunxi_gpio.c | |
| parent | a536077def0295966452f290f7ce8f391e079966 (diff) | |
| download | u-boot-2fcf033d36618da4c86de135a0d447fd3bbaf8ea.tar.xz | |
sunxi: axp: Move axp gpio code to a separate axpi-gpio driver
Move the axp-gpio code out of the drivers/power/axp*.c code, and into
a new separate axpi-gpio driver.
This change drops supports for the gpio3 pin on the axp209, as that requires
special handling, and no boards are using it.
Besides cleaning things up by moving the code to a separate driver, as
a bonus this change also adds support for the (non vusb) gpio pins on the
axp221 and the gpio pins on the axp152.
The new axp-gpio driver gets its own Kconfig option, and is only enabled
on boards which need it. Besides that it only gets enabled in the regular
u-boot build and not for the SPL as we never need it in the SPL.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'drivers/gpio/sunxi_gpio.c')
| -rw-r--r-- | drivers/gpio/sunxi_gpio.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index 0774b70934..5a0b5e4aee 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -15,15 +15,10 @@ #include <errno.h> #include <fdtdec.h> #include <malloc.h> +#include <asm/arch/gpio.h> #include <asm/io.h> #include <asm/gpio.h> #include <dm/device-internal.h> -#ifdef CONFIG_AXP209_POWER -#include <axp209.h> -#endif -#ifdef CONFIG_AXP221_POWER -#include <axp221.h> -#endif DECLARE_GLOBAL_DATA_PTR; @@ -79,7 +74,7 @@ int gpio_free(unsigned gpio) int gpio_direction_input(unsigned gpio) { -#ifdef AXP_GPIO +#if !defined CONFIG_SPL_BUILD && defined CONFIG_AXP_GPIO if (gpio >= SUNXI_GPIO_AXP0_START) return axp_gpio_direction_input(NULL, gpio - SUNXI_GPIO_AXP0_START); #endif @@ -90,7 +85,7 @@ int gpio_direction_input(unsigned gpio) int gpio_direction_output(unsigned gpio, int value) { -#ifdef AXP_GPIO +#if !defined CONFIG_SPL_BUILD && defined CONFIG_AXP_GPIO if (gpio >= SUNXI_GPIO_AXP0_START) return axp_gpio_direction_output(NULL, gpio - SUNXI_GPIO_AXP0_START, value); @@ -102,7 +97,7 @@ int gpio_direction_output(unsigned gpio, int value) int gpio_get_value(unsigned gpio) { -#ifdef AXP_GPIO +#if !defined CONFIG_SPL_BUILD && defined CONFIG_AXP_GPIO if (gpio >= SUNXI_GPIO_AXP0_START) return axp_gpio_get_value(NULL, gpio - SUNXI_GPIO_AXP0_START); #endif @@ -111,7 +106,7 @@ int gpio_get_value(unsigned gpio) int gpio_set_value(unsigned gpio, int value) { -#ifdef AXP_GPIO +#if !defined CONFIG_SPL_BUILD && defined CONFIG_AXP_GPIO if (gpio >= SUNXI_GPIO_AXP0_START) return axp_gpio_set_value(NULL, gpio - SUNXI_GPIO_AXP0_START, value); #endif @@ -125,7 +120,7 @@ int sunxi_name_to_gpio(const char *name) long pin; char *eptr; -#ifdef AXP_GPIO +#if !defined CONFIG_SPL_BUILD && defined CONFIG_AXP_GPIO if (strncasecmp(name, "AXP0-", 5) == 0) { name += 5; if (strcmp(name, "VBUS-DETECT") == 0) |