Skip to contentSkip to conversation

tegra20: usb: rework set_host_mode

PATCH New Lucas Stach 2 participants 4 messages Aug 7, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tegra20: usb: rework set_host_mode

This allows for two things:
- VBus GPIO may be used on other ports than the OTG one
- VBus GPIO may be low active if specified by DT

CC Stephen Warren <[email protected]>
CC Tom Warren <[email protected]>
---
 arch/arm/cpu/armv7/tegra20/usb.c | 35 +++++++++++++++++++----------------

1 Datei ge?ndert, 19 Zeilen hinzugef?gt(+), 16 Zeilen entfernt(-)

arch/arm/cpu/armv7/tegra20/usb.c +19 -16
index 84260e6..77966e5 100644
@@ -137,24 +137,27 @@ static const u8 utmip_elastic_limit = 16;
 /* UTMIP High Speed Sync Start Delay */
 static const u8 utmip_hs_sync_start_delay = 9;
 
-/* Put the port into host mode (this only works for OTG ports) */
+/* Put the port into host mode */
 static void set_host_mode(struct fdt_usb *config)
 {
-	if (config->dr_mode == DR_MODE_OTG) {
-		/* Check whether remote host from USB1 is driving VBus */
-		if (readl(&config->reg->phy_vbus_sensors) & VBUS_VLD_STS)
-			return;
-
-		/*
-		 * If not driving, we set the GPIO to enable VBUS. We assume
-		 * that the pinmux is set up correctly for this.
-		 */
-		if (fdt_gpio_isvalid(&config->vbus_gpio)) {
-			fdtdec_setup_gpio(&config->vbus_gpio);
-			gpio_direction_output(config->vbus_gpio.gpio, 1);
-			debug("set_host_mode: GPIO %d high\n",
-			      config->vbus_gpio.gpio);
-		}
+	/*
+	 * If we are an OTG port, check if remote host is driving VBus and
+	 * bail out in this case.
+	 */
+	if (config->dr_mode == DR_MODE_OTG &&
+		(readl(&config->reg->phy_vbus_sensors) & VBUS_VLD_STS))
+		return;
+
+	/*
+	 * If not driving, we set the GPIO to enable VBUS. We assume
+	 * that the pinmux is set up correctly for this.
+	 */
+	if (fdt_gpio_isvalid(&config->vbus_gpio)) {
+		fdtdec_setup_gpio(&config->vbus_gpio);
+		gpio_direction_output(config->vbus_gpio.gpio,
+				(config->vbus_gpio.flags & FDT_GPIO_ACTIVE_LOW) ? 0 : 1);
+		debug("set_host_mode: GPIO %d %s\n", config->vbus_gpio.gpio,
+		      (config->vbus_gpio.flags & FDT_GPIO_ACTIVE_LOW) ? "low" : "high");
 	}
 }
 
Signature · 1 line
1.7.11.2
#1 lore raw

PATCH 1/1 tegra20: usb: rework set_host_mode

Quoted 3 lines · Lucas Stach

This allows for two things:
- VBus GPIO may be used on other ports than the OTG one
- VBus GPIO may be low active if specified by DT

Hmmm. Why would the board have control over whether VBUS is asserted if the port isn't intended to operate in OTG mode?

Perhaps power-saving? In that case, I wonder if representing this as a regulator rather than as a VBUS GPIO would make more sense?

But irrespective of those questions, I'm inclined to think the patch is probably OK.

#2 lore raw

PATCH 1/1 tegra20: usb: rework set_host_mode

Am Dienstag, den 07.08.2012, 14:21 -0600 schrieb Stephen Warren:

Quoted 5 lines · Lucas Stach
Quoted 3 lines

This allows for two things:
- VBus GPIO may be used on other ports than the OTG one
- VBus GPIO may be low active if specified by DT

Quoted 9 lines

Hmmm. Why would the board have control over whether VBUS is asserted if the port isn't intended to operate in OTG mode?

Perhaps power-saving? In that case, I wonder if representing this as a regulator rather than as a VBUS GPIO would make more sense?

But irrespective of those questions, I'm inclined to think the patch is probably OK.

On Colibri the second USB Port is powered down by default and only powered up if we are really going to use it. And the GPIO does exactly what it tells you from it's name: turn on VBus by triggering the USB power switch.
Thinking about a regulator for this in U-Boot is a bit of an overkill, for the Linux kernel this might be another story.

#3 lore raw

PATCH 1/1 tegra20: usb: rework set_host_mode

Quoted 12 lines · Lucas Stach

Am Dienstag, den 07.08.2012, 14:21 -0600 schrieb Stephen Warren:

Quoted 11 lines · Lucas Stach
Quoted 3 lines

This allows for two things:
- VBus GPIO may be used on other ports than the OTG one
- VBus GPIO may be low active if specified by DT

Hmmm. Why would the board have control over whether VBUS is asserted if the port isn't intended to operate in OTG mode?

Perhaps power-saving? In that case, I wonder if representing this as a regulator rather than as a VBUS GPIO would make more sense?

Quoted 7 lines
Quoted 3 lines

But irrespective of those questions, I'm inclined to think the patch is probably OK.

On Colibri the second USB Port is powered down by default and only powered up if we are really going to use it. And the GPIO does exactly what it tells you from it's name: turn on VBus by triggering the USB power switch.

It's probably fine to do this; the kernel also unconditionally sets up the VBUS GPIO irrespective of USB port mode.

Quoted 2 lines

Thinking about a regulator for this in U-Boot is a bit of an overkill, for the Linux kernel this might be another story.

Device tree content isn't supposed to be influence by the consumer; it should be identical irrespective of which bootloader/OS/... is using it.

So, in the future I expect this to be reworked to get rid of the vbus-gpio property and replace it with a regulator.