| From b3b9c51fdcdd2998b2c9cdc9ee691430b55b9d4c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 10 Dec 2018 14:07:54 -0800 |
| Subject: PCI: Move Synopsys HAPS platform device IDs |
| |
| From: Thinh Nguyen <thinh.nguyen@synopsys.com> |
| |
| [ Upstream commit b6061b1e566d70c7686d194a6c47dc6ffa665c77 ] |
| |
| Move Synopsys HAPS platform device IDs to pci_ids.h so that both |
| drivers/pci/quirks.c and dwc3-haps driver can reference these IDs. |
| |
| Signed-off-by: Thinh Nguyen <thinhn@synopsys.com> |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/usb/dwc3/dwc3-haps.c | 4 ---- |
| include/linux/pci_ids.h | 3 +++ |
| 2 files changed, 3 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/usb/dwc3/dwc3-haps.c b/drivers/usb/dwc3/dwc3-haps.c |
| index c9cc33881bef..02d57d98ef9b 100644 |
| --- a/drivers/usb/dwc3/dwc3-haps.c |
| +++ b/drivers/usb/dwc3/dwc3-haps.c |
| @@ -15,10 +15,6 @@ |
| #include <linux/platform_device.h> |
| #include <linux/property.h> |
| |
| -#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd |
| -#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3_AXI 0xabce |
| -#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB31 0xabcf |
| - |
| /** |
| * struct dwc3_haps - Driver private structure |
| * @dwc3: child dwc3 platform_device |
| diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h |
| index 2792bca03088..05705d0b5689 100644 |
| --- a/include/linux/pci_ids.h |
| +++ b/include/linux/pci_ids.h |
| @@ -2361,6 +2361,9 @@ |
| #define PCI_DEVICE_ID_CENATEK_IDE 0x0001 |
| |
| #define PCI_VENDOR_ID_SYNOPSYS 0x16c3 |
| +#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd |
| +#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3_AXI 0xabce |
| +#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB31 0xabcf |
| |
| #define PCI_VENDOR_ID_USR 0x16ec |
| |
| -- |
| 2.25.1 |
| |
