Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index 852f07facc38e07a244bad501bb3ef8dd542c22f..233857ad7a13ae4ee73ac08c7f965afe987eb922 100644 (file)
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -88,7 +88,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
        int ctrl_mod;
        int usb_index;
 
-       platdata->base = (void *)dev_get_addr_index(dev, 1);
+       platdata->base = (void *)devfdt_get_addr_index(dev, 1);
 
        phys = fdtdec_lookup_phandle(fdt, node, "phys");
        ctrl_mod = fdtdec_lookup_phandle(fdt, phys, "ti,ctrl_mod");
@@ -106,7 +106,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
                                                          "mentor,multipoint",
                                                          -1);
        if (platdata->musb_config.multipoint < 0) {
-               error("MUSB multipoint DT entry missing\n");
+               pr_err("MUSB multipoint DT entry missing\n");
                return -ENOENT;
        }
 
@@ -115,14 +115,14 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
        platdata->musb_config.num_eps = fdtdec_get_int(fdt, node,
                                                       "mentor,num-eps", -1);
        if (platdata->musb_config.num_eps < 0) {
-               error("MUSB num-eps DT entry missing\n");
+               pr_err("MUSB num-eps DT entry missing\n");
                return -ENOENT;
        }
 
        platdata->musb_config.ram_bits = fdtdec_get_int(fdt, node,
                                                        "mentor,ram-bits", -1);
        if (platdata->musb_config.ram_bits < 0) {
-               error("MUSB ram-bits DT entry missing\n");
+               pr_err("MUSB ram-bits DT entry missing\n");
                return -ENOENT;
        }
 
@@ -132,7 +132,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
 
        platdata->plat.power = fdtdec_get_int(fdt, node, "mentor,power", -1);
        if (platdata->plat.power < 0) {
-               error("MUSB mentor,power DT entry missing\n");
+               pr_err("MUSB mentor,power DT entry missing\n");
                return -ENOENT;
        }
 
@@ -183,7 +183,7 @@ static int ti_musb_host_ofdata_to_platdata(struct udevice *dev)
 
        ret = ti_musb_ofdata_to_platdata(dev);
        if (ret) {
-               error("platdata dt parse error\n");
+               pr_err("platdata dt parse error\n");
                return ret;
        }
 
@@ -227,9 +227,9 @@ static int ti_musb_wrapper_bind(struct udevice *parent)
                case USB_DR_MODE_HOST:
                        /* Bind MUSB host */
                        ret = device_bind_driver_to_node(parent, "ti-musb-host",
-                                                        name, node, &dev);
+                                       name, offset_to_ofnode(node), &dev);
                        if (ret) {
-                               error("musb - not able to bind usb host node\n");
+                               pr_err("musb - not able to bind usb host node\n");
                                return ret;
                        }
                        break;