Some PCIe controllers found on Armada XP SoCs can be configured as either four single-lane x1 or one quad-lane x4 PCIe. Although we are not (yet) interested in the physical configuration of the PCIe controller, we will need it when proper PHY support for PCIe is added. Adapt the driver to the amended DT semantic and count the number of PCIe lanes.
Signed-off-by: Sebastian Hesselbarth <[email protected]> --- Cc: Rob Herring <[email protected]> Cc: Pawel Moll <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Ian Campbell <[email protected]> Cc: Kumar Gala <[email protected]> Cc: Bjorn Helgaas <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Gregory Clement <[email protected]> Cc: Thomas Petazzoni <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] --- drivers/pci/host/pci-mvebu.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index a8c6f1a92e0f..0feee6cd395c 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -115,6 +115,7 @@ struct mvebu_pcie_port { void __iomem *base; u32 port; u32 lane; + int num_lanes; int devfn; unsigned int mem_target; unsigned int mem_attr; @@ -982,9 +983,17 @@ static int mvebu_pcie_probe(struct platform_device *pdev) continue; } - if (of_property_read_u32(child, "marvell,pcie-lane", - &port->lane)) + /* + * If there are multiple lanes, we are only interested in the + * number of the first lane and the lane count. + */ + if (of_property_read_u32_index(child, "marvell,pcie-lane", + 0, &port->lane)) port->lane = 0; + port->num_lanes = of_property_count_u32_elems(child, + "marvell,pcie-lane"); + if (!port->num_lanes) + port->num_lanes = 1; port->name = kasprintf(GFP_KERNEL, "pcie%d.%d", port->port, port->lane); -- 2.0.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
