sunxi: Enable both ehci and otg in host mode on various boards

When we return an error the usb core will log a message, so in this case do not print a newline, instead print ": " after our identifier as a seperator between our identifier and the error message logged by the core.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/usb/musb-new/sunxi.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

drivers/usb/musb-new/sunxi.c +8 -3

index d1cb8e0..bb88687 100644
@@ -301,21 +301,26 @@ int musb_usb_probe(struct udevice *dev)
 {
 	struct musb_host_data *host = dev_get_priv(dev);
 	struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
+	int ret;
 
 	priv->desc_before_addr = true;
 
+	printf("MUSB OTG");
+
 	if (!host->host) {
 		host->host = musb_init_controller(&musb_plat, NULL,
 						  (void *)SUNXI_USB0_BASE);
 		if (!host->host) {
-			printf("Failed to init the controller\n");
+			printf(": ");
 			return -EIO;
 		}
 	}
 
-	printf("MUSB OTG in host-mode\n");
+	ret = musb_lowlevel_init(host);
+
+	printf((ret == 0) ? "\n" : ": ");
 
-	return musb_lowlevel_init(host);
+	return ret;
 }
 
 int musb_usb_remove(struct udevice *dev)

Quoted 3 lines · Hans de Goede

When we return an error the usb core will log a message, so in this case do not print a newline, instead print ": " after our identifier as a seperator between our identifier and the error message logged by the core.

"separator".

This seems like a lot of fragile faff second guessing what some other component does (and is going to do in the future).

take over init time logging completely

or just live with:
MUSB OTG: Failed host init
Flux capacitor has reversed polarity
which I suppose is roughly how it appears today?

How about the following:

Subject: [PATCH 1/3] sunxi: musb: Improve output during probing

When we return an error the usb core will log a message, so in this case do not print anything.

Signed-off-by Hans de Goede <[email protected]>

This is exactly what the other host drivers do, only print something on success, and leave printing errors up to the caller.

Quoted 5 lines · Hans de Goede

How about the following:

Subject: [PATCH 1/3] sunxi: musb: Improve output during probing

Quoted 4 lines

When we return an error the usb core will log a message, so in this case do not print anything.

Signed-off-by Hans de Goede <[email protected]>

Much better, especially given the below.

Acked-by Ian Campbell <[email protected]>

drivers/usb/musb-new/sunxi.c int musb_usb_probe(struct udevice *dev) · line 304

Quoted 9 lines

drivers/usb/musb-new/sunxi.c +1 -0

@@ -301,21 +301,22 @@ int musb_usb_probe(struct udevice *dev)
   {
          struct musb_host_data *host = dev_get_priv(dev);
          struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
+       int ret;

Wrong sort of w/space I suspect.

On some boards the otg is wired up in host-only mode in this case we have no vbus-det gpio.

Stop logging an error from sunxi_usb_phy_vbus_detect() in this case, and stop treating sunxi_usb_phy_vbus_detect() returning a negative errno, as if a charger is plugged into the otg port.

Signed-off-by Hans de Goede <[email protected]>

Now that the device-model port of the musb mode makes it possible, enable both the ehci and oth in host mode on boards where the otg is wired up in

host only mode, either via an usb-a receptacle or via an usb <-> sata converter.

Signed-off-by Hans de Goede <[email protected]>

Quoted 2 lines · Hans de Goede

Now that the device-model port of the musb mode makes it possible, enable both the ehci and oth in host mode on boards where the otg is wired up in

"otg"?

Hi All,

Here is a small series enabling the combined use of ehci + musb-otg on more sunxi boards. This applies on top of my large series for making this possible posted earlier.

As said before I believe it is best if all the sunxi bits of that series go upstream through u-boot-sunxi/master, the same applies for these 3.

Regards,

Quoted 6 lines · Hans de Goede

Hi All,

Here is a small series enabling the combined use of ehci + musb-otg on more sunxi boards. This applies on top of my large series for making this possible posted earlier.

Quoted 4 lines

As said before I believe it is best if all the sunxi bits of that series go upstream through u-boot-sunxi/master, the same applies for these 3.

Regards,

Series is

Reviewed-by Marek Vasut <[email protected]>

Hi,

Quoted 10 lines · Hans de Goede

Quoted 9 lines

Hi All,

Here is a small series enabling the combined use of ehci + musb-otg on more sunxi boards. This applies on top of my large series for making this possible posted earlier.

As said before I believe it is best if all the sunxi bits of that series go upstream through u-boot-sunxi/master, the same applies for these 3.

Quoted 5 lines

Quoted 1 line

Regards,

Series is

Reviewed-by Marek Vasut <[email protected]>

I assume this only applies to these 3, or do you mean both the original series adding musb device-model support as well as these 3?