Commit 5edeea2d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/layerscape' 

- Correct the syscon_regmap_lookup_by_phandle_args("fsl,pcie-scfg")
  arg_count to fix probe failure on LS1043A (Ioana Ciornei)

* pci/controller/layerscape:
  PCI: layerscape: Fix arg_count to syscon_regmap_lookup_by_phandle_args()
parents f2d4def0 4c8c0ffd

drivers/pci/controller/dwc/pci-layerscape.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static int ls_pcie_probe(struct platform_device *pdev) 
	if (pcie->drvdata->scfg_support) {

		pcie->scfg =

			syscon_regmap_lookup_by_phandle_args(dev->of_node,

							     "fsl,pcie-scfg", 2,

							     "fsl,pcie-scfg", 1,

							     index);

		if (IS_ERR(pcie->scfg)) {

			dev_err(dev, "No syscfg phandle specified\n");