diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-21 09:26:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-21 09:26:34 -0700 |
| commit | fe7ba289332e10215b8ea423a240f5d030bb4fb3 (patch) | |
| tree | 62af14eaf48fdcdb3c25796fbe2f1019e6cc777d /drivers | |
| parent | a9aa1908e224790e89f350cc26f21ae8d805869d (diff) | |
| parent | b9c1153f7a9cb2d53b845615a0edd510f7fe8341 (diff) | |
| download | linux-fe7ba289332e10215b8ea423a240f5d030bb4fb3.tar.bz2 | |
Merge tag 'pci-v4.11-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas:
"Sorry this is so late. It's been in -next for over a week, but I
forgot to send it on until now.
A single fix to the DT binding of the HiSilicon PCIe host support"
* tag 'pci-v4.11-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/dwc/pcie-hisi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/dwc/pcie-hisi.c b/drivers/pci/dwc/pcie-hisi.c index fd66a3199db7..cf9d6a9d9fd4 100644 --- a/drivers/pci/dwc/pcie-hisi.c +++ b/drivers/pci/dwc/pcie-hisi.c @@ -380,9 +380,13 @@ struct pci_ecam_ops hisi_pcie_platform_ops = { static const struct of_device_id hisi_pcie_almost_ecam_of_match[] = { { - .compatible = "hisilicon,pcie-almost-ecam", + .compatible = "hisilicon,hip06-pcie-ecam", .data = (void *) &hisi_pcie_platform_ops, }, + { + .compatible = "hisilicon,hip07-pcie-ecam", + .data = (void *) &hisi_pcie_platform_ops, + }, {}, }; |