[PATCH 2.6.16-rc1] Fix booting Maple boards (was: Re: LINUXPPC64 Maple fails to boot current git)

Benjamin Herrenschmidt benh at kernel.crashing.org
Fri Feb 3 12:56:01 EST 2006


> When looking for legacy serial ports, condition poking of "ISA" areas
> on CONFIG_GENERIC_ISA_DMA, rather than CONFIG_ISA as some boards (such
> as the Maple) have no ISA slots, but do have ISA serial ports.

Hrm... not sure ISA_DMA has anything to do with that at all.. in fact
its more like "has legacy devices". I don't remember adding the ifdef
CONFIG_ISA in the first place, maybe I did... it's a bit dodgy I'd say.
Indeed, lots of machines have ISA devices (a superIO typically) without
having ISA slots...

Ben.

> Signed-off-by: Tom Rini <trini at kernel.crashing.org>
> 
>  arch/powerpc/kernel/legacy_serial.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
> index f970ace..3dd7b39 100644
> --- a/arch/powerpc/kernel/legacy_serial.c
> +++ b/arch/powerpc/kernel/legacy_serial.c
> @@ -134,7 +134,7 @@ static int __init add_legacy_soc_port(st
>  	return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags);
>  }
>  
> -#ifdef CONFIG_ISA
> +#ifdef CONFIG_GENERIC_ISA_DMA
>  static int __init add_legacy_isa_port(struct device_node *np,
>  				      struct device_node *isa_brg)
>  {
> @@ -276,7 +276,7 @@ void __init find_legacy_serial_ports(voi
>  		of_node_put(soc);
>  	}
>  
> -#ifdef CONFIG_ISA
> +#ifdef CONFIG_GENERIC_ISA_DMA
>  	/* First fill our array with ISA ports */
>  	for (np = NULL; (np = of_find_node_by_type(np, "serial"));) {
>  		struct device_node *isa = of_get_parent(np);
> 




More information about the Linuxppc64-dev mailing list