mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h

Browse Source 
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.

BUG=chrome-os-partner:41748
TEST=w/ series USB is happy, even with s2r

Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
(cherry picked from commit adf9c3c856)
Change-Id: I5c2374be1f1d544c96853581516629bea68df6be
Reviewed-on: https://chromium-review.googlesource.com/281317
Reviewed-by: yunzhi li <lyz@rock-chips.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Joseph Kogut
2015-02-16 19:32:46 -07:00
committed by ChromeOS Commit Bot
parent c20c0df75d
commit b4da9cdea2
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/dwc2/pci.c
View File

@@ -54,7 +54,6 @@
#include "core.h"
#include "hcd.h"
#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
#define PCI_PRODUCT_ID_HAPS_HSOTG 0xabc0
static const char dwc2_driver_name[] = "dwc2";

2
drivers/usb/dwc3/dwc3-pci.c
View File

@@ -25,8 +25,6 @@
#include <linux/usb/otg.h>
#include <linux/usb/usb_phy_gen_xceiv.h>
/* FIXME define these in <linux/pci_ids.h> */
#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd
#define PCI_DEVICE_ID_INTEL_BYT 0x0f37
#define PCI_DEVICE_ID_INTEL_MRFLD 0x119e

2
include/linux/pci_ids.h
View File

@@ -2307,6 +2307,8 @@
#define PCI_VENDOR_ID_CENATEK 0x16CA
#define PCI_DEVICE_ID_CENATEK_IDE 0x0001
#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
#define PCI_VENDOR_ID_VITESSE 0x1725
#define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174