diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:10 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:10 -0600 |
| commit | a1d9190d9682fd5cb8af811228f492b2ddd41366 (patch) | |
| tree | 88d885b8447357d978af9c181f21aa8f6d86d801 /drivers/pci | |
| parent | aee10cd4c12aaa4d89d3355e669eb5025885094d (diff) | |
| parent | 49da21108f773b50b01b9fd0b6ca97b91b6ff216 (diff) | |
| download | linux-a1d9190d9682fd5cb8af811228f492b2ddd41366.tar.gz linux-a1d9190d9682fd5cb8af811228f492b2ddd41366.tar.bz2 linux-a1d9190d9682fd5cb8af811228f492b2ddd41366.zip | |
Merge branch 'pci/host-rcar' into next
* pci/host-rcar:
PCI: rcar: Add gen3 fallback compatibility string for pcie-rcar
PCI: rcar: Use gen2 fallback compatibility last
PCI: rcar-gen2: Use gen2 fallback compatibility last
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pci-rcar-gen2.c | 2 | ||||
| -rw-r--r-- | drivers/pci/host/pcie-rcar.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index 1eeefa4df64c..85348590848b 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c @@ -430,10 +430,10 @@ static int rcar_pci_probe(struct platform_device *pdev) } static struct of_device_id rcar_pci_of_match[] = { - { .compatible = "renesas,pci-rcar-gen2", }, { .compatible = "renesas,pci-r8a7790", }, { .compatible = "renesas,pci-r8a7791", }, { .compatible = "renesas,pci-r8a7794", }, + { .compatible = "renesas,pci-rcar-gen2", }, { }, }; diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 62700d1896f4..aca85be101f8 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -1071,13 +1071,14 @@ static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie, static const struct of_device_id rcar_pcie_of_match[] = { { .compatible = "renesas,pcie-r8a7779", .data = rcar_pcie_hw_init_h1 }, - { .compatible = "renesas,pcie-rcar-gen2", - .data = rcar_pcie_hw_init_gen2 }, { .compatible = "renesas,pcie-r8a7790", .data = rcar_pcie_hw_init_gen2 }, { .compatible = "renesas,pcie-r8a7791", .data = rcar_pcie_hw_init_gen2 }, + { .compatible = "renesas,pcie-rcar-gen2", + .data = rcar_pcie_hw_init_gen2 }, { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init }, + { .compatible = "renesas,pcie-rcar-gen3", .data = rcar_pcie_hw_init }, {}, }; |