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

Commit 691962d1 authored by Sascha Hauer's avatar Sascha Hauer Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: introduce dual role mode pdata flags 



Even if a chipidea core is otg capable the board may not be. This allows
to explicitly set the core to host/peripheral mode. Without these flags
the driver falls back to the old behaviour.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 40dcd0e8

Documentation/devicetree/bindings/usb/ci13xxx-imx.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Recommended properies: 
- phy_type: the type of the phy connected to the core. Should be one

  of "utmi", "utmi_wide", "ulpi", "serial" or "hsic". Without this

  property the PORTSC register won't be touched

- dr_mode: One of "host", "peripheral" or "otg". Defaults to "otg"



Optional properties:

- fsl,usbphy: phandler of usb phy that connects to the only one port

drivers/usb/chipidea/core.c

+18 −6
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) 
	struct resource	*res;

	void __iomem	*base;

	int		ret;

	enum usb_dr_mode dr_mode;



	if (!dev->platform_data) {

		dev_err(dev, "platform data missing\n");
@@ -456,14 +457,25 @@ static int ci_hdrc_probe(struct platform_device *pdev) 
	if (!ci->platdata->phy_mode)

		ci->platdata->phy_mode = of_usb_get_phy_mode(dev->of_node);



	if (!ci->platdata->dr_mode)

		ci->platdata->dr_mode = of_usb_get_dr_mode(dev->of_node);



	if (ci->platdata->dr_mode == USB_DR_MODE_UNKNOWN)

		ci->platdata->dr_mode = USB_DR_MODE_OTG;



	dr_mode = ci->platdata->dr_mode;

	/* initialize role(s) before the interrupt is requested */

	if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_HOST) {

		ret = ci_hdrc_host_init(ci);

		if (ret)

			dev_info(dev, "doesn't support host\n");

	}



	if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_PERIPHERAL) {

		ret = ci_hdrc_gadget_init(ci);

		if (ret)

			dev_info(dev, "doesn't support gadget\n");

	}



	if (!ci->roles[CI_ROLE_HOST] && !ci->roles[CI_ROLE_GADGET]) {

		dev_err(dev, "no supported roles\n");

include/linux/usb/chipidea.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ struct ci13xxx_platform_data { 
#define CI13XXX_REQUIRE_TRANSCEIVER	BIT(1)

#define CI13XXX_PULLUP_ON_VBUS		BIT(2)

#define CI13XXX_DISABLE_STREAMING	BIT(3)



	enum usb_dr_mode	dr_mode;

#define CI13XXX_CONTROLLER_RESET_EVENT		0

#define CI13XXX_CONTROLLER_STOPPED_EVENT	1

	void	(*notify_event) (struct ci13xxx *ci, unsigned event);