From: Phil Edworthy <phil.edworthy@renesas.com>
Date: Fri, 2 Oct 2015 10:25:06 +0000 (+0100)
Subject: PCI: rcar: Set root bus nr to that provided in DT
X-Git-Tag: firefly_0821_release~176^2~768^2~2^8~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=42175a35534aab13016297fb48763e9f1126a0ab;p=firefly-linux-kernel-4.4.55.git

PCI: rcar: Set root bus nr to that provided in DT

On ARM64, setting the root bus number to -1 causes probe failure.
Moreover, we should use the bus number specified in the DT as we could have
multiple PCIe controllers with different bus ranges.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
---

diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 6057e3193e0f..8e583c200f02 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -362,7 +362,7 @@ static int rcar_pcie_setup(int nr, struct list_head *resource, struct rcar_pcie
 	struct resource *res;
 	int i;
 
-	pcie->root_bus_nr = -1;
+	pcie->root_bus_nr = pcie->busn.start;
 
 	/* Setup PCI resources */
 	for (i = 0; i < RCAR_PCI_MAX_RESOURCES; i++) {