fotg210-udc: Improve device initialization

Reset the device explicitly to get into a known state and also set the chip
enable bit. Additionally, mask interrupts which aren't handled.

Signed-off-by: Fabian Vogt <fabian@ritter-vogt.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230123073508.2350402-4-linus.walleij@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/fotg210/fotg210-udc.c b/drivers/usb/fotg210/fotg210-udc.c
index c0518ae35034b2afad2eec1d4a99e93237c77e6c..ae29787de0fd6413133e8c2b4329d6c9c0a12a29 100644 (file)
--- a/drivers/usb/fotg210/fotg210-udc.c
+++ b/drivers/usb/fotg210/fotg210-udc.c
@@ -7,6 +7,7 @@
  * Author : Yuan-Hsin Chen <yhchen@faraday-tech.com>
  */
 
+#include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
@@ -1023,6 +1024,11 @@ static int fotg210_udc_start(struct usb_gadget *g,
                        dev_err(fotg210->dev, "can't bind to phy\n");
        }
 
+       /* chip enable */
+       value = ioread32(fotg210->reg + FOTG210_DMCR);
+       value |= DMCR_CHIP_EN;
+       iowrite32(value, fotg210->reg + FOTG210_DMCR);
+
        /* enable device global interrupt */
        value = ioread32(fotg210->reg + FOTG210_DMCR);
        value |= DMCR_GLINT_EN;
@@ -1039,6 +1045,15 @@ static void fotg210_init(struct fotg210_udc *fotg210)
        iowrite32(GMIR_MHC_INT | GMIR_MOTG_INT | GMIR_INT_POLARITY,
                  fotg210->reg + FOTG210_GMIR);
 
+       /* mask interrupts for groups other than 0-2 */
+       iowrite32(~(DMIGR_MINT_G0 | DMIGR_MINT_G1 | DMIGR_MINT_G2),
+                 fotg210->reg + FOTG210_DMIGR);
+
+       /* udc software reset */
+       iowrite32(DMCR_SFRST, fotg210->reg + FOTG210_DMCR);
+       /* Better wait a bit, but without a datasheet, no idea how long. */
+       usleep_range(100, 200);
+
        /* disable device global interrupt */
        value = ioread32(fotg210->reg + FOTG210_DMCR);
        value &= ~DMCR_GLINT_EN;

diff --git a/drivers/usb/fotg210/fotg210-udc.h b/drivers/usb/fotg210/fotg210-udc.h
index 22b72caf498c92cc39ed3db6326d5a758ef7c6cb..252cb2b8e2fefa1685eedfb1e8e63f8ad4bfab58 100644 (file)
--- a/drivers/usb/fotg210/fotg210-udc.h
+++ b/drivers/usb/fotg210/fotg210-udc.h
@@ -58,6 +58,8 @@
 
 /* Device Mask of Interrupt Group Register (0x130) */
 #define FOTG210_DMIGR          0x130
+#define DMIGR_MINT_G2          (1 << 2)
+#define DMIGR_MINT_G1          (1 << 1)
 #define DMIGR_MINT_G0          (1 << 0)
 
 /* Device Mask of Interrupt Source Group 0(0x134) */