[PATCH] maple: improve CPC9x5 host bridge detection

[Benjamin Herrenschmidt]

On Wed, 2007-01-03 at 12:56 -0600, Nathan Lynch wrote:
> Identify CPC9x5 PCI Express, AGP, and HT host bridges using
> device_type and compatible properties, which is a more flexible method
> than using the name property (which can differ between firmwares and
> models).
> 
> Signed-off-by: Nathan Lynch <ntl at pobox.com>

Do that work on js20/js21 with SLOF ?

Ben.

> ---
>  arch/powerpc/platforms/maple/pci.c |   15 +++++++++------
>  1 files changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
> index 3f6a69f..011f0f1 100644
> --- a/arch/powerpc/platforms/maple/pci.c
> +++ b/arch/powerpc/platforms/maple/pci.c
> @@ -560,13 +560,16 @@ void __init maple_pci_init(void)
>  		return;
>  	}
>  	for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) {
> -		if (np->name == NULL)
> +		if (!np->type)
>  			continue;
> -		if (!strcmp(np->name, "pci") || !strcmp(np->name, "pcie")) {
> -			if (add_bridge(np) == 0)
> -				of_node_get(np);
> -		}
> -		if (strcmp(np->name, "ht") == 0) {
> +		if (strcmp(np->type, "pci") && strcmp(np->type, "ht"))
> +			continue;
> +		if ((device_is_compatible(np, "u4-pcie") ||
> +		     device_is_compatible(np, "u3-agp")) &&
> +		    add_bridge(np) == 0)
> +			of_node_get(np);
> +
> +		if (device_is_compatible(np, "u3-ht")) {
>  			of_node_get(np);
>  			ht = np;
>  		}