usb: renesas_usbhs: unify Gen2/3 pipe_config setting

This patch unifies the Gen2 and Gen3 pipe_config setting on
usbhs_parse_dt().

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index f0ce304c5aaf54f1255bd94d786a3e1cb4148b79..2a860e496b4fe16b6c307bddc17ee741f8cd6965 100644 (file)
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -519,8 +519,11 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev)
                dparam->enable_gpio = gpio;
 
        if (dparam->type == USBHS_TYPE_RCAR_GEN2 ||
-           dparam->type == USBHS_TYPE_RCAR_GEN3)
+           dparam->type == USBHS_TYPE_RCAR_GEN3) {
                dparam->has_usb_dmac = 1;
+               dparam->pipe_configs = usbhsc_new_pipe;
+               dparam->pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
+       }
 
        return info;
 }
@@ -577,17 +580,9 @@ static int usbhs_probe(struct platform_device *pdev)
        switch (priv->dparam.type) {
        case USBHS_TYPE_RCAR_GEN2:
                priv->pfunc = usbhs_rcar2_ops;
-               if (!priv->dparam.pipe_configs) {
-                       priv->dparam.pipe_configs = usbhsc_new_pipe;
-                       priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
-               }
                break;
        case USBHS_TYPE_RCAR_GEN3:
                priv->pfunc = usbhs_rcar3_ops;
-               if (!priv->dparam.pipe_configs) {
-                       priv->dparam.pipe_configs = usbhsc_new_pipe;
-                       priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
-               }
                break;
        default:
                if (!info->platform_callback.get_id) {