usb: musb: add musb_host_setup() and musb_host_cleanup()

This patch re-introduces the bits that are necessary to use the musb
controller in host mode.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 727a687433d61d1ac0b371604a255ef051c2df61..18da746ae6bf6cd5983bca137765fb9e56dc19c7 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -953,6 +953,7 @@ static void musb_shutdown(struct platform_device *pdev)
 
        pm_runtime_get_sync(musb->controller);
 
+       musb_host_cleanup(musb);
        musb_gadget_cleanup(musb);
 
        spin_lock_irqsave(&musb->lock, flags);
@@ -1902,6 +1903,10 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
                musb->xceiv->state = OTG_STATE_B_IDLE;
        }
 
+       status = musb_host_setup(musb, plat->power);
+       if (status < 0)
+               goto fail3;
+
        status = musb_gadget_setup(musb);
 
        if (status < 0)

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index e6ece8a4e8b60f3654359edb258af06053c335fe..6057c2363e86be3f5b6b8cd12cd51d19c18b0aae 100644 (file)
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2640,6 +2640,27 @@ void musb_host_free(struct musb *musb)
        usb_put_hcd(musb->hcd);
 }
 
+int musb_host_setup(struct musb *musb, int power_budget)
+{
+       int ret;
+       struct usb_hcd *hcd = musb->hcd;
+
+       MUSB_HST_MODE(musb);
+       musb->xceiv->otg->default_a = 1;
+       musb->xceiv->state = OTG_STATE_A_IDLE;
+
+       otg_set_host(musb->xceiv->otg, &hcd->self);
+       hcd->self.otg_port = 1;
+       musb->xceiv->otg->host = &hcd->self;
+       hcd->power_budget = 2 * (power_budget ? : 250);
+
+       ret = usb_add_hcd(hcd, 0, 0);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
 void musb_host_resume_root_hub(struct musb *musb)
 {
        usb_hcd_resume_root_hub(musb->hcd);

diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h
index 1ce6e4ec9021bcb802c519af31bb19555159667d..48a4bdd8b9f9cc3b4be2a6e80126dc3c6637cf15 100644 (file)
--- a/drivers/usb/musb/musb_host.h
+++ b/drivers/usb/musb/musb_host.h
@@ -81,6 +81,8 @@ static inline struct musb_qh *first_qh(struct list_head *q)
 extern struct musb *hcd_to_musb(struct usb_hcd *);
 extern irqreturn_t musb_h_ep0_irq(struct musb *);
 extern int musb_host_alloc(struct musb *);
+extern int musb_host_setup(struct musb *, int);
+extern void musb_host_cleanup(struct musb *);
 extern void musb_host_tx(struct musb *, u8);
 extern void musb_host_rx(struct musb *, u8);
 extern void musb_root_disconnect(struct musb *musb);
@@ -107,6 +109,12 @@ static inline int musb_host_alloc(struct musb *musb)
        return 0;
 }
 
+static inline int musb_host_setup(struct musb *musb, int power_budget)
+{
+       return 0;
+}
+
+static inline void musb_host_cleanup(struct musb *musb)                {}
 static inline void musb_host_free(struct musb *musb)           {}
 static inline void musb_host_tx(struct musb *musb, u8 epnum)   {}
 static inline void musb_host_rx(struct musb *musb, u8 epnum)   {}