leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: ehci-mx6: Make regulator DM_REGULATOR dependent

Browse Source 
Do the regulator related work only if the build has the DM_REGULATOR.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Abel Vesa 2019-02-01 16:40:08 +00:00 committed by Stefano Babic
parent 79536013a3
commit 921208ebca
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/host/ehci-mx6.c
View File

@ -404,6 +404,7 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev)
if (ret) if (ret)
return ret; return ret;
#if CONFIG_IS_ENABLED(DM_REGULATOR)
if (priv->vbus_supply) { if (priv->vbus_supply) {
ret = regulator_set_enable(priv->vbus_supply, ret = regulator_set_enable(priv->vbus_supply,
(type == USB_INIT_DEVICE) ? (type == USB_INIT_DEVICE) ?
@ -413,6 +414,7 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev)
return ret; return ret;
} }
} }
#endif
if (type == USB_INIT_DEVICE) if (type == USB_INIT_DEVICE)
return 0; return 0;
@ -514,15 +516,17 @@ static int ehci_usb_probe(struct udevice *dev)
priv->portnr = dev->seq; priv->portnr = dev->seq;
priv->init_type = type; priv->init_type = type;
#if CONFIG_IS_ENABLED(DM_REGULATOR)
ret = device_get_supply_regulator(dev, "vbus-supply", ret = device_get_supply_regulator(dev, "vbus-supply",
&priv->vbus_supply); &priv->vbus_supply);
if (ret) if (ret)
debug("%s: No vbus supply\n", dev->name); debug("%s: No vbus supply\n", dev->name);
#endif
ret = ehci_mx6_common_init(ehci, priv->portnr); ret = ehci_mx6_common_init(ehci, priv->portnr);
if (ret) if (ret)
return ret; return ret;
#if CONFIG_IS_ENABLED(DM_REGULATOR)
if (priv->vbus_supply) { if (priv->vbus_supply) {
ret = regulator_set_enable(priv->vbus_supply, ret = regulator_set_enable(priv->vbus_supply,
(type == USB_INIT_DEVICE) ? (type == USB_INIT_DEVICE) ?
@ -532,6 +536,7 @@ static int ehci_usb_probe(struct udevice *dev)
return ret; return ret;
} }
} }
#endif
if (priv->init_type == USB_INIT_HOST) { if (priv->init_type == USB_INIT_HOST) {
setbits_le32(&ehci->usbmode, CM_HOST); setbits_le32(&ehci->usbmode, CM_HOST);