From: Vahram Aharonyan <vahr...@synopsys.com>

Add DCFG register field macro for descriptor DMA mode and update core
initialization routine to set that bit accordingly.

Signed-off-by: Vahram Aharonyan <vahr...@synopsys.com>
Signed-off-by: John Youn <johny...@synopsys.com>
---
 drivers/usb/dwc2/gadget.c | 10 ++++++++--
 drivers/usb/dwc2/hw.h     |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 4e84862..f076160 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2893,15 +2893,21 @@ void dwc2_hsotg_core_init_disconnected(struct 
dwc2_hsotg *hsotg,
 
        dwc2_writel(intmsk, hsotg->regs + GINTMSK);
 
-       if (using_dma(hsotg))
+       if (using_dma(hsotg)) {
                dwc2_writel(GAHBCFG_GLBL_INTR_EN | GAHBCFG_DMA_EN |
                            (GAHBCFG_HBSTLEN_INCR4 << GAHBCFG_HBSTLEN_SHIFT),
                            hsotg->regs + GAHBCFG);
-       else
+
+               /* Set DDMA mode support in the core if needed */
+               if (using_desc_dma(hsotg))
+                       __orr32(hsotg->regs + DCFG, DCFG_DESCDMA_EN);
+
+       } else {
                dwc2_writel(((hsotg->dedicated_fifos) ?
                                                (GAHBCFG_NP_TXF_EMP_LVL |
                                                 GAHBCFG_P_TXF_EMP_LVL) : 0) |
                            GAHBCFG_GLBL_INTR_EN, hsotg->regs + GAHBCFG);
+       }
 
        /*
         * If INTknTXFEmpMsk is enabled, it's important to disable ep interrupts
diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h
index 4186c57..5be056b 100644
--- a/drivers/usb/dwc2/hw.h
+++ b/drivers/usb/dwc2/hw.h
@@ -412,6 +412,7 @@
 /* Device mode registers */
 
 #define DCFG                           HSOTG_REG(0x800)
+#define DCFG_DESCDMA_EN                        (1 << 23)
 #define DCFG_EPMISCNT_MASK             (0x1f << 18)
 #define DCFG_EPMISCNT_SHIFT            18
 #define DCFG_EPMISCNT_LIMIT            0x1f
-- 
2.10.0

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to