Unverified Commit 394c3a14 authored by Pawel Laszczak's avatar Pawel Laszczak Committed by Peter Chen
Browse files

usb: cdns3: Moves reusable code to separate module 



Patch moves common reusable code used by cdns3 and cdnsp driver
to cdns-usb-common library. This library include core.c, drd.c
and host.c files.

Signed-off-by: default avatarPawel Laszczak <pawell@cadence.com>
Tested-by: default avatarAswath Govindraju <a-govindraju@ti.com>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
parent f7389572

drivers/usb/cdns3/Kconfig

+8 −0
Original line number Diff line number Diff line 
config CDNS_USB_COMMON

	tristate



config CDNS_USB_HOST

	bool



config USB_CDNS3

	tristate "Cadence USB3 Dual-Role Controller"

	depends on USB_SUPPORT && (USB || USB_GADGET) && HAS_DMA

	select USB_XHCI_PLATFORM if USB_XHCI_HCD

	select USB_ROLE_SWITCH

	select CDNS_USB_COMMON

	help

	  Say Y here if your system has a Cadence USB3 dual-role controller.

	  It supports: dual-role switch, Host-only, and Peripheral-only.
@@ -25,6 +32,7 @@ config USB_CDNS3_GADGET 
config USB_CDNS3_HOST

	bool "Cadence USB3 host controller"

	depends on USB=y || USB=USB_CDNS3

	select CDNS_USB_HOST

	help

	  Say Y here to enable host controller functionality of the

	  Cadence driver.

drivers/usb/cdns3/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -2,17 +2,19 @@ 
# define_trace.h needs to know how to find our header

CFLAGS_trace.o				:= -I$(src)



cdns3-y					:= cdns3-plat.o core.o drd.o

cdns-usb-common-y			:= core.o drd.o

cdns3-y					:= cdns3-plat.o



obj-$(CONFIG_USB_CDNS3)			+= cdns3.o

obj-$(CONFIG_CDNS_USB_COMMON)		+= cdns-usb-common.o



cdns-usb-common-$(CONFIG_CDNS_USB_HOST) += host.o

cdns3-$(CONFIG_USB_CDNS3_GADGET)	+= gadget.o ep0.o



ifneq ($(CONFIG_USB_CDNS3_GADGET),)

cdns3-$(CONFIG_TRACING)			+= trace.o

endif



cdns3-$(CONFIG_USB_CDNS3_HOST)		+= host.o



obj-$(CONFIG_USB_CDNS3_PCI_WRAP)	+= cdns3-pci-wrap.o

obj-$(CONFIG_USB_CDNS3_TI)		+= cdns3-ti.o

obj-$(CONFIG_USB_CDNS3_IMX)		+= cdns3-imx.o

drivers/usb/cdns3/cdns3-plat.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/pm_runtime.h>



#include "core.h"

#include "gadget-export.h"



static int set_phy_power_on(struct cdns3 *cdns)

{
@@ -134,6 +135,7 @@ static int cdns3_plat_probe(struct platform_device *pdev) 
	if (ret)

		goto err_phy_power_on;



	cdns->gadget_init = cdns3_gadget_init;

	ret = cdns3_init(cdns);

	if (ret)

		goto err_cdns_init;

drivers/usb/cdns3/core.c

+15 −3
Original line number Diff line number Diff line
@@ -19,10 +19,8 @@ 
#include <linux/io.h>

#include <linux/pm_runtime.h>



#include "gadget.h"

#include "core.h"

#include "host-export.h"

#include "gadget-export.h"

#include "drd.h"



static int cdns3_idle_init(struct cdns3 *cdns);
@@ -147,7 +145,11 @@ static int cdns3_core_init_role(struct cdns3 *cdns) 
	}



	if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_PERIPHERAL) {

		ret = cdns3_gadget_init(cdns);

		if (cdns->gadget_init)

			ret = cdns->gadget_init(cdns);

		else

			ret = -ENXIO;



		if (ret) {

			dev_err(dev, "Device initialization failed with %d\n",

				ret);
@@ -477,6 +479,7 @@ int cdns3_init(struct cdns3 *cdns) 


	return ret;

}

EXPORT_SYMBOL_GPL(cdns3_init);



/**

 * cdns3_remove - unbind drd driver and clean up
@@ -491,6 +494,7 @@ int cdns3_remove(struct cdns3 *cdns) 


	return 0;

}

EXPORT_SYMBOL_GPL(cdns3_remove);



#ifdef CONFIG_PM_SLEEP

int cdns3_suspend(struct cdns3 *cdns)
@@ -509,6 +513,7 @@ int cdns3_suspend(struct cdns3 *cdns) 


	return 0;

}

EXPORT_SYMBOL_GPL(cdns3_suspend);



int cdns3_resume(struct cdns3 *cdns, u8 set_active)

{
@@ -525,4 +530,11 @@ int cdns3_resume(struct cdns3 *cdns, u8 set_active) 


	return 0;

}

EXPORT_SYMBOL_GPL(cdns3_resume);

#endif /* CONFIG_PM_SLEEP */



MODULE_AUTHOR("Peter Chen <peter.chen@nxp.com>");

MODULE_AUTHOR("Pawel Laszczak <pawell@cadence.com>");

MODULE_AUTHOR("Roger Quadros <rogerq@ti.com>");

MODULE_DESCRIPTION("Cadence USBSS and USBSSP DRD Driver");

MODULE_LICENSE("GPL");

drivers/usb/cdns3/core.h

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct cdns3_platform_data { 
 * @pdata: platform data from glue layer

 * @lock: spinlock structure

 * @xhci_plat_data: xhci private data structure pointer

 * @gadget_init: pointer to gadget initialization function

 */

struct cdns3 {

	struct device			*dev;
@@ -115,6 +116,8 @@ struct cdns3 { 
	struct cdns3_platform_data	*pdata;

	spinlock_t			lock;

	struct xhci_plat_priv		*xhci_plat_data;



	int (*gadget_init)(struct cdns3 *cdns);

};



int cdns3_hw_role_switch(struct cdns3 *cdns);