Eric Lee / smarc-ti-linux-kernel

28
Download as
Browse Code ยป

Commit d0585cd815faef50ce3d12cbe173438eb4d81eb8

Authored by Andy Lutomirski
Committed by Mauro Carvalho Chehab
1 parent 68939df1d7

sb_edac: Claim a different PCI device 

sb_edac controls a large number of different PCI functions.  Rather
than registering as a normal PCI driver for all of them, it
registers for just one so that it gets probed and, at probe time, it
looks for all the others.

Coincidentally, the device it registers for also contains the SMBUS
registers, so the PCI core will refuse to probe both sb_edac and a
future iMC SMBUS driver.  The drivers don't actually conflict, so
just change sb_edac's device table to probe a different device.

An alternative fix would be to merge the two drivers, but sb_edac
will also refuse to load on non-ECC systems, whereas i2c_imc would
still be useful without ECC.

The only user-visible change should be that sb_edac appears to bind
a different device.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Cc: Rui Wang <ruiv.wang@gmail.com>
Acked-by: Aristeu Rozanski <aris@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/edac/sb_edac.c
Diff comments   View file @ d0585cd
... ... @@ -500,7 +500,7 @@
500 500 * pci_device_id table for which devices we are looking for
501 501 */
502 502 static const struct pci_device_id sbridge_pci_tbl[] = {
503   - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
  503 + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0)},
504 504 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TA)},
505 505 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HASWELL_IMC_HA0)},
506 506 {0,} /* 0 terminated list. */