Commit 98e86506 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

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: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31e795c6

drivers/usb/renesas_usbhs/common.c

+9 −11
Original line number Diff line number Diff line
@@ -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);

	}

include/linux/usb/renesas_usbhs.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ struct renesas_usbhs_driver_param { 
	u32 cfifo_byte_addr:1; /* CFIFO is byte addressable */

#define USBHS_USB_DMAC_XFER_SIZE	32	/* hardcode the xfer size */

	u32 multi_clks:1;

	u32 has_new_pipe_configs:1;

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE