Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

[u-boot] / drivers / dma / ti-edma3.c

diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c
index 247843891e2491fbae2d44629b9bac47864e0eb6..635eb7876d5526965a1fcf3584bdfb5dd2c3bd89 100644 (file)
--- a/drivers/dma/ti-edma3.c
+++ b/drivers/dma/ti-edma3.c
@@ -11,8 +11,8 @@
 
 #include <asm/io.h>
 #include <common.h>
+#include <dm.h>
 #include <dma.h>
-#include <dm/device.h>
 #include <asm/omap_common.h>
 #include <asm/ti-common/ti-edma3.h>
 
@@ -491,7 +491,7 @@ static int ti_edma3_transfer(struct udevice *dev, int direction, void *dst,
                __edma3_transfer(priv->base, 1, dst, src, len);
                break;
        default:
-               error("Transfer type not implemented in DMA driver\n");
+               pr_err("Transfer type not implemented in DMA driver\n");
                break;
        }
 
@@ -505,7 +505,7 @@ static int ti_edma3_ofdata_to_platdata(struct udevice *dev)
 {
        struct ti_edma3_priv *priv = dev_get_priv(dev);
 
-       priv->base = dev_get_addr(dev);
+       priv->base = devfdt_get_addr(dev);
 
        return 0;
 }