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

Commit 0a9134bd authored by Bin Liu's avatar Bin Liu Committed by Greg Kroah-Hartman
Browse files

usb: musb: disable otg protocol support 

As decided in the discussion [1] we are deleting the otg protocol
support from the musb drivers.

First this patch disables the flags for enabling the otg protocols. We
will later gradually delete the otg protocol code from the musb drivers.

[1] https://www.spinics.net/lists/linux-usb/msg167003.html



Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d2852f2d

drivers/usb/musb/musb_gadget.c

+1 −4
Original line number Diff line number Diff line
@@ -1798,11 +1798,8 @@ int musb_gadget_setup(struct musb *musb) 


	/* this "gadget" abstracts/virtualizes the controller */

	musb->g.name = musb_driver_name;

#if IS_ENABLED(CONFIG_USB_MUSB_DUAL_ROLE)

	musb->g.is_otg = 1;

#elif IS_ENABLED(CONFIG_USB_MUSB_GADGET)

	/* don't support otg protocols */

	musb->g.is_otg = 0;

#endif

	INIT_DELAYED_WORK(&musb->gadget_work, musb_gadget_work);

	musb_g_init_endpoints(musb);

drivers/usb/musb/musb_host.c

+2 −1
Original line number Diff line number Diff line
@@ -2755,7 +2755,8 @@ int musb_host_setup(struct musb *musb, int power_budget) 
		musb->xceiv->otg->state = OTG_STATE_A_IDLE;

	}

	otg_set_host(musb->xceiv->otg, &hcd->self);

	hcd->self.otg_port = 1;

	/* don't support otg protocols */

	hcd->self.otg_port = 0;

	musb->xceiv->otg->host = &hcd->self;

	hcd->power_budget = 2 * (power_budget ? : 250);

	hcd->skip_phy_initialization = 1;