Commit 96b96b2a authored by Pawel Laszczak's avatar Pawel Laszczak Committed by Greg Kroah-Hartman
Browse files

usb: cdnsp: changes PCI Device ID to fix conflict with CNDS3 driver 



Patch changes CDNS_DEVICE_ID in USBSSP PCI Glue driver to remove
the conflict with Cadence USBSS driver.

cc: <stable@vger.kernel.org>
Fixes: 3d829045 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver")
Signed-off-by: default avatarPawel Laszczak <pawell@cadence.com>
Link: https://lore.kernel.org/r/20230309063048.299378-1-pawell@cadence.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1272fd65

drivers/usb/cdns3/cdnsp-pci.c

+11 −16
Original line number Diff line number Diff line
@@ -29,32 +29,25 @@ 
#define PLAT_DRIVER_NAME	"cdns-usbssp"



#define CDNS_VENDOR_ID		0x17cd

#define CDNS_DEVICE_ID		0x0100

#define CDNS_DEVICE_ID		0x0200

#define CDNS_DRD_ID		0x0100

#define CDNS_DRD_IF		(PCI_CLASS_SERIAL_USB << 8 | 0x80)



static struct pci_dev *cdnsp_get_second_fun(struct pci_dev *pdev)

{

	struct pci_dev *func;



	/*

	 * Gets the second function.

	 * It's little tricky, but this platform has two function.

	 * The fist keeps resources for Host/Device while the second

	 * keeps resources for DRD/OTG.

	 * Platform has two function. The fist keeps resources for

	 * Host/Device while the secon keeps resources for DRD/OTG.

	 */

	func = pci_get_device(pdev->vendor, pdev->device, NULL);

	if (!func)

		return NULL;

	if (pdev->device == CDNS_DEVICE_ID)

		return  pci_get_device(pdev->vendor, CDNS_DRD_ID, NULL);

	else if (pdev->device == CDNS_DRD_ID)

		return pci_get_device(pdev->vendor, CDNS_DEVICE_ID, NULL);



	if (func->devfn == pdev->devfn) {

		func = pci_get_device(pdev->vendor, pdev->device, func);

		if (!func)

	return NULL;

}



	return func;

}



static int cdnsp_pci_probe(struct pci_dev *pdev,

			   const struct pci_device_id *id)

{
@@ -230,6 +223,8 @@ static const struct pci_device_id cdnsp_pci_ids[] = { 
	  PCI_CLASS_SERIAL_USB_DEVICE, PCI_ANY_ID },

	{ PCI_VENDOR_ID_CDNS, CDNS_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,

	  CDNS_DRD_IF, PCI_ANY_ID },

	{ PCI_VENDOR_ID_CDNS, CDNS_DRD_ID, PCI_ANY_ID, PCI_ANY_ID,

	  CDNS_DRD_IF, PCI_ANY_ID },

	{ 0, }

};