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

[oweals/u-boot.git] / drivers / usb / musb-new / sunxi.c

diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index ee018c7e6e76751248962430f54bf8bec59b8d80..6109011dca092cf5bebec1289050008fe0404372 100644 (file)
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -26,17 +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"
-#ifdef CONFIG_AXP152_POWER
-#include <axp152.h>
-#endif
-#ifdef CONFIG_AXP209_POWER
-#include <axp209.h>
-#endif
-#ifdef CONFIG_AXP221_POWER
-#include <axp221.h>
-#endif
+#include "musb_uboot.h"
 
 /******************************************************************************
  ******************************************************************************
@@ -217,6 +212,11 @@ static int sunxi_musb_enable(struct musb *musb)
                        printf("A charger is plugged into the OTG: ");
                        return -ENODEV;
                }
+               ret = sunxi_usb_phy_id_detect(0);
+               if (ret == 1) {
+                       printf("No host cable detected: ");
+                       return -ENODEV;
+               }
                sunxi_usb_phy_power_on(0); /* port power on */
        }
 
@@ -272,8 +272,85 @@ static int sunxi_musb_init(struct musb *musb)
        return 0;
 }
 
-const struct musb_platform_ops sunxi_musb_ops = {
+static const struct musb_platform_ops sunxi_musb_ops = {
        .init           = sunxi_musb_init,
        .enable         = sunxi_musb_enable,
        .disable        = sunxi_musb_disable,
 };
+
+static struct musb_hdrc_config musb_config = {
+       .multipoint     = 1,
+       .dyn_fifo       = 1,
+       .num_eps        = 6,
+       .ram_bits       = 11,
+};
+
+static struct musb_hdrc_platform_data musb_plat = {
+#if defined(CONFIG_MUSB_HOST)
+       .mode           = MUSB_HOST,
+#else
+       .mode           = MUSB_PERIPHERAL,
+#endif
+       .config         = &musb_config,
+       .power          = 250,
+       .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
+}