diff mbox

[U-Boot,20/22] sunxi: musb: Use device-model for musb host mode

Message ID 1434569645-30322-21-git-send-email-hdegoede@redhat.com
State Superseded
Delegated to: Marek Vasut
Headers show

Commit Message

Hans de Goede June 17, 2015, 7:34 p.m. UTC 
Modify the sunxi musb glue to use the device-model for musb host mode.

This allows using musb in host mode together with other host drivers
such as ehci / ohci, which is esp. useful on boards which use the
musb controller in host-only mode, these boards have e.g. an usb-a
receptacle or an usb to sata converter attached to the musb controller.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 board/sunxi/Kconfig          |  2 +-
 drivers/usb/musb-new/sunxi.c | 57 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

Comments

Ian Campbell June 19, 2015, 7:45 a.m. UTC | #1 
On Wed, 2015-06-17 at 21:34 +0200, Hans de Goede wrote:
> [...]

> +	 * Bind the driver directly for now as musb linux kernel support is
> +	 * still pending upstream so our dts files do not have the necessay

"necessary". Otherwise:

Acked-by: Ian Campbell <ijc@hellion.org.uk>

So far as this being a sunxi change goes, although I think this probably
needs other acks from the CC line too.

Ian.

> +	 * nodes yet. TODO: Remove this as soon as the dts nodes are in place
> +	 * and bind by compatible instead.
> +	 */
> +	device_bind_driver(dm_root(), "sunxi-musb", "sunxi-musb", &dev);
> +#else
>  	musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
> +#endif
>  }
diff mbox

Patch

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 4311c3e..6a19f85 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -586,7 +586,7 @@  config DM_SERIAL
 	default y
 
 config DM_USB
-	default y if !USB_MUSB_SUNXI
+	default y
 
 config CMD_SETEXPR
 	default y
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index cbd2954..d1cb8e0 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -26,9 +26,12 @@ 
 #include <asm/arch/gpio.h>
 #include <asm/arch/usb_phy.h>
 #include <asm-generic/gpio.h>
+#include <dm/lists.h>
+#include <dm/root.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
+#include "musb_uboot.h"
 
 /******************************************************************************
  ******************************************************************************
@@ -293,7 +296,61 @@  static struct musb_hdrc_platform_data musb_plat = {
 	.platform_ops	= &sunxi_musb_ops,
 };
 
+#ifdef CONFIG_MUSB_HOST
+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);
+
+	priv->desc_before_addr = true;
+
+	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");
+			return -EIO;
+		}
+	}
+
+	printf("MUSB OTG in host-mode\n");
+
+	return musb_lowlevel_init(host);
+}
+
+int musb_usb_remove(struct udevice *dev)
+{
+	struct musb_host_data *host = dev_get_priv(dev);
+
+	musb_stop(host->host);
+
+	return 0;
+}
+
+U_BOOT_DRIVER(usb_musb) = {
+	.name	= "sunxi-musb",
+	.id	= UCLASS_USB,
+	.probe = musb_usb_probe,
+	.remove = musb_usb_remove,
+	.ops	= &musb_usb_ops,
+	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
+	.priv_auto_alloc_size = sizeof(struct musb_host_data),
+};
+#endif
+
 void sunxi_musb_board_init(void)
 {
+#ifdef CONFIG_MUSB_HOST
+	struct udevice *dev;
+
+	/*
+	 * Bind the driver directly for now as musb linux kernel support is
+	 * still pending upstream so our dts files do not have the necessay
+	 * nodes yet. TODO: Remove this as soon as the dts nodes are in place
+	 * and bind by compatible instead.
+	 */
+	device_bind_driver(dm_root(), "sunxi-musb", "sunxi-musb", &dev);
+#else
 	musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
+#endif
 }