Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Documentation/devicetree/bindings/pci/rcar-pci.txt

+1 −1
Original line number Diff line number Diff line 
* Renesas RCar PCIe interface

* Renesas R-Car PCIe interface



Required properties:

compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;

drivers/pci/host/pci-rcar-gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int rcar_pci_probe(struct platform_device *pdev) 
	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-r8a7791", },

	{ .compatible = "renesas,pci-r8a7794", },