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

Commit 6c5f6a6f authored by Daniel Mack's avatar Daniel Mack Committed by Felipe Balbi
Browse files

usb: musb: use musb->port_mode 



Initialize the host and gadget subsystems of the musb driver only when
the appropriate mode is selected from platform data, or device-tree
information, respectively.

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 9ad96e69

drivers/usb/musb/musb_core.c

+17 −5
Original line number Diff line number Diff line
@@ -1904,11 +1904,23 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
		musb->xceiv->state = OTG_STATE_B_IDLE;

	}



	switch (musb->port_mode) {

	case MUSB_PORT_MODE_HOST:

		status = musb_host_setup(musb, plat->power);

		break;

	case MUSB_PORT_MODE_GADGET:

		status = musb_gadget_setup(musb);

		break;

	case MUSB_PORT_MODE_DUAL_ROLE:

		status = musb_host_setup(musb, plat->power);

		if (status < 0)

			goto fail3;



		status = musb_gadget_setup(musb);

		break;

	default:

		dev_err(dev, "unsupported port mode %d\n", musb->port_mode);

		break;

	}



	if (status < 0)

		goto fail3;

drivers/usb/musb/musb_virthub.c

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ static void musb_start(struct musb *musb) 
	 * (b) vbus present/connect IRQ, peripheral mode;

	 * (c) peripheral initiates, using SRP

	 */

	if ((devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {

	if (musb->port_mode != MUSB_PORT_MODE_HOST &&

	    (devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {

		musb->is_active = 1;

	} else {

		devctl |= MUSB_DEVCTL_SESSION;