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

Commit 56195e9d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-rcar' into next 

* pci/host-rcar:
  PCI: rcar: Use of_device_get_match_data() to simplify probe
  PCI: rcar: Add compatible string for r8a7796
  PCI: rcar: Return -ENODEV from host bridge probe when no card present
parents dda71892 ff1677e2

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

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; 
	    "renesas,pcie-r8a7791" for the R8A7791 SoC;

	    "renesas,pcie-r8a7793" for the R8A7793 SoC;

	    "renesas,pcie-r8a7795" for the R8A7795 SoC;

	    "renesas,pcie-r8a7796" for the R8A7796 SoC;

	    "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device.

	    "renesas,pcie-rcar-gen3" for a generic R-Car Gen3 compatible device.

drivers/pci/host/pcie-rcar.c

+2 −7
Original line number Diff line number Diff line
@@ -1125,7 +1125,6 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct rcar_pcie *pcie;

	unsigned int data;

	const struct of_device_id *of_id;

	int err;

	int (*hw_init_fn)(struct rcar_pcie *);
@@ -1149,11 +1148,6 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
	if (err)

		return err;



	of_id = of_match_device(rcar_pcie_of_match, dev);

	if (!of_id || !of_id->data)

		return -EINVAL;

	hw_init_fn = of_id->data;



	pm_runtime_enable(dev);

	err = pm_runtime_get_sync(dev);

	if (err < 0) {
@@ -1162,10 +1156,11 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
	}



	/* Failure to get a link might just be that no cards are inserted */

	hw_init_fn = of_device_get_match_data(dev);

	err = hw_init_fn(pcie);

	if (err) {

		dev_info(dev, "PCIe link down\n");

		err = 0;

		err = -ENODEV;

		goto err_pm_put;

	}