Commit 66a63e15 authored by Bjorn Helgaas's avatar Bjorn Helgaas

Merge branch 'pci/host-rcar' into next

* pci/host-rcar:
  PCI: rcar-gen2: Make of_device_ids const
  PCI: rcar: Use proper name for the R-Car SoC
parents bec36cfa bf44167f
* Renesas RCar PCIe interface * Renesas R-Car PCIe interface
Required properties: Required properties:
compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;
......
...@@ -429,7 +429,7 @@ static int rcar_pci_probe(struct platform_device *pdev) ...@@ -429,7 +429,7 @@ static int rcar_pci_probe(struct platform_device *pdev)
return 0; return 0;
} }
static struct of_device_id rcar_pci_of_match[] = { static const struct of_device_id rcar_pci_of_match[] = {
{ .compatible = "renesas,pci-r8a7790", }, { .compatible = "renesas,pci-r8a7790", },
{ .compatible = "renesas,pci-r8a7791", }, { .compatible = "renesas,pci-r8a7791", },
{ .compatible = "renesas,pci-r8a7794", }, { .compatible = "renesas,pci-r8a7794", },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment