usb: gadget: rcar: Add support for RZ/G2L (R9A07G044)

The Renesas RZ/G2L (and RZ/G2LC) USBHS controller requires the
CNEN bit in the SYSCFG register to be set for function operation.
Additionally, its CFIFO is byte-addressable.

Introduce a new renesas_usbhs_driver_param structure for the
RZ/G2L SoC and link it via the udevice_id data pointer. Update
usbhs_probe() to accept the udevice pointer to retrieve these
parameters during initialization.

This alignment follows the logic used in the Linux kernel
renesas_usbhs driver.

Reviewed-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Signed-off-by: Michele Bisogno <micbis.openwrt@gmail.com>

diff --git a/drivers/usb/gadget/rcar/common.c b/drivers/usb/gadget/rcar/common.c
index 2bf0dcff393264668da5d0a16ddaf54b3a5143f3..10548f7a20cdcaad07f86f4c36b834f13477ccd3 100644 (file)
--- a/drivers/usb/gadget/rcar/common.c
+++ b/drivers/usb/gadget/rcar/common.c
@@ -92,6 +92,12 @@ void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable)
        u16 mask = DCFM | DRPD | DPRPU | HSE | USBE;
        u16 val  = HSE | USBE;
 
+       /* CNEN bit is required for function operation */
+       if (usbhs_get_dparam(priv, has_cnen)) {
+               mask |= CNEN;
+               val  |= CNEN;
+       }
+
        /*
         * if enable
         *
@@ -363,13 +369,21 @@ static int usbhs_probe(struct udevice *dev)
 {
        struct usbhs_priv_otg_data *otg_priv = dev_get_priv(dev);
        struct usbhs_priv *priv = &otg_priv->usbhs_priv;
+       struct renesas_usbhs_driver_param *plat_param;
        int ret;
 
+       plat_param = (struct renesas_usbhs_driver_param *)dev_get_driver_data(dev);
+
        priv->dparam.type = USBHS_TYPE_RCAR_GEN3;
        priv->dparam.pio_dma_border = 64;
        priv->dparam.pipe_configs = usbhsc_new_pipe;
        priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
 
+       if (plat_param) {
+               priv->dparam.has_cnen           = plat_param->has_cnen;
+               priv->dparam.cfifo_byte_addr    = plat_param->cfifo_byte_addr;
+       }
+
        /* call pipe and module init */
        ret = usbhs_pipe_probe(priv);
        if (ret < 0)
@@ -487,8 +501,14 @@ static int usbhs_udc_otg_remove(struct udevice *dev)
        return dm_scan_fdt_dev(dev);
 }
 
+static struct renesas_usbhs_driver_param rzg2l_param = {
+       .has_cnen = 1,
+       .cfifo_byte_addr = 1,
+};
+
 static const struct udevice_id usbhs_udc_otg_ids[] = {
        { .compatible = "renesas,rcar-gen3-usbhs" },
+       { .compatible = "renesas,rzg2l-usbhs", .data = (unsigned long)&rzg2l_param },
        {},
 };
 

diff --git a/drivers/usb/gadget/rcar/renesas_usb.h b/drivers/usb/gadget/rcar/renesas_usb.h
index 8155e3dcaf66de5af189ddf78c8def3bedc46cb0..140a70251cfcf442d31b62be969cd02cfdf58d2c 100644 (file)
--- a/drivers/usb/gadget/rcar/renesas_usb.h
+++ b/drivers/usb/gadget/rcar/renesas_usb.h
@@ -111,6 +111,7 @@ struct renesas_usbhs_driver_param {
        u32 has_otg:1; /* for controlling PWEN/EXTLP */
        u32 has_sudmac:1; /* for SUDMAC */
        u32 has_usb_dmac:1; /* for USB-DMAC */
+       u32 has_cnen:1;
        u32 cfifo_byte_addr:1; /* CFIFO is byte addressable */
 #define USBHS_USB_DMAC_XFER_SIZE       32      /* hardcode the xfer size */
        u32 multi_clks:1;