diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-04 12:00:58 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-04 12:00:58 -0400 |
| commit | 66a63e15bf7482c1de5cc906cbc473943ed8e898 (patch) | |
| tree | e47d70839da3458a572bd7d5c2195117f2983daa | |
| parent | bec36cfa7bd43a1e4484b14ff6144855f3446c4c (diff) | |
| parent | bf44167f37a12bd353ed10fa706691d3f6e4b1a0 (diff) | |
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
| -rw-r--r-- | Documentation/devicetree/bindings/pci/rcar-pci.txt | 2 | ||||
| -rw-r--r-- | drivers/pci/host/pci-rcar-gen2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/pci/rcar-pci.txt b/Documentation/devicetree/bindings/pci/rcar-pci.txt index 34712d6fd253..bd27428dda61 100644 --- a/Documentation/devicetree/bindings/pci/rcar-pci.txt +++ b/Documentation/devicetree/bindings/pci/rcar-pci.txt | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | * Renesas RCar PCIe interface | 1 | * Renesas R-Car PCIe interface |
| 2 | 2 | ||
| 3 | Required properties: | 3 | Required properties: |
| 4 | compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; | 4 | compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; |
diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index 85348590848b..6f879685fedd 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c | |||
| @@ -429,7 +429,7 @@ static int rcar_pci_probe(struct platform_device *pdev) | |||
| 429 | return 0; | 429 | return 0; |
| 430 | } | 430 | } |
| 431 | 431 | ||
| 432 | static struct of_device_id rcar_pci_of_match[] = { | 432 | static const struct of_device_id rcar_pci_of_match[] = { |
| 433 | { .compatible = "renesas,pci-r8a7790", }, | 433 | { .compatible = "renesas,pci-r8a7790", }, |
| 434 | { .compatible = "renesas,pci-r8a7791", }, | 434 | { .compatible = "renesas,pci-r8a7791", }, |
| 435 | { .compatible = "renesas,pci-r8a7794", }, | 435 | { .compatible = "renesas,pci-r8a7794", }, |