leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

omap:usb: add regulator support for EHCI

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

Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
Tested-by: Steve Calfee <stevecalfee@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Keshava Munegowda 2011-04-21 19:52:43 +05:30 committed by Felipe Balbi
parent d11536e4e0
commit 6e3d4bec6b
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mfd/omap-usb-host.c
View File

@ -25,7 +25,6 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <plat/usb.h> #include <plat/usb.h>
#define USBHS_DRIVER_NAME "usbhs-omap" #define USBHS_DRIVER_NAME "usbhs-omap"

20
drivers/usb/host/ehci-omap.c
View File

@ -40,6 +40,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/usb/ulpi.h> #include <linux/usb/ulpi.h>
#include <plat/usb.h> #include <plat/usb.h>
#include <linux/regulator/consumer.h>
/* EHCI Register Set */ /* EHCI Register Set */
#define EHCI_INSNREG04 (0xA0) #define EHCI_INSNREG04 (0xA0)
@ -118,6 +119,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
struct ehci_hcd *omap_ehci; struct ehci_hcd *omap_ehci;
int ret = -ENODEV; int ret = -ENODEV;
int irq; int irq;
int i;
char supply[7];
if (usb_disabled()) if (usb_disabled())
return -ENODEV; return -ENODEV;
@ -158,6 +161,23 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
hcd->rsrc_len = resource_size(res); hcd->rsrc_len = resource_size(res);
hcd->regs = regs; 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); ret = omap_usbhs_enable(dev);
if (ret) { if (ret) {
dev_err(dev, "failed to start usbhs with err %d\n", ret); dev_err(dev, "failed to start usbhs with err %d\n", ret);