tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

usb: dwc3: omap: add dwc3_omap_readl/writel functions

We separate between dwc3-omap helper functions to dwc3-core helper
functions. This will allow us to change the helper functions
implementation according to each module need.

Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>

authored by

Ido Shayevitz and committed by
Felipe Balbi ab5e59db 07e7f47b

+21 -11
+21 -11
drivers/usb/dwc3/dwc3-omap.c
··· 49 49 #include <linux/of.h> 50 50 51 51 #include "core.h" 52 - #include "io.h" 53 52 54 53 /* 55 54 * All these registers belong to OMAP's Wrapper around the ··· 142 143 u32 dma_status:1; 143 144 }; 144 145 146 + static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset) 147 + { 148 + return readl(base + offset); 149 + } 150 + 151 + static inline void dwc3_omap_writel(void __iomem *base, u32 offset, u32 value) 152 + { 153 + writel(value, base + offset); 154 + } 155 + 156 + 145 157 static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap) 146 158 { 147 159 struct dwc3_omap *omap = _omap; ··· 160 150 161 151 spin_lock(&omap->lock); 162 152 163 - reg = dwc3_readl(omap->base, USBOTGSS_IRQSTATUS_1); 153 + reg = dwc3_omap_readl(omap->base, USBOTGSS_IRQSTATUS_1); 164 154 165 155 if (reg & USBOTGSS_IRQ1_DMADISABLECLR) { 166 156 dev_dbg(omap->dev, "DMA Disable was Cleared\n"); ··· 194 184 if (reg & USBOTGSS_IRQ1_IDPULLUP_FALL) 195 185 dev_dbg(omap->dev, "IDPULLUP Fall\n"); 196 186 197 - dwc3_writel(omap->base, USBOTGSS_IRQSTATUS_1, reg); 187 + dwc3_omap_writel(omap->base, USBOTGSS_IRQSTATUS_1, reg); 198 188 199 - reg = dwc3_readl(omap->base, USBOTGSS_IRQSTATUS_0); 200 - dwc3_writel(omap->base, USBOTGSS_IRQSTATUS_0, reg); 189 + reg = dwc3_omap_readl(omap->base, USBOTGSS_IRQSTATUS_0); 190 + dwc3_omap_writel(omap->base, USBOTGSS_IRQSTATUS_0, reg); 201 191 202 192 spin_unlock(&omap->lock); 203 193 ··· 280 270 omap->base = base; 281 271 omap->dwc3 = dwc3; 282 272 283 - reg = dwc3_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS); 273 + reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS); 284 274 285 275 utmi_mode = of_get_property(node, "utmi-mode", &size); 286 276 if (utmi_mode && size == sizeof(*utmi_mode)) { ··· 303 293 } 304 294 } 305 295 306 - dwc3_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS, reg); 296 + dwc3_omap_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS, reg); 307 297 308 298 /* check the DMA Status */ 309 - reg = dwc3_readl(omap->base, USBOTGSS_SYSCONFIG); 299 + reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG); 310 300 omap->dma_status = !!(reg & USBOTGSS_SYSCONFIG_DMADISABLE); 311 301 312 302 /* Set No-Idle and No-Standby */ ··· 316 306 reg |= (USBOTGSS_SYSCONFIG_STANDBYMODE(USBOTGSS_STANDBYMODE_NO_STANDBY) 317 307 | USBOTGSS_SYSCONFIG_IDLEMODE(USBOTGSS_IDLEMODE_NO_IDLE)); 318 308 319 - dwc3_writel(omap->base, USBOTGSS_SYSCONFIG, reg); 309 + dwc3_omap_writel(omap->base, USBOTGSS_SYSCONFIG, reg); 320 310 321 311 ret = devm_request_irq(dev, omap->irq, dwc3_omap_interrupt, 0, 322 312 "dwc3-omap", omap); ··· 328 318 329 319 /* enable all IRQs */ 330 320 reg = USBOTGSS_IRQO_COREIRQ_ST; 331 - dwc3_writel(omap->base, USBOTGSS_IRQENABLE_SET_0, reg); 321 + dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_0, reg); 332 322 333 323 reg = (USBOTGSS_IRQ1_OEVT | 334 324 USBOTGSS_IRQ1_DRVVBUS_RISE | ··· 340 330 USBOTGSS_IRQ1_DISCHRGVBUS_FALL | 341 331 USBOTGSS_IRQ1_IDPULLUP_FALL); 342 332 343 - dwc3_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg); 333 + dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg); 344 334 345 335 ret = platform_device_add_resources(dwc3, pdev->resource, 346 336 pdev->num_resources);