Unverified Commit 1c16f63d authored by Michał Mirosław's avatar Michał Mirosław Committed by Peter Chen
Browse files

usb: chipidea: usb2: absorb zevio glue driver 



ZEVIO glue code is is identical to generic binding now, but doesn't
enable runtime PM. Let's squash the driver and get runtime PM for free.

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
parent c2de37b3

drivers/usb/chipidea/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o 


obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_usb2.o

obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_msm.o

obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_zevio.o



obj-$(CONFIG_USB_CHIPIDEA_PCI)	+= ci_hdrc_pci.o

drivers/usb/chipidea/ci_hdrc_usb2.c

+6 −0
Original line number Diff line number Diff line
@@ -32,9 +32,15 @@ static const struct ci_hdrc_platform_data ci_zynq_pdata = { 
	.capoffset	= DEF_CAPOFFSET,

};



static const struct ci_hdrc_platform_data ci_zevio_pdata = {

	.capoffset	= DEF_CAPOFFSET,

	.flags		= CI_HDRC_REGS_SHARED | CI_HDRC_FORCE_FULLSPEED,

};



static const struct of_device_id ci_hdrc_usb2_of_match[] = {

	{ .compatible = "chipidea,usb2" },

	{ .compatible = "xlnx,zynq-usb-2.20a", .data = &ci_zynq_pdata },

	{ .compatible = "lsi,zevio-usb", .data = &ci_zevio_pdata },

	{ }

};

MODULE_DEVICE_TABLE(of, ci_hdrc_usb2_of_match);

drivers/usb/chipidea/ci_hdrc_zevio.c

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 *	Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>

 *

 * Based off drivers/usb/chipidea/ci_hdrc_msm.c

 */



#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/usb/gadget.h>

#include <linux/usb/chipidea.h>



#include "ci.h"



static struct ci_hdrc_platform_data ci_hdrc_zevio_platdata = {

	.name			= "ci_hdrc_zevio",

	.flags			= CI_HDRC_REGS_SHARED | CI_HDRC_FORCE_FULLSPEED,

	.capoffset		= DEF_CAPOFFSET,

};



static int ci_hdrc_zevio_probe(struct platform_device *pdev)

{

	struct platform_device *ci_pdev;



	dev_dbg(&pdev->dev, "ci_hdrc_zevio_probe\n");



	ci_pdev = ci_hdrc_add_device(&pdev->dev,

				pdev->resource, pdev->num_resources,

				&ci_hdrc_zevio_platdata);



	if (IS_ERR(ci_pdev)) {

		dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n");

		return PTR_ERR(ci_pdev);

	}



	platform_set_drvdata(pdev, ci_pdev);



	return 0;

}



static int ci_hdrc_zevio_remove(struct platform_device *pdev)

{

	struct platform_device *ci_pdev = platform_get_drvdata(pdev);



	ci_hdrc_remove_device(ci_pdev);



	return 0;

}



static const struct of_device_id ci_hdrc_zevio_dt_ids[] = {

	{ .compatible = "lsi,zevio-usb", },

	{ /* sentinel */ }

};



static struct platform_driver ci_hdrc_zevio_driver = {

	.probe = ci_hdrc_zevio_probe,

	.remove = ci_hdrc_zevio_remove,

	.driver = {

		.name = "zevio_usb",

		.of_match_table = ci_hdrc_zevio_dt_ids,

	},

};



MODULE_DEVICE_TABLE(of, ci_hdrc_zevio_dt_ids);

module_platform_driver(ci_hdrc_zevio_driver);



MODULE_LICENSE("GPL v2");