Commit 995ada8d authored Jun 06, 2008 by Stefan Roese Committed by Josh Boyer Jun 11, 2008

powerpc/4xx: PCIe driver now detects if a port is disabled via the dev-tree



This patch add a check to the PPC4xx PCIe driver to detect if the port
is disabled via the device-tree. This is needed for the AMCC Canyonlands
board which has an option to either select 2 PCIe ports or 1 PCIe port
and one SATA port. The SATA port and the 1st PCIe port pins are multiplexed
so we can't start both drivers.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

parent 156cea23

arch/powerpc/sysdev/ppc4xx_pci.c

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1634,6 +1634,15 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)
	}		}
	port = &ppc4xx_pciex_ports[portno];		port = &ppc4xx_pciex_ports[portno];
	port->index = portno;		port->index = portno;

			/*
			* Check if device is enabled
			*/
			if (!of_device_is_available(np)) {
			printk(KERN_INFO "PCIE%d: Port disabled via device-tree\n", port->index);
			return;
			}

	port->node = of_node_get(np);		port->node = of_node_get(np);
	pval = of_get_property(np, "sdr-base", NULL);		pval = of_get_property(np, "sdr-base", NULL);
	if (pval == NULL) {		if (pval == NULL) {