diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-26 16:28:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-26 16:28:24 -0700 |
| commit | 7f5d15735588bc14e7c399e7214c0a36f3808dcf (patch) | |
| tree | 03cad13da3f5f41b6e01bd754fd5e47c86a96eee /drivers/pci/dwc/pcie-kirin.c | |
| parent | Merge tag 'trace-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| parent | PCI: Add "PCIe" to pcie_print_link_status() messages (diff) | |
| download | wireguard-linux-7f5d15735588bc14e7c399e7214c0a36f3808dcf.tar.xz wireguard-linux-7f5d15735588bc14e7c399e7214c0a36f3808dcf.zip | |
Merge tag 'pci-v4.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- fix Aardvark MRRS setting (Evan Wang)
- clarify "bandwidth available" link status message (Jakub Kicinski)
- update Kirin GPIO name to fix probe failure (Loic Poulain)
- fix Aardvark IRQ usage (Victor Gu)
- fix Aardvark config accessor issues (Victor Gu)
* tag 'pci-v4.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Add "PCIe" to pcie_print_link_status() messages
PCI: kirin: Fix reset gpio name
PCI: aardvark: Fix PCIe Max Read Request Size setting
PCI: aardvark: Use ISR1 instead of ISR0 interrupt in legacy irq mode
PCI: aardvark: Set PIO_ADDR_LS correctly in advk_pcie_rd_conf()
PCI: aardvark: Fix logic in advk_pcie_{rd,wr}_conf()
Diffstat (limited to 'drivers/pci/dwc/pcie-kirin.c')
| -rw-r--r-- | drivers/pci/dwc/pcie-kirin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/dwc/pcie-kirin.c b/drivers/pci/dwc/pcie-kirin.c index a6b88c7f6e3e..d2970a009eb5 100644 --- a/drivers/pci/dwc/pcie-kirin.c +++ b/drivers/pci/dwc/pcie-kirin.c @@ -486,7 +486,7 @@ static int kirin_pcie_probe(struct platform_device *pdev) return ret; kirin_pcie->gpio_id_reset = of_get_named_gpio(dev->of_node, - "reset-gpio", 0); + "reset-gpios", 0); if (kirin_pcie->gpio_id_reset < 0) return -ENODEV; |