Commit 76eff170 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

usb: renesas_usbhs: Use renesas_usbhs_platform_info on of_device_id.data 



In device tree environment, the previous code allocates
renesas_usbhs_platform_info by using devm_kzalloc() and then copies
usbhs_of_data to the allocated memory. This reason is some values
(e.g. .platform_callback.get_vbus) are overwritten by the driver,
but the of_device_id.data is "const". Now the driver doesn't have
such a code, so this patch uses renesas_usbhs_platform_info on
of_device_id.data.

Note that the previous code set the pdev->dev.platform_data pointer
even if device tree environment, but the value is not used. So,
this patch also remove such a code.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be0a42a7

drivers/usb/renesas_usbhs/common.c

+16 −77
Original line number Diff line number Diff line
@@ -530,128 +530,65 @@ int usbhsc_schedule_notify_hotplug(struct platform_device *pdev) 
	return 0;

}



static const struct usbhs_of_data rcar_gen2_data = {

	.platform_callback = &usbhs_rcar2_ops,

	.param = {

		.has_usb_dmac = 1,

		.has_new_pipe_configs = 1,

	}

};



static const struct usbhs_of_data rcar_gen3_data = {

	.platform_callback = &usbhs_rcar3_ops,

	.param = {

		.has_usb_dmac = 1,

		.multi_clks = 1,

		.has_new_pipe_configs = 1,

	}

};



static const struct usbhs_of_data rcar_gen3_with_pll_data = {

	.platform_callback = &usbhs_rcar3_with_pll_ops,

	.param = {

		.has_usb_dmac = 1,

		.multi_clks = 1,

		.has_new_pipe_configs = 1,

	}

};



static const struct usbhs_of_data rza1_data = {

	.platform_callback = &usbhs_rza1_ops,

	.param = {

		.has_new_pipe_configs = 1,

	}

};



static const struct usbhs_of_data rza2_data = {

	.platform_callback = &usbhs_rza2_ops,

	.param = {

		.has_cnen = 1,

		.cfifo_byte_addr = 1,

		.has_new_pipe_configs = 1,

	}

};



/*

 *		platform functions

 */

static const struct of_device_id usbhs_of_match[] = {

	{

		.compatible = "renesas,usbhs-r8a774c0",

		.data = &rcar_gen3_with_pll_data,

		.data = &usbhs_rcar_gen3_with_pll_plat_info,

	},

	{

		.compatible = "renesas,usbhs-r8a7790",

		.data = &rcar_gen2_data,

		.data = &usbhs_rcar_gen2_plat_info,

	},

	{

		.compatible = "renesas,usbhs-r8a7791",

		.data = &rcar_gen2_data,

		.data = &usbhs_rcar_gen2_plat_info,

	},

	{

		.compatible = "renesas,usbhs-r8a7794",

		.data = &rcar_gen2_data,

		.data = &usbhs_rcar_gen2_plat_info,

	},

	{

		.compatible = "renesas,usbhs-r8a7795",

		.data = &rcar_gen3_data,

		.data = &usbhs_rcar_gen3_plat_info,

	},

	{

		.compatible = "renesas,usbhs-r8a7796",

		.data = &rcar_gen3_data,

		.data = &usbhs_rcar_gen3_plat_info,

	},

	{

		.compatible = "renesas,usbhs-r8a77990",

		.data = &rcar_gen3_with_pll_data,

		.data = &usbhs_rcar_gen3_with_pll_plat_info,

	},

	{

		.compatible = "renesas,usbhs-r8a77995",

		.data = &rcar_gen3_with_pll_data,

		.data = &usbhs_rcar_gen3_with_pll_plat_info,

	},

	{

		.compatible = "renesas,rcar-gen2-usbhs",

		.data = &rcar_gen2_data,

		.data = &usbhs_rcar_gen2_plat_info,

	},

	{

		.compatible = "renesas,rcar-gen3-usbhs",

		.data = &rcar_gen3_data,

		.data = &usbhs_rcar_gen3_plat_info,

	},

	{

		.compatible = "renesas,rza1-usbhs",

		.data = &rza1_data,

		.data = &usbhs_rza1_plat_info,

	},

	{

		.compatible = "renesas,rza2-usbhs",

		.data = &rza2_data,

		.data = &usbhs_rza2_plat_info,

	},

	{ },

};

