diff options
Diffstat (limited to 'drivers/usb/cdns3/host.c')
| -rw-r--r-- | drivers/usb/cdns3/host.c | 16 | 
1 files changed, 14 insertions, 2 deletions
| diff --git a/drivers/usb/cdns3/host.c b/drivers/usb/cdns3/host.c index 6164fc4c96a4..ceca4d839dfd 100644 --- a/drivers/usb/cdns3/host.c +++ b/drivers/usb/cdns3/host.c @@ -18,6 +18,11 @@  #include "../host/xhci.h"  #include "../host/xhci-plat.h" +/* + * The XECP_PORT_CAP_REG and XECP_AUX_CTRL_REG1 exist only + * in Cadence USB3 dual-role controller, so it can't be used + * with Cadence CDNSP dual-role controller. + */  #define XECP_PORT_CAP_REG	0x8000  #define XECP_AUX_CTRL_REG1	0x8120 @@ -57,6 +62,8 @@ static const struct xhci_plat_priv xhci_plat_cdns3_xhci = {  	.resume_quirk = xhci_cdns3_resume_quirk,  }; +static const struct xhci_plat_priv xhci_plat_cdnsp_xhci; +  static int __cdns_host_init(struct cdns *cdns)  {  	struct platform_device *xhci; @@ -81,8 +88,13 @@ static int __cdns_host_init(struct cdns *cdns)  		goto err1;  	} -	cdns->xhci_plat_data = kmemdup(&xhci_plat_cdns3_xhci, -			sizeof(struct xhci_plat_priv), GFP_KERNEL); +	if (cdns->version < CDNSP_CONTROLLER_V2) +		cdns->xhci_plat_data = kmemdup(&xhci_plat_cdns3_xhci, +				sizeof(struct xhci_plat_priv), GFP_KERNEL); +	else +		cdns->xhci_plat_data = kmemdup(&xhci_plat_cdnsp_xhci, +				sizeof(struct xhci_plat_priv), GFP_KERNEL); +  	if (!cdns->xhci_plat_data) {  		ret = -ENOMEM;  		goto err1; |