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

Commit d445b6da authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Felipe Balbi
Browse files

usb: musb: Start using struct usb_otg 



Use struct usb_otg members with OTG specific functions instead
of usb_phy members.

[ balbi@ti.com: added a missing change on musb_gadget.c to avoid
	a compile error on a later patch ]

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 76eb57ec

drivers/usb/musb/am35x.c

+3 −2
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci) 
	struct device *dev = musb->controller;

	struct musb_hdrc_platform_data *plat = dev->platform_data;

	struct omap_musb_board_data *data = plat->board_data;

	struct usb_otg *otg = musb->xceiv->otg;

	unsigned long flags;

	irqreturn_t ret = IRQ_NONE;

	u32 epintr, usbintr;
@@ -289,14 +290,14 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci) 
			WARNING("VBUS error workaround (delay coming)\n");

		} else if (is_host_enabled(musb) && drvvbus) {

			MUSB_HST_MODE(musb);

			musb->xceiv->default_a = 1;

			otg->default_a = 1;

			musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;

			portstate(musb->port1_status |= USB_PORT_STAT_POWER);

			del_timer(&otg_workaround);

		} else {

			musb->is_active = 0;

			MUSB_DEV_MODE(musb);

			musb->xceiv->default_a = 0;

			otg->default_a = 0;

			musb->xceiv->state = OTG_STATE_B_IDLE;

			portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);

		}

drivers/usb/musb/da8xx.c

+3 −2
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) 
{

	struct musb		*musb = hci;

	void __iomem		*reg_base = musb->ctrl_base;

	struct usb_otg		*otg = musb->xceiv->otg;

	unsigned long		flags;

	irqreturn_t		ret = IRQ_NONE;

	u32			status;
@@ -351,14 +352,14 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) 
			WARNING("VBUS error workaround (delay coming)\n");

		} else if (is_host_enabled(musb) && drvvbus) {

			MUSB_HST_MODE(musb);

			musb->xceiv->default_a = 1;

			otg->default_a = 1;

			musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;

			portstate(musb->port1_status |= USB_PORT_STAT_POWER);

			del_timer(&otg_workaround);

		} else {

			musb->is_active = 0;

			MUSB_DEV_MODE(musb);

			musb->xceiv->default_a = 0;

			otg->default_a = 0;

			musb->xceiv->state = OTG_STATE_B_IDLE;

			portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);

		}

drivers/usb/musb/davinci.c

+4 −3
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci) 
	unsigned long	flags;

	irqreturn_t	retval = IRQ_NONE;

	struct musb	*musb = __hci;

	struct usb_otg	*otg = musb->xceiv->otg;

	void __iomem	*tibase = musb->ctrl_base;

	struct cppi	*cppi;

	u32		tmp;
@@ -331,14 +332,14 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci) 
			WARNING("VBUS error workaround (delay coming)\n");

		} else if (is_host_enabled(musb) && drvvbus) {

			MUSB_HST_MODE(musb);

			musb->xceiv->default_a = 1;

			otg->default_a = 1;

			musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;

			portstate(musb->port1_status |= USB_PORT_STAT_POWER);

			del_timer(&otg_workaround);

		} else {

			musb->is_active = 0;

			MUSB_DEV_MODE(musb);

			musb->xceiv->default_a = 0;

			otg->default_a = 0;

			musb->xceiv->state = OTG_STATE_B_IDLE;

			portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);

		}
@@ -464,7 +465,7 @@ static int davinci_musb_exit(struct musb *musb) 
	davinci_musb_source_power(musb, 0 /*off*/, 1);



	/* delay, to avoid problems with module reload */

	if (is_host_enabled(musb) && musb->xceiv->default_a) {

	if (is_host_enabled(musb) && musb->xceiv->otg->default_a) {

		int	maxdelay = 30;

		u8	devctl, warn = 0;

drivers/usb/musb/musb_core.c

+6 −5
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ void musb_hnp_stop(struct musb *musb) 
static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,

				u8 devctl, u8 power)

{

	struct usb_otg *otg = musb->xceiv->otg;

	irqreturn_t handled = IRQ_NONE;



	dev_dbg(musb->controller, "<== Power=%02x, DevCtl=%02x, int_usb=0x%x\n", power, devctl,
@@ -626,7 +627,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 
		case OTG_STATE_B_PERIPHERAL:

			musb_g_suspend(musb);

			musb->is_active = is_otg_enabled(musb)

					&& musb->xceiv->gadget->b_hnp_enable;

					&& otg->gadget->b_hnp_enable;

			if (musb->is_active) {

				musb->xceiv->state = OTG_STATE_B_WAIT_ACON;

				dev_dbg(musb->controller, "HNP: Setting timer for b_ase0_brst\n");
@@ -643,7 +644,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 
		case OTG_STATE_A_HOST:

			musb->xceiv->state = OTG_STATE_A_SUSPEND;

			musb->is_active = is_otg_enabled(musb)

					&& musb->xceiv->host->b_hnp_enable;

					&& otg->host->b_hnp_enable;

			break;

		case OTG_STATE_B_HOST:

			/* Transition to B_PERIPHERAL, see 6.8.2.6 p 44 */
@@ -1965,7 +1966,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 


		if (is_otg_enabled(musb))

			hcd->self.otg_port = 1;

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

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

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



		/* program PHY to use external vBus if required */
@@ -1984,7 +1985,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
		struct usb_hcd	*hcd = musb_to_hcd(musb);



		MUSB_HST_MODE(musb);

		musb->xceiv->default_a = 1;

		musb->xceiv->otg->default_a = 1;

		musb->xceiv->state = OTG_STATE_A_IDLE;



		status = usb_add_hcd(musb_to_hcd(musb), -1, 0);
@@ -1999,7 +2000,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 


	} else /* peripheral is enabled */ {

		MUSB_DEV_MODE(musb);

		musb->xceiv->default_a = 0;

		musb->xceiv->otg->default_a = 0;

		musb->xceiv->state = OTG_STATE_B_IDLE;



		status = musb_gadget_setup(musb);

drivers/usb/musb/musb_gadget.c

+2 −1
Original line number Diff line number Diff line
@@ -1898,6 +1898,7 @@ static int musb_gadget_start(struct usb_gadget *g, 
		struct usb_gadget_driver *driver)

{

	struct musb		*musb = gadget_to_musb(g);

	struct usb_otg		*otg = musb->xceiv->otg;

	unsigned long		flags;

	int			retval = -EINVAL;
@@ -1945,7 +1946,7 @@ static int musb_gadget_start(struct usb_gadget *g, 
		}



		if ((musb->xceiv->last_event == USB_EVENT_ID)

					&& musb->xceiv->set_vbus)

					&& otg->set_vbus)

			otg_set_vbus(musb->xceiv, 1);



		hcd->self.uses_pio_for_control = 1;