From cefa9a31a5f0856b81d53030815485fcb1fe8aab Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 28 Jan 2015 20:04:06 +0200 Subject: [PATCH] ehci-pci: disable for Intel MID platforms On some Intel MID platforms the ChipIdea USB controller is used. The EHCI PCI is in conflict with the proper driver. The patch makes ehci-pci to be ignored in favour of ChipIdea controller. Signed-off-by: Andy Shevchenko Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ehci-pci.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 851006a0d97b..965202138161 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -42,6 +42,20 @@ 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), }, + { 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) +{ + return !!pci_match_id(ci_hdrc_pci_id_table, pdev); +} + /* * 0x84 is the offset of in/out threshold register, * and it is the same offset as the register of 'hostpc'. @@ -352,6 +366,13 @@ 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)) + return -ENODEV; + return usb_hcd_pci_probe(pdev, id); +} + /* PCI driver selection metadata; PCI hotplugging uses this */ static const struct pci_device_id pci_ids [] = { { /* handle any USB 2.0 EHCI controller */ @@ -370,7 +391,7 @@ static struct pci_driver ehci_pci_driver = { .name = (char *) hcd_name, .id_table = pci_ids, - .probe = usb_hcd_pci_probe, + .probe = ehci_pci_probe, .remove = usb_hcd_pci_remove, .shutdown = usb_hcd_pci_shutdown, -- 2.34.1