Re: [PATCH 1/3] at91_serial: support AVR32

[Russell King]

On Wed, Aug 02, 2006 at 04:51:46PM +0200, Haavard Skinnemoen wrote:
> diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c
> index 54c6b2a..f2fecc6 100644
> --- a/drivers/serial/at91_serial.c
> +++ b/drivers/serial/at91_serial.c
> @@ -40,8 +40,10 @@ #include <asm/arch/at91rm9200_usart.h>
>  #include <asm/arch/at91rm9200_pdc.h>
>  #include <asm/mach/serial_at91.h>
>  #include <asm/arch/board.h>
> +#ifdef CONFIG_ARM
>  #include <asm/arch/system.h>

I'd rather this file wasn't included in any drivers in any case.

> @@ -611,7 +615,8 @@ static int at91_request_port(struct uart
>  		return -EBUSY;
>  
>  	if (port->flags & UPF_IOREMAP) {
> -		port->membase = ioremap(port->mapbase, size);
> +		if (port->membase == NULL)
> +			port->membase = ioremap(port->mapbase, size);

This change makes no sense.  If you don't want ioremap, don't set UPF_IOREMAP.

>  		if (port->membase == NULL) {
>  			release_mem_region(port->mapbase, size);
>  			return -ENOMEM;
> @@ -693,12 +698,19 @@ static void __devinit at91_init_port(str
>  	port->mapbase	= pdev->resource[0].start;
>  	port->irq	= pdev->resource[1].start;
>  
> +#ifdef CONFIG_AVR32
> +	port->flags |= UPF_IOREMAP;
> +	port->membase = ioremap(pdev->resource[0].start,
> +				pdev->resource[0].end
> +				- pdev->resource[0].start + 1);

Don't see the requirement for this.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/