Re: [PATCH][AT91] Fix compile error for at91rm9200 in latest git

[David Brownell]

On Monday 03 December 2007, Jan Altenberg wrote:
> 
> at91rm9200ek doesn't compile in latest git:
> ...
> The offending commit is:
> 
> [jan@bender linux-2.6]$ git-bisect good
> f230d3f53d72d05bcb5666ab7e2eccd49c8b3a15 is first bad commit
> commit f230d3f53d72d05bcb5666ab7e2eccd49c8b3a15
> Author: Andrew Victor <andrew@xxxxxxxxxxxxx>
> Date:   Mon Nov 19 13:47:20 2007 +0100
> 
>     [ARM] 4650/1: AT91: New-style init of I2C, support for i2c-gpio
>     ...
>     
>     Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
>     Signed-off-by: Andrew Victor <andrew@xxxxxxxxxxxxx>
>     Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

Which is a combination of two patches, which seems to have dropped the
chunk you show below.  The reason this seems to have my signoff is
that I originated one of those patches, and parts of the second, but
in fact I had never seen f230d3f53d72d05bcb5666ab7e2eccd49c8b3a15
until after this email ...

Your patch looks correct, and seems to be the only obvious chunk
that's missing.  So, I'll ack it FWIW ... usual policy for these
patches is to go through Russell.


I'll note that the whole "mark Atmel's TWI controller BROKEN" patchh
series, making everything use the i2c-gpio instead, has turned up
one more issue at the I2C level:  the i2c_adapter.class for i2c-gpio
needs to include at least the HWMON class bit.

- Dave


> This patch adds the missing i2c_board_info struct (grabbed from Andrew
> Victor's tree).
> 
> Signed-off-by: Jan Altenberg <jan.altenberg@xxxxxxxxxxxxx>
> 
> ---
> diff --git a/arch/arm/mach-at91/board-ek.c b/arch/arm/mach-at91/board-ek.c
> index d05b1b2..53a5ef9 100644
> --- a/arch/arm/mach-at91/board-ek.c
> +++ b/arch/arm/mach-at91/board-ek.c
> @@ -109,6 +109,15 @@ static struct spi_board_info ek_spi_devices[] = {
>  #endif
>  };
>  
> +static struct i2c_board_info __initdata ek_i2c_devices[] = {
> +	{
> +		I2C_BOARD_INFO("ics1523", 0x26),
> +	},
> +	{
> +		I2C_BOARD_INFO("dac3550", 0x4d),
> +	}
> +};
> +
>  #define EK_FLASH_BASE	AT91_CHIPSELECT_0
>  #define EK_FLASH_SIZE	0x200000
> 
> 


--
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/