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

Commit d2728fb3 authored by Roger Quadros's avatar Roger Quadros Committed by Felipe Balbi
Browse files

usb: dwc3: omap: Pass VBUS and ID events transparently 



Don't make any decisions regarding VBUS session based on ID
status. That is best left to the OTG core.

Pass ID and VBUS events independent of each other so that OTG
core knows exactly what to do.

This makes dual-role with extcon work with OTG irq on OMAP platforms.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 9ab330bf

drivers/usb/dwc3/dwc3-omap.c

+6 −8
Original line number Diff line number Diff line
@@ -231,18 +231,14 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap, 
		}



		val = dwc3_omap_read_utmi_ctrl(omap);

		val &= ~(USBOTGSS_UTMI_OTG_CTRL_IDDIG

				| USBOTGSS_UTMI_OTG_CTRL_VBUSVALID

				| USBOTGSS_UTMI_OTG_CTRL_SESSEND);

		val |= USBOTGSS_UTMI_OTG_CTRL_SESSVALID;

		val &= ~USBOTGSS_UTMI_OTG_CTRL_IDDIG;

		dwc3_omap_write_utmi_ctrl(omap, val);

		break;



	case OMAP_DWC3_VBUS_VALID:

		val = dwc3_omap_read_utmi_ctrl(omap);

		val &= ~USBOTGSS_UTMI_OTG_CTRL_SESSEND;

		val |= USBOTGSS_UTMI_OTG_CTRL_IDDIG

				| USBOTGSS_UTMI_OTG_CTRL_VBUSVALID

		val |= USBOTGSS_UTMI_OTG_CTRL_VBUSVALID

				| USBOTGSS_UTMI_OTG_CTRL_SESSVALID;

		dwc3_omap_write_utmi_ctrl(omap, val);

		break;
@@ -250,13 +246,15 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap, 
	case OMAP_DWC3_ID_FLOAT:

		if (omap->vbus_reg)

			regulator_disable(omap->vbus_reg);

		val = dwc3_omap_read_utmi_ctrl(omap);

		val |= USBOTGSS_UTMI_OTG_CTRL_IDDIG;

		dwc3_omap_write_utmi_ctrl(omap, val);



	case OMAP_DWC3_VBUS_OFF:

		val = dwc3_omap_read_utmi_ctrl(omap);

		val &= ~(USBOTGSS_UTMI_OTG_CTRL_SESSVALID

				| USBOTGSS_UTMI_OTG_CTRL_VBUSVALID);

		val |= USBOTGSS_UTMI_OTG_CTRL_SESSEND

				| USBOTGSS_UTMI_OTG_CTRL_IDDIG;

		val |= USBOTGSS_UTMI_OTG_CTRL_SESSEND;

		dwc3_omap_write_utmi_ctrl(omap, val);

		break;