summaryrefslogtreecommitdiffstats
path: root/drivers/usb/renesas_usbhs
diff options
context:
space:
mode:
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>2019-06-25 14:38:52 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-26 10:33:08 +0800
commit98e86506c24932a30f50ffcfcbc98b04e3c9bc60 (patch)
treeb614f83c1417c4887d18e328eb9dc87b8cedd12f /drivers/usb/renesas_usbhs
parent31e795c61d60f7044e5e39eb94f4c5cfcb94108f (diff)
downloadlinux-98e86506c24932a30f50ffcfcbc98b04e3c9bc60.tar.gz
linux-98e86506c24932a30f50ffcfcbc98b04e3c9bc60.tar.bz2
linux-98e86506c24932a30f50ffcfcbc98b04e3c9bc60.zip
usb: renesas_usbhs: Add has_new_pipe_configs flag
In the future, each struct renesas_usbhs_driver_param is stored on the each platform related source code (e.g. rcar3.c). So, to simplify the source code, this patch adds a new flag has_new_pipe_configs. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/renesas_usbhs')
-rw-r--r--drivers/usb/renesas_usbhs/common.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index 35b06e7d4eb4..f9476a07b0e9 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -529,8 +529,7 @@ static const struct usbhs_of_data rcar_gen2_data = {
.platform_callback = &usbhs_rcar2_ops,
.param = {
.has_usb_dmac = 1,
- .pipe_configs = usbhsc_new_pipe,
- .pipe_size = ARRAY_SIZE(usbhsc_new_pipe),
+ .has_new_pipe_configs = 1,
}
};
@@ -539,8 +538,7 @@ static const struct usbhs_of_data rcar_gen3_data = {
.param = {
.has_usb_dmac = 1,
.multi_clks = 1,
- .pipe_configs = usbhsc_new_pipe,
- .pipe_size = ARRAY_SIZE(usbhsc_new_pipe),
+ .has_new_pipe_configs = 1,
}
};
@@ -549,16 +547,14 @@ static const struct usbhs_of_data rcar_gen3_with_pll_data = {
.param = {
.has_usb_dmac = 1,
.multi_clks = 1,
- .pipe_configs = usbhsc_new_pipe,
- .pipe_size = ARRAY_SIZE(usbhsc_new_pipe),
+ .has_new_pipe_configs = 1,
}
};
static const struct usbhs_of_data rza1_data = {
.platform_callback = &usbhs_rza1_ops,
.param = {
- .pipe_configs = usbhsc_new_pipe,
- .pipe_size = ARRAY_SIZE(usbhsc_new_pipe),
+ .has_new_pipe_configs = 1,
}
};
@@ -567,8 +563,7 @@ static const struct usbhs_of_data rza2_data = {
.param = {
.has_cnen = 1,
.cfifo_byte_addr = 1,
- .pipe_configs = usbhsc_new_pipe,
- .pipe_size = ARRAY_SIZE(usbhsc_new_pipe),
+ .has_new_pipe_configs = 1,
}
};
@@ -715,7 +710,10 @@ static int usbhs_probe(struct platform_device *pdev)
priv->pfunc = info->platform_callback;
/* set default param if platform doesn't have */
- if (!priv->dparam.pipe_configs) {
+ if (usbhs_get_dparam(priv, has_new_pipe_configs)) {
+ priv->dparam.pipe_configs = usbhsc_new_pipe;
+ priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
+ } else if (!priv->dparam.pipe_configs) {
priv->dparam.pipe_configs = usbhsc_default_pipe;
priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_default_pipe);
}