sunxi: musb: Use device-model for musb host mode

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>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0e899cd0d945bd906da2faba3230d3767a5fbdc1..3355b3bcaa583013782c0086054bb39936ff8755 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -648,7 +648,7 @@ config ARCH_SUNXI
        select DM_GPIO
        select DM_ETH
        select DM_SERIAL
-       select DM_USB if !USB_MUSB_SUNXI
+       select DM_USB
        select OF_CONTROL
        select OF_SEPARATE
        select SPL_DISABLE_OF_CONTROL

diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index cbd2954c41f99695d0192c942cf0ac14d5b99d80..6109011dca092cf5bebec1289050008fe0404372 100644 (file)
--- 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 necessary
+        * 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
 }