Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e609108a authored by Marc Kleine-Budde's avatar Marc Kleine-Budde Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: usbmisc: prepare driver to handle more than one soc 



This attaches the usbmisc_ops to the of_device_id data and
makes it possible to define special functions per soc.

Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
[Alex: fixed one case of line-too-long and one bogus cast to void ptr]
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00b9a1f9

drivers/usb/chipidea/usbmisc_imx.c

+13 −5
Original line number Diff line number Diff line
@@ -19,13 +19,14 @@ 


#define USB_DEV_MAX 4



#define BM_OVER_CUR_DIS		BIT(7)

#define MX6_BM_OVER_CUR_DIS		BIT(7)



struct imx_usbmisc {

	void __iomem *base;

	spinlock_t lock;

	struct clk *clk;

	struct usbmisc_usb_device usbdev[USB_DEV_MAX];

	const struct usbmisc_ops *ops;

};



static struct imx_usbmisc *usbmisc;
@@ -65,7 +66,7 @@ static int usbmisc_imx6q_init(struct device *dev) 
	if (usbdev->disable_oc) {

		spin_lock_irqsave(&usbmisc->lock, flags);

		reg = readl(usbmisc->base + usbdev->index * 4);

		writel(reg | BM_OVER_CUR_DIS,

		writel(reg | MX6_BM_OVER_CUR_DIS,

			usbmisc->base + usbdev->index * 4);

		spin_unlock_irqrestore(&usbmisc->lock, flags);

	}
@@ -78,7 +79,10 @@ static const struct usbmisc_ops imx6q_usbmisc_ops = { 
};



static const struct of_device_id usbmisc_imx_dt_ids[] = {

	{ .compatible = "fsl,imx6q-usbmisc"},

	{

		.compatible = "fsl,imx6q-usbmisc",

		.data = &imx6q_usbmisc_ops,

	},

	{ /* sentinel */ }

};
@@ -87,6 +91,7 @@ static int usbmisc_imx_probe(struct platform_device *pdev) 
	struct resource	*res;

	struct imx_usbmisc *data;

	int ret;

	struct of_device_id *tmp_dev;



	if (usbmisc)

		return -EBUSY;
@@ -116,8 +121,11 @@ static int usbmisc_imx_probe(struct platform_device *pdev) 
		return ret;

	}



	tmp_dev = (struct of_device_id *)

		of_match_device(usbmisc_imx_dt_ids, &pdev->dev);

	data->ops = (const struct usbmisc_ops *)tmp_dev->data;

	usbmisc = data;

	ret = usbmisc_set_ops(&imx6q_usbmisc_ops);

	ret = usbmisc_set_ops(data->ops);

	if (ret) {

		usbmisc = NULL;

		clk_disable_unprepare(data->clk);
@@ -129,7 +137,7 @@ static int usbmisc_imx_probe(struct platform_device *pdev) 


static int usbmisc_imx_remove(struct platform_device *pdev)

{

	usbmisc_unset_ops(&imx6q_usbmisc_ops);

	usbmisc_unset_ops(usbmisc->ops);

	clk_disable_unprepare(usbmisc->clk);

	usbmisc = NULL;

	return 0;