From: Michal Simek <michal.simek@xilinx.com>
Date: Fri, 18 May 2018 11:47:29 +0000 (+0200)
Subject: usb: dwc3: Fix travis issues caused by DM_USB code
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d21fde5a02635ce65de5559659fb8b44699e72b4;p=thirdparty%2Fu-boot.git

usb: dwc3: Fix travis issues caused by DM_USB code

Edison board requires dwc3_uboot to be availabe when DM_USB is enabled.
Also dwc3-omap is missing pointer to devm_kzalloc function.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index a895f8fbddd..1594bdbff0f 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -603,8 +603,6 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)
 
 #define DWC3_ALIGN_MASK		(16 - 1)
 
-#ifndef CONFIG_DM_USB
-
 /**
  * dwc3_uboot_init - dwc3 core uboot initialization code
  * @dwc3_dev: struct dwc3_device containing initialization data
@@ -792,7 +790,7 @@ MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver");
 
-#else
+#ifdef CONFIG_DM_USB
 
 int dwc3_init(struct dwc3 *dwc)
 {
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index afbd845b9dd..b314e804989 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <dm.h>
 #include <dwc3-omap-uboot.h>
 #include <linux/usb/dwc3-omap.h>
 #include <linux/ioport.h>