diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2015-02-03 18:08:39 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-03 15:28:31 -0800 |
commit | 518ca8d9326e258f4595bfe9bc7fc61f5c3636cb (patch) | |
tree | 751943150dceda03b06bb3af0fdf0222437d48ef /drivers/usb/host | |
parent | b3a54bf9ed76dff9dd26e1fc719431fb14604a8a (diff) | |
download | linux-518ca8d9326e258f4595bfe9bc7fc61f5c3636cb.tar.bz2 |
ehci-pci: disable for Intel MID platforms (update)
This is a follow up to the previously submitted commit cefa9a31a5f0 (ehci-pci:
disable for Intel MID platforms).
It includes the following changes:
- table and function are renamed to reflect this is not only about ChipIdea
- ChipIdea PCI driver (ci_hdrc_pci.c) gets the comment about the table in
ehci-pci.c
- MIPS IDs removed from the list since it was discovered and tested on Intel
MID platforms
Reviewed-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-pci.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 965202138161..2a5d2fd76040 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -42,18 +42,22 @@ static inline bool is_intel_quark_x1000(struct pci_dev *pdev) pdev->device == PCI_DEVICE_ID_INTEL_QUARK_X1000_SOC; } -static const struct pci_device_id ci_hdrc_pci_id_table[] = { - { PCI_DEVICE(0x153F, 0x1004), }, - { PCI_DEVICE(0x153F, 0x1006), }, +/* + * This is the list of PCI IDs for the devices that have EHCI USB class and + * specific drivers for that. One of the example is a ChipIdea device installed + * on some Intel MID platforms. + */ +static const struct pci_device_id bypass_pci_id_table[] = { + /* ChipIdea on Intel MID platform */ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0811), }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0829), }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe006), }, {} }; -static inline bool is_ci_hdrc_pci(struct pci_dev *pdev) +static inline bool is_bypassed_id(struct pci_dev *pdev) { - return !!pci_match_id(ci_hdrc_pci_id_table, pdev); + return !!pci_match_id(bypass_pci_id_table, pdev); } /* @@ -368,7 +372,7 @@ static const struct ehci_driver_overrides pci_overrides __initconst = { static int ehci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { - if (is_ci_hdrc_pci(pdev)) + if (is_bypassed_id(pdev)) return -ENODEV; return usb_hcd_pci_probe(pdev, id); } |