summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-01-11 19:33:35 +0100
committerHans de Goede <hdegoede@redhat.com>2015-01-14 14:56:40 +0100
commita90e77dbeb92f78ec06547621a7b22a785a43a3d (patch)
tree1f94f00cfb6a8d0f36ba6d39d06c439b57ccde82 /arch/arm/cpu
parent4458b7a6e1a601386fce1b76f17a1d41dd7aeddb (diff)
downloadblackbird-obmc-uboot-a90e77dbeb92f78ec06547621a7b22a785a43a3d.tar.gz
blackbird-obmc-uboot-a90e77dbeb92f78ec06547621a7b22a785a43a3d.zip
sunxi: usbc: Add support for usb-vbus0 controller by axp drivebus pin
The axp221 / axp223's N_VBUSEN pin can be configured as an output rather then an input, and this is used on some boards to control usb-vbus0, add support for this. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/sunxi/usbc.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/usbc.c b/arch/arm/cpu/armv7/sunxi/usbc.c
index 4f11da59d1..14de9f98bd 100644
--- a/arch/arm/cpu/armv7/sunxi/usbc.c
+++ b/arch/arm/cpu/armv7/sunxi/usbc.c
@@ -17,6 +17,15 @@
#include <asm/gpio.h>
#include <asm/io.h>
#include <common.h>
+#ifdef CONFIG_AXP152_POWER
+#include <axp152.h>
+#endif
+#ifdef CONFIG_AXP209_POWER
+#include <axp209.h>
+#endif
+#ifdef CONFIG_AXP221_POWER
+#include <axp221.h>
+#endif
#define SUNXI_USB_PMU_IRQ_ENABLE 0x800
#define SUNXI_USB_CSR 0x404
@@ -71,6 +80,12 @@ static struct sunxi_usbc_hcd {
static int enabled_hcd_count;
+static bool use_axp_drivebus(int index)
+{
+ return index == 0 &&
+ strcmp(CONFIG_USB0_VBUS_PIN, "axp_drivebus") == 0;
+}
+
void *sunxi_usbc_get_io_base(int index)
{
switch (index) {
@@ -87,6 +102,9 @@ void *sunxi_usbc_get_io_base(int index)
static int get_vbus_gpio(int index)
{
+ if (use_axp_drivebus(index))
+ return -1;
+
switch (index) {
case 0: return sunxi_name_to_gpio(CONFIG_USB0_VBUS_PIN);
case 1: return sunxi_name_to_gpio(CONFIG_USB1_VBUS_PIN);
@@ -233,6 +251,10 @@ void sunxi_usbc_vbus_enable(int index)
{
struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
+#ifdef AXP_DRIVEBUS
+ if (use_axp_drivebus(index))
+ axp_drivebus_enable();
+#endif
if (sunxi_usbc->gpio_vbus != -1)
gpio_direction_output(sunxi_usbc->gpio_vbus, 1);
}
@@ -241,6 +263,10 @@ void sunxi_usbc_vbus_disable(int index)
{
struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
+#ifdef AXP_DRIVEBUS
+ if (use_axp_drivebus(index))
+ axp_drivebus_disable();
+#endif
if (sunxi_usbc->gpio_vbus != -1)
gpio_direction_output(sunxi_usbc->gpio_vbus, 0);
}
OpenPOWER on IntegriCloud