[PATCH v3 03/24] Revert "usb: dwc2: Use the ahb_burst param"

[John Youn]

This reverts commit 70033c5ec15b ("usb: dwc2: Use the ahb_burst param").

This commit was inadvertently applied.

Signed-off-by: John Youn <johny...@synopsys.com>
---
 drivers/usb/dwc2/gadget.c |  2 +-
 drivers/usb/dwc2/hcd.c    |  8 +++++---
 drivers/usb/dwc2/params.c | 10 ++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index c7e1ab84a9bc..4e15ff2f59db 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -3234,7 +3234,7 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg 
*hsotg,
 
        if (using_dma(hsotg)) {
                dwc2_writel(GAHBCFG_GLBL_INTR_EN | GAHBCFG_DMA_EN |
-                           (hsotg->params.ahb_burst << GAHBCFG_HBSTLEN_SHIFT),
+                           (GAHBCFG_HBSTLEN_INCR4 << GAHBCFG_HBSTLEN_SHIFT),
                            hsotg->regs + GAHBCFG);
 
                /* Set DDMA mode support in the core if needed */
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 2173f979705a..2c90b0867ee1 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -273,9 +273,11 @@ static int dwc2_gahbcfg_init(struct dwc2_hsotg *hsotg)
 
        case GHWCFG2_INT_DMA_ARCH:
                dev_dbg(hsotg->dev, "Internal DMA Mode\n");
-               ahbcfg &= ~GAHBCFG_HBSTLEN_MASK;
-               ahbcfg |= (hsotg->params.ahb_burst <<
-                          GAHBCFG_HBSTLEN_SHIFT);
+               if (hsotg->params.ahbcfg != -1) {
+                       ahbcfg &= GAHBCFG_CTRL_MASK;
+                       ahbcfg |= hsotg->params.ahbcfg &
+                                 ~GAHBCFG_CTRL_MASK;
+               }
                break;
 
        case GHWCFG2_SLAVE_ONLY_ARCH:
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index aba8ee8dddd3..bcd1e19b4076 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -969,6 +969,15 @@ static void dwc2_set_param_reload_ctl(struct dwc2_hsotg 
*hsotg, int val)
        hsotg->params.reload_ctl = val;
 }
 
+static void dwc2_set_param_ahbcfg(struct dwc2_hsotg *hsotg, int val)
+{
+       if (val != -1)
+               hsotg->params.ahbcfg = val;
+       else
+               hsotg->params.ahbcfg = GAHBCFG_HBSTLEN_INCR4 <<
+                                               GAHBCFG_HBSTLEN_SHIFT;
+}
+
 static void dwc2_set_param_otg_ver(struct dwc2_hsotg *hsotg, int val)
 {
        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
@@ -1144,6 +1153,7 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
        dwc2_set_param_en_multiple_tx_fifo(hsotg,
                        params->en_multiple_tx_fifo);
        dwc2_set_param_reload_ctl(hsotg, params->reload_ctl);
+       dwc2_set_param_ahbcfg(hsotg, params->ahbcfg);
        dwc2_set_param_otg_ver(hsotg, params->otg_ver);
        dwc2_set_param_uframe_sched(hsotg, params->uframe_sched);
        dwc2_set_param_external_id_pin_ctl(hsotg, params->external_id_pin_ctl);
-- 
2.11.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