aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Kogut <joseph.kogut@gmail.com>2015-02-16 21:32:46 -0500
committerFelipe Balbi <balbi@ti.com>2015-03-10 16:33:23 -0400
commitadf9c3c85615f41c08559086e0d9ecdc6cc9db71 (patch)
tree2025fd187bc8b982be0a87c342ab90ff6781e307
parent25140ce627f43df1d425d591ac3d360b48ae24e1 (diff)
usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h
Removed FIXME from usb/dwc3/dwc3-pci.c by moving definition of PCI_VENDOR_ID_SYNOPSYS shared with usb/dwc2 to linux/pci_ids.h. Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/dwc2/pci.c1
-rw-r--r--drivers/usb/dwc3/dwc3-pci.c2
-rw-r--r--include/linux/pci_ids.h2
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c
index a4e724b0a62e..6646adb1fb17 100644
--- a/drivers/usb/dwc2/pci.c
+++ b/drivers/usb/dwc2/pci.c
@@ -54,7 +54,6 @@
54#include "core.h" 54#include "core.h"
55#include "hcd.h" 55#include "hcd.h"
56 56
57#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
58#define PCI_PRODUCT_ID_HAPS_HSOTG 0xabc0 57#define PCI_PRODUCT_ID_HAPS_HSOTG 0xabc0
59 58
60static const char dwc2_driver_name[] = "dwc2"; 59static const char dwc2_driver_name[] = "dwc2";
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 8d950569d557..b773fb53d6a7 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -24,8 +24,6 @@
24 24
25#include "platform_data.h" 25#include "platform_data.h"
26 26
27/* FIXME define these in <linux/pci_ids.h> */
28#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
29#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd 27#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd
30#define PCI_DEVICE_ID_INTEL_BYT 0x0f37 28#define PCI_DEVICE_ID_INTEL_BYT 0x0f37
31#define PCI_DEVICE_ID_INTEL_MRFLD 0x119e 29#define PCI_DEVICE_ID_INTEL_MRFLD 0x119e
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e63c02a93f6b..38cff8f6716d 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2315,6 +2315,8 @@
2315#define PCI_VENDOR_ID_CENATEK 0x16CA 2315#define PCI_VENDOR_ID_CENATEK 0x16CA
2316#define PCI_DEVICE_ID_CENATEK_IDE 0x0001 2316#define PCI_DEVICE_ID_CENATEK_IDE 0x0001
2317 2317
2318#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
2319
2318#define PCI_VENDOR_ID_VITESSE 0x1725 2320#define PCI_VENDOR_ID_VITESSE 0x1725
2319#define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174 2321#define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174
2320 2322