]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
usb: ehci-mx6: Make regulator DM_REGULATOR dependent
authorAbel Vesa <abel.vesa@nxp.com>
Fri, 1 Feb 2019 16:40:08 +0000 (16:40 +0000)
committerStefano Babic <sbabic@denx.de>
Fri, 15 Feb 2019 21:01:15 +0000 (22:01 +0100)
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>
drivers/usb/host/ehci-mx6.c

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