Commit 66d1c802 authored by Piyush Mehta's avatar Piyush Mehta Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: Add support for VBUS control with PHY 



Some platforms make use of VBUS control over PHY which means controller
driver has to access PHY registers to turn on/off VBUS line.This patch
adds support for such platforms in chipidea.

Flag 'CI_HDRC_PHY_VBUS_CONTROL' added to support VBus control feature.

Acked-by: default avatarPeter Chen <peter.chen@kernel.org>
Signed-off-by: default avatarPiyush Mehta <piyush.mehta@xilinx.com>
Signed-off-by: default avatarPiyush Mehta <piyush.mehta@amd.com>
Link: https://lore.kernel.org/r/20220822054051.2941282-1-piyush.mehta@amd.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b91a8e3

drivers/usb/chipidea/ci_hdrc_usb2.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ static const struct ci_hdrc_platform_data ci_default_pdata = { 


static const struct ci_hdrc_platform_data ci_zynq_pdata = {

	.capoffset	= DEF_CAPOFFSET,

	.flags          = CI_HDRC_PHY_VBUS_CONTROL,

};



static const struct ci_hdrc_platform_data ci_zevio_pdata = {

drivers/usb/chipidea/host.c

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,13 @@ static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable) 
		priv->enabled = enable;

	}



	if (ci->platdata->flags & CI_HDRC_PHY_VBUS_CONTROL) {

		if (enable)

			usb_phy_vbus_on(ci->usb_phy);

		else

			usb_phy_vbus_off(ci->usb_phy);

	}



	if (enable && (ci->platdata->phy_mode == USBPHY_INTERFACE_MODE_HSIC)) {

		/*

		 * Marvell 28nm HSIC PHY requires forcing the port to HS mode.

drivers/usb/chipidea/otg_fsm.c

+7 −0
Original line number Diff line number Diff line
@@ -471,6 +471,10 @@ static void ci_otg_drv_vbus(struct otg_fsm *fsm, int on) 
				return;

			}

		}



		if (ci->platdata->flags & CI_HDRC_PHY_VBUS_CONTROL)

			usb_phy_vbus_on(ci->usb_phy);



		/* Disable data pulse irq */

		hw_write_otgsc(ci, OTGSC_DPIE, 0);
@@ -480,6 +484,9 @@ static void ci_otg_drv_vbus(struct otg_fsm *fsm, int on) 
		if (ci->platdata->reg_vbus)

			regulator_disable(ci->platdata->reg_vbus);



		if (ci->platdata->flags & CI_HDRC_PHY_VBUS_CONTROL)

			usb_phy_vbus_off(ci->usb_phy);



		fsm->a_bus_drop = 1;

		fsm->a_bus_req = 0;

	}

include/linux/usb/chipidea.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ struct ci_hdrc_platform_data { 
#define CI_HDRC_REQUIRES_ALIGNED_DMA	BIT(13)

#define CI_HDRC_IMX_IS_HSIC		BIT(14)

#define CI_HDRC_PMQOS			BIT(15)

#define CI_HDRC_PHY_VBUS_CONTROL	BIT(16)

	enum usb_dr_mode	dr_mode;

#define CI_HDRC_CONTROLLER_RESET_EVENT		0

#define CI_HDRC_CONTROLLER_STOPPED_EVENT	1