These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / dwc2 / hcd_ddma.c

diff --git a/kernel/drivers/usb/dwc2/hcd_ddma.c b/kernel/drivers/usb/dwc2/hcd_ddma.c
index 3376177..78993ab 100644 (file)
--- a/kernel/drivers/usb/dwc2/hcd_ddma.c
+++ b/kernel/drivers/usb/dwc2/hcd_ddma.c
@@ -169,19 +169,19 @@ static void dwc2_per_sched_enable(struct dwc2_hsotg *hsotg, u32 fr_list_en)
 
        spin_lock_irqsave(&hsotg->lock, flags);
 
-       hcfg = readl(hsotg->regs + HCFG);
+       hcfg = dwc2_readl(hsotg->regs + HCFG);
        if (hcfg & HCFG_PERSCHEDENA) {
                /* already enabled */
                spin_unlock_irqrestore(&hsotg->lock, flags);
                return;
        }
 
-       writel(hsotg->frame_list_dma, hsotg->regs + HFLBADDR);
+       dwc2_writel(hsotg->frame_list_dma, hsotg->regs + HFLBADDR);
 
        hcfg &= ~HCFG_FRLISTEN_MASK;
        hcfg |= fr_list_en | HCFG_PERSCHEDENA;
        dev_vdbg(hsotg->dev, "Enabling Periodic schedule\n");
-       writel(hcfg, hsotg->regs + HCFG);
+       dwc2_writel(hcfg, hsotg->regs + HCFG);
 
        spin_unlock_irqrestore(&hsotg->lock, flags);
 }
@@ -193,7 +193,7 @@ static void dwc2_per_sched_disable(struct dwc2_hsotg *hsotg)
 
        spin_lock_irqsave(&hsotg->lock, flags);
 
-       hcfg = readl(hsotg->regs + HCFG);
+       hcfg = dwc2_readl(hsotg->regs + HCFG);
        if (!(hcfg & HCFG_PERSCHEDENA)) {
                /* already disabled */
                spin_unlock_irqrestore(&hsotg->lock, flags);
@@ -202,7 +202,7 @@ static void dwc2_per_sched_disable(struct dwc2_hsotg *hsotg)
 
        hcfg &= ~HCFG_PERSCHEDENA;
        dev_vdbg(hsotg->dev, "Disabling Periodic schedule\n");
-       writel(hcfg, hsotg->regs + HCFG);
+       dwc2_writel(hcfg, hsotg->regs + HCFG);
 
        spin_unlock_irqrestore(&hsotg->lock, flags);
 }