From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Date: Thu, 12 May 2016 06:36:02 +0000 (+0530)
Subject: usb: dwc3: Modify routines dwc3_readl and dwc3_writel
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52b15be8e375aa42ef641ee4f2173ef6d6f4387a;p=thirdparty%2Fu-boot.git

usb: dwc3: Modify routines dwc3_readl and dwc3_writel

Modify routines dwc3_readl and dwc3_writel to be insync
with mainline.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index 8293246a220..0d9fa220e92 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -23,7 +23,7 @@
 #define	CACHELINE_SIZE		CONFIG_SYS_CACHELINE_SIZE
 static inline u32 dwc3_readl(void __iomem *base, u32 offset)
 {
-	u32 offs = offset - DWC3_GLOBALS_REGS_START;
+	unsigned long offs = offset - DWC3_GLOBALS_REGS_START;
 	u32 value;
 
 	/*
@@ -31,23 +31,21 @@ static inline u32 dwc3_readl(void __iomem *base, u32 offset)
 	 * space, see dwc3_probe in core.c.
 	 * However, the offsets are given starting from xHCI address space.
 	 */
-	offs += (unsigned long)base;
-	value = readl((unsigned long)offs);
+	value = readl(base + offs);
 
 	return value;
 }
 
 static inline void dwc3_writel(void __iomem *base, u32 offset, u32 value)
 {
-	u32 offs = offset - DWC3_GLOBALS_REGS_START;
+	unsigned long offs = offset - DWC3_GLOBALS_REGS_START;
 
 	/*
 	 * We requested the mem region starting from the Globals address
 	 * space, see dwc3_probe in core.c.
 	 * However, the offsets are given starting from xHCI address space.
 	 */
-	offs += (unsigned long)base;
-	writel(value, (unsigned long)offs);
+	writel(value, base + offs);
 }
 
 static inline void dwc3_flush_cache(int addr, int length)