diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2026-08-21 16:40:37 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2026-08-21 16:40:37 -0500 |
| commit | 5572ea216f891f64fb314c588d0309770ea27ff0 (patch) | |
| tree | 9b1eb952983dfcc4e8015df8777f5d4f9adbeecc | |
| parent | adea2f75b7a3c2eca7d22b1c6c90c6eed92dc2cc (diff) | |
| parent | 00a479ba1d01249d43ca5e453380d1ed60946f8a (diff) | |
| download | linux-5572ea216f891f64fb314c588d0309770ea27ff0.tar.gz linux-5572ea216f891f64fb314c588d0309770ea27ff0.zip | |
Merge branch 'pci/switchtec'
- Add Microchip PCI1008 device ID and include it in NTB DMA alias quirk
(Logan Gunthorpe)
* pci/switchtec:
PCI: switchtec: Add Microchip PCI1008 to NTB DMA alias quirk
PCI: switchtec: Add Microchip PCI1008 device ID
dmaengine: switchtec-dma: Add PCI1008 device ID
| -rw-r--r-- | drivers/dma/switchtec_dma.c | 1 | ||||
| -rw-r--r-- | drivers/pci/quirks.c | 1 | ||||
| -rw-r--r-- | drivers/pci/switch/switchtec.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma/switchtec_dma.c b/drivers/dma/switchtec_dma.c index 3ef928640615..02083e3f6ebe 100644 --- a/drivers/dma/switchtec_dma.c +++ b/drivers/dma/switchtec_dma.c @@ -1424,6 +1424,7 @@ static const struct pci_device_id switchtec_dma_pci_tbl[] = { SW_ID(PCI_VENDOR_ID_EFAR, 0x1004), /* PCI1004 16XG4 */ SW_ID(PCI_VENDOR_ID_EFAR, 0x1005), /* PCI1005 16XG4 */ SW_ID(PCI_VENDOR_ID_EFAR, 0x1006), /* PCI1006 16XG4 */ + SW_ID(PCI_VENDOR_ID_EFAR, 0x1008), /* PCI1008 16XG4 */ {0} }; MODULE_DEVICE_TABLE(pci, switchtec_dma_pci_tbl); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 06c014964251..06a2df3d2e64 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -6093,6 +6093,7 @@ SWITCHTEC_PCI100X_QUIRK(0x1003); /* PCI1003XG4 */ SWITCHTEC_PCI100X_QUIRK(0x1004); /* PCI1004XG4 */ SWITCHTEC_PCI100X_QUIRK(0x1005); /* PCI1005XG4 */ SWITCHTEC_PCI100X_QUIRK(0x1006); /* PCI1006XG4 */ +SWITCHTEC_PCI100X_QUIRK(0x1008); /* PCI1008XG4 */ /* diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index 41fc4b512708..5711aaa5df11 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -1874,6 +1874,7 @@ static const struct pci_device_id switchtec_pci_tbl[] = { SWITCHTEC_PCI100X_DEVICE(0x1004, SWITCHTEC_GEN4), /* PCI1004 16XG4 */ SWITCHTEC_PCI100X_DEVICE(0x1005, SWITCHTEC_GEN4), /* PCI1005 16XG4 */ SWITCHTEC_PCI100X_DEVICE(0x1006, SWITCHTEC_GEN4), /* PCI1006 16XG4 */ + SWITCHTEC_PCI100X_DEVICE(0x1008, SWITCHTEC_GEN4), /* PCI1008 16XG4 */ {0} }; MODULE_DEVICE_TABLE(pci, switchtec_pci_tbl); |