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

Commit 6e3d4bec authored by Keshava Munegowda's avatar Keshava Munegowda Committed by Felipe Balbi
Browse files

omap:usb: add regulator support for EHCI 



in case of ehci phy mode; regulator of phy
should be enabled before initializing the
usbhs core driver.

Signed-off-by: default avatarKeshava Munegowda <keshava_mgowda@ti.com>
Tested-by: default avatarSteve Calfee <stevecalfee@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent d11536e4

drivers/mfd/omap-usb-host.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/dma-mapping.h>

#include <linux/spinlock.h>

#include <linux/gpio.h>

#include <linux/regulator/consumer.h>

#include <plat/usb.h>



#define USBHS_DRIVER_NAME	"usbhs-omap"

drivers/usb/host/ehci-omap.c

+20 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/slab.h>

#include <linux/usb/ulpi.h>

#include <plat/usb.h>

#include <linux/regulator/consumer.h>



/* EHCI Register Set */

#define EHCI_INSNREG04					(0xA0)
@@ -118,6 +119,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 
	struct ehci_hcd				*omap_ehci;

	int					ret = -ENODEV;

	int					irq;

	int					i;

	char					supply[7];



	if (usb_disabled())

		return -ENODEV;
@@ -158,6 +161,23 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 
	hcd->rsrc_len = resource_size(res);

	hcd->regs = regs;



	/* get ehci regulator and enable */

	for (i = 0 ; i < OMAP3_HS_USB_PORTS ; i++) {

		if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) {

			pdata->regulator[i] = NULL;

			continue;

		}

		snprintf(supply, sizeof(supply), "hsusb%d", i);

		pdata->regulator[i] = regulator_get(dev, supply);

		if (IS_ERR(pdata->regulator[i])) {

			pdata->regulator[i] = NULL;

			dev_dbg(dev,

			"failed to get ehci port%d regulator\n", i);

		} else {

			regulator_enable(pdata->regulator[i]);

		}

	}



	ret = omap_usbhs_enable(dev);

	if (ret) {

		dev_err(dev, "failed to start usbhs with err %d\n", ret);