6 files changed, 16 insertions, 5 deletions
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index c281c38a28..8f0561eeba 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
@@ -244,17 +245,17 @@ static int mtk_musb_init(struct musb *musb)
 
 	ret = clk_enable(&glue->usbpllclk);
 	if (ret) {
-		dev_err(dev, "failed to enable usbpll clock\n");
+		dev_err(musb->controller, "failed to enable usbpll clock\n");
 		return ret;
 	}
 	ret = clk_enable(&glue->usbmcuclk);
 	if (ret) {
-		dev_err(dev, "failed to enable usbmcu clock\n");
+		dev_err(musb->controller, "failed to enable usbmcu clock\n");
 		return ret;
 	}
 	ret = clk_enable(&glue->usbclk);
 	if (ret) {
-		dev_err(dev, "failed to enable usb clock\n");
+		dev_err(musb->controller, "failed to enable usb clock\n");
 		return ret;
 	}
 
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index 961de99795..22811a5efb 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -80,6 +80,8 @@
 #include <linux/io.h>
 #else
 #include <common.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <usb.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index eb590885bc..d55a920ae5 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -32,6 +32,8 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <asm/omap_musb.h>
 #include "linux-compat.h"
 #endif
@@ -338,7 +340,7 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)
 	 * Also, DRVVBUS pulses for SRP (but not at 5V) ...
 	 */
 	if ((usbintr & MUSB_INTR_BABBLE) && is_host_enabled(musb))
-		pr_info("CAUTION: musb: Babble Interrupt Occured\n");
+		pr_info("CAUTION: musb: Babble Interrupt Occurred\n");
 
 	if (usbintr & ((1 << wrp->drvvbus) << wrp->usb_shift)) {
 		int drvvbus = dsps_readl(reg_base, wrp->status);
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index 8ba98d8c0e..5b149dac6d 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -23,6 +23,8 @@
 #include <linux/slab.h>
 #else
 #include <common.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <linux/bug.h>
 #include <linux/usb/ch9.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c
index 93f43ba471..cbd92fca6b 100644
--- a/drivers/usb/musb-new/musb_gadget_ep0.c
+++ b/drivers/usb/musb-new/musb_gadget_ep0.c
@@ -19,8 +19,10 @@
 #include <linux/interrupt.h>
 #else
 #include <common.h>
-#include "linux-compat.h"
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <asm/processor.h>
+#include "linux-compat.h"
 #endif
 
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c
index 5fa013659c..acb2d40f3b 100644
--- a/drivers/usb/musb-new/musb_host.c
+++ b/drivers/usb/musb-new/musb_host.c
@@ -22,6 +22,8 @@
 #include <linux/dma-mapping.h>
 #else
 #include <common.h>
+#include <dm.h>
+#include <dm/device_compat.h>
 #include <usb.h>
 #include <linux/bug.h>
 #include "linux-compat.h"