Merge branch 'master' of git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / drivers / usb / musb-new / sunxi.c

diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index d7170a3078c4c4007c9058af0df60029f100f5f7..f542a181fac2f55a94405ad7879704b7a45100a3 100644 (file)
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -435,11 +435,14 @@ static int musb_usb_probe(struct udevice *dev)
 {
        struct sunxi_glue *glue = dev_get_priv(dev);
        struct musb_host_data *host = &glue->mdata;
-       struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
        struct musb_hdrc_platform_data pdata;
        void *base = dev_read_addr_ptr(dev);
        int ret;
 
+#ifdef CONFIG_USB_MUSB_HOST
+       struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
+#endif
+
        if (!base)
                return -EINVAL;
 
@@ -459,7 +462,6 @@ static int musb_usb_probe(struct udevice *dev)
                return ret;
        }
 
-       priv->desc_before_addr = true;
 
        memset(&pdata, 0, sizeof(pdata));
        pdata.power = 250;
@@ -467,6 +469,8 @@ static int musb_usb_probe(struct udevice *dev)
        pdata.config = glue->cfg->config;
 
 #ifdef CONFIG_USB_MUSB_HOST
+       priv->desc_before_addr = true;
+
        pdata.mode = MUSB_HOST;
        host->host = musb_init_controller(&pdata, &glue->dev, base);
        if (!host->host)