Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b3eba44 authored by Daniel Mack's avatar Daniel Mack Committed by Felipe Balbi
Browse files

usb: musb: factor some host-specific functions 



In particular, this introduces musb_host_resume_root_hub()and
musb_host_poke_root_hub() which will be stubbed out later.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent c2a2759d

drivers/usb/musb/musb_core.c

+7 −11
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 


				musb->xceiv->state = OTG_STATE_A_HOST;

				musb->is_active = 1;

				usb_hcd_resume_root_hub(musb_to_hcd(musb));

				musb_host_resume_root_hub(musb);

				break;

			case OTG_STATE_B_WAIT_ACON:

				musb->xceiv->state = OTG_STATE_B_PERIPHERAL;
@@ -500,7 +500,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 
			case OTG_STATE_A_SUSPEND:

				/* possibly DISCONNECT is upcoming */

				musb->xceiv->state = OTG_STATE_A_HOST;

				usb_hcd_resume_root_hub(musb_to_hcd(musb));

				musb_host_resume_root_hub(musb);

				break;

			case OTG_STATE_B_WAIT_ACON:

			case OTG_STATE_B_PERIPHERAL:
@@ -642,7 +642,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 
			 * undesired detour through A_WAIT_BCON.

			 */

			musb_hnp_stop(musb);

			usb_hcd_resume_root_hub(musb_to_hcd(musb));

			musb_host_resume_root_hub(musb);

			musb_root_disconnect(musb);

			musb_platform_try_idle(musb, jiffies

					+ msecs_to_jiffies(musb->a_wait_bcon
@@ -732,17 +732,13 @@ b_host: 
			if ((devctl & MUSB_DEVCTL_VBUS)

					== (3 << MUSB_DEVCTL_VBUS_SHIFT)) {

				musb->xceiv->state = OTG_STATE_A_HOST;

				if (hcd)

					hcd->self.is_b_host = 0;

			}

			break;

		}



		/* poke the root hub */

		MUSB_HST_MODE(musb);

		if (hcd->status_urb)

			usb_hcd_poll_rh_status(hcd);

		else

			usb_hcd_resume_root_hub(hcd);

		musb_host_poke_root_hub(musb);



		dev_dbg(musb->controller, "CONNECT (%s) devctl %02x\n",

				usb_otg_state_string(musb->xceiv->state), devctl);
@@ -757,7 +753,7 @@ b_host: 
		switch (musb->xceiv->state) {

		case OTG_STATE_A_HOST:

		case OTG_STATE_A_SUSPEND:

			usb_hcd_resume_root_hub(musb_to_hcd(musb));

			musb_host_resume_root_hub(musb);

			musb_root_disconnect(musb);

			if (musb->a_wait_bcon != 0)

				musb_platform_try_idle(musb, jiffies

drivers/usb/musb/musb_host.c

+14 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "musb_core.h"

#include "musb_host.h"





/* MUSB HOST status 22-mar-2006

 *

 * - There's still lots of partial code duplication for fault paths, so
@@ -2608,3 +2607,17 @@ const struct hc_driver musb_hc_driver = { 
	/* .start_port_reset	= NULL, */

	/* .hub_irq_enable	= NULL, */

};



void musb_host_resume_root_hub(struct musb *musb)

{

	usb_hcd_resume_root_hub(musb_to_hcd(musb));

}



void musb_host_poke_root_hub(struct musb *musb)

{

	MUSB_HST_MODE(musb);

	if (musb_to_hcd(musb)->status_urb)

		usb_hcd_poll_rh_status(musb_to_hcd(musb));

	else

		usb_hcd_resume_root_hub(musb_to_hcd(musb));

}

drivers/usb/musb/musb_host.h

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ extern void musb_host_tx(struct musb *, u8); 
extern void musb_host_rx(struct musb *, u8);

extern void musb_root_disconnect(struct musb *musb);



extern void musb_host_resume_root_hub(struct musb *musb);

extern void musb_host_poke_root_hub(struct musb *musb);



struct usb_hcd;



extern int musb_hub_status_data(struct usb_hcd *hcd, char *buf);