MODULE_DEVICE_TABLE(of, usbhs_of_match);



static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev)

{

	struct renesas_usbhs_platform_info *info;

	struct renesas_usbhs_driver_param *dparam;

	const struct usbhs_of_data *data;



	info = devm_kzalloc(dev, sizeof(*info), GFP_KERNEL);

	if (!info)

		return NULL;



	data = of_device_get_match_data(dev);

	if (!data)

		return NULL;



	dparam = &info->driver_param;

	*dparam = data->param;

	info->platform_callback = *data->platform_callback;



	return info;

}



static int usbhs_probe(struct platform_device *pdev)

{

	struct renesas_usbhs_platform_info *info = renesas_usbhs_get_info(pdev);

	const struct renesas_usbhs_platform_info *info;

	struct usbhs_priv *priv;

	struct resource *res, *irq_res;

	struct device *dev = &pdev->dev;
@@ -660,7 +597,9 @@ static int usbhs_probe(struct platform_device *pdev) 


	/* check device node */

	if (dev_of_node(dev))

		info = pdev->dev.platform_data = usbhs_parse_dt(&pdev->dev);

		info = of_device_get_match_data(dev);

	else

		info = renesas_usbhs_get_info(pdev);



	/* check platform information */

	if (!info) {

drivers/usb/renesas_usbhs/common.h

+0 −5
Original line number Diff line number Diff line
@@ -282,11 +282,6 @@ struct usbhs_priv { 
	struct clk *clks[2];

};



struct usbhs_of_data {

	const struct renesas_usbhs_platform_callback	*platform_callback;

	const struct renesas_usbhs_driver_param		param;

};



/*

 * common

 */

drivers/usb/renesas_usbhs/rcar2.c

+11 −5
Original line number Diff line number Diff line
@@ -63,9 +63,15 @@ static int usbhs_rcar2_power_ctrl(struct platform_device *pdev, 
	return retval;

}



const struct renesas_usbhs_platform_callback usbhs_rcar2_ops = {

const struct renesas_usbhs_platform_info usbhs_rcar_gen2_plat_info = {

	.platform_callback = {

		.hardware_init = usbhs_rcar2_hardware_init,

		.hardware_exit = usbhs_rcar2_hardware_exit,

		.power_ctrl = usbhs_rcar2_power_ctrl,

		.get_id = usbhs_get_id_as_gadget,

	},

	.driver_param = {

		.has_usb_dmac = 1,

		.has_new_pipe_configs = 1,

	},

};

drivers/usb/renesas_usbhs/rcar2.h

+1 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "common.h"



extern const struct renesas_usbhs_platform_callback

	usbhs_rcar2_ops;
 
extern const struct renesas_usbhs_platform_info usbhs_rcar_gen2_plat_info;

drivers/usb/renesas_usbhs/rcar3.c

+20 −6
Original line number Diff line number Diff line
@@ -95,12 +95,26 @@ static int usbhs_rcar3_power_and_pll_ctrl(struct platform_device *pdev, 
	return 0;

}



const struct renesas_usbhs_platform_callback usbhs_rcar3_ops = {

const struct renesas_usbhs_platform_info usbhs_rcar_gen3_plat_info = {

	.platform_callback = {

		.power_ctrl = usbhs_rcar3_power_ctrl,

		.get_id = usbhs_get_id_as_gadget,

	},

	.driver_param = {

		.has_usb_dmac = 1,

		.multi_clks = 1,

		.has_new_pipe_configs = 1,

	},

};



const struct renesas_usbhs_platform_callback usbhs_rcar3_with_pll_ops = {

const struct renesas_usbhs_platform_info usbhs_rcar_gen3_with_pll_plat_info = {

	.platform_callback = {

		.power_ctrl = usbhs_rcar3_power_and_pll_ctrl,

		.get_id = usbhs_get_id_as_gadget,

	},

	.driver_param = {

		.has_usb_dmac = 1,

		.multi_clks = 1,

		.has_new_pipe_configs = 1,

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE