On Thu, 2008-06-05 at 16:22 +0200, Stefan Roese wrote:
> 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 <[EMAIL PROTECTED]>
Acked-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
> ---
> arch/powerpc/sysdev/ppc4xx_pci.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c
> b/arch/powerpc/sysdev/ppc4xx_pci.c
> index b4a54c5..76886cf 100644
> --- a/arch/powerpc/sysdev/ppc4xx_pci.c
> +++ b/arch/powerpc/sysdev/ppc4xx_pci.c
> @@ -1634,6 +1634,15 @@ static void __init ppc4xx_probe_pciex_bridge(struct
> device_node *np)
> }
> port = &ppc4xx_pciex_ports[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);
> pval = of_get_property(np, "sdr-base", NULL);
> if (pval == NULL) {
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
