forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b
kernel/drivers/usb/host/ohci-pci.c
....@@ -152,7 +152,7 @@
152152 {
153153 struct ohci_hcd *ohci = hcd_to_ohci(hcd);
154154
155
- if (usb_amd_find_chipset_info())
155
+ if (usb_amd_quirk_pll_check())
156156 ohci->flags |= OHCI_QUIRK_AMD_PLL;
157157
158158 /* SB800 needs pre-fetch fix */
....@@ -232,10 +232,6 @@
232232 .driver_data = (unsigned long)ohci_quirk_qemu,
233233 },
234234
235
- /* FIXME for some of the early AMD 760 southbridges, OHCI
236
- * won't work at all. blacklist them.
237
- */
238
-
239235 {},
240236 };
241237
....@@ -274,24 +270,27 @@
274270 .reset = ohci_pci_reset,
275271 };
276272
277
-static const struct pci_device_id pci_ids [] = { {
273
+static const struct pci_device_id pci_ids[] = { {
278274 /* handle any USB OHCI controller */
279275 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
280
- .driver_data = (unsigned long) &ohci_pci_hc_driver,
281276 }, {
282277 /* The device in the ConneXT I/O hub has no class reg */
283278 PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_OHCI),
284
- .driver_data = (unsigned long) &ohci_pci_hc_driver,
285279 }, { /* end: all zeroes */ }
286280 };
287281 MODULE_DEVICE_TABLE (pci, pci_ids);
288282
283
+static int ohci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
284
+{
285
+ return usb_hcd_pci_probe(dev, id, &ohci_pci_hc_driver);
286
+}
287
+
289288 /* pci driver glue; this is a "new style" PCI driver module */
290289 static struct pci_driver ohci_pci_driver = {
291
- .name = (char *) hcd_name,
290
+ .name = hcd_name,
292291 .id_table = pci_ids,
293292
294
- .probe = usb_hcd_pci_probe,
293
+ .probe = ohci_pci_probe,
295294 .remove = usb_hcd_pci_remove,
296295 .shutdown = usb_hcd_pci_shutdown,
297296