[i2c] [patch 5/8] OSIRIS: Add i2c device list to Simtec Osiris

[Jean Delvare]

Hi Ben,

On Thu, 29 May 2008 14:22:49 +0100, Ben Dooks wrote:
> Add an i2c board information initialisers to the board
> to define which devices are present.
> 
> Signed-off-by: Ben Dooks <ben-linux at fluff.org>
> 
> --- linux-2.6.26-rc4-quilt1.orig/arch/arm/mach-s3c2440/mach-osiris.c	2008-05-27 15:14:42.000000000 +0100
> +++ linux-2.6.26-rc4-quilt1/arch/arm/mach-s3c2440/mach-osiris.c	2008-05-27 15:22:33.000000000 +0100
> @@ -1,6 +1,6 @@
>  /* linux/arch/arm/mach-s3c2440/mach-osiris.c
>   *
> - * Copyright (c) 2005 Simtec Electronics
> + * Copyright (c) 2005,2008 Simtec Electronics
>   *	http://armlinux.simtec.co.uk/
>   *	Ben Dooks <ben at simtec.co.uk>
>   *
> @@ -19,6 +19,7 @@
>  #include <linux/sysdev.h>
>  #include <linux/serial_core.h>
>  #include <linux/clk.h>
> +#include <linux/i2c.h>
>  
>  #include <asm/mach/arch.h>
>  #include <asm/mach/map.h>
> @@ -322,6 +323,19 @@ static struct sys_device osiris_pm_sysde
>  	.cls		= &osiris_pm_sysclass,
>  };
>  
> +/* I2C devices fitted. */
> +
> +static struct i2c_board_info osiris_i2c_info[] __initdata = {
> +	{
> +		.type	= "tps65011",
> +		.addr	= 0x48,

Please use the I2C_BOARD_INFO helper in all your device declarations.

> +		.irq	= IRQ_EINT20,
> +	}, {
> +		.type	= "eeprom",
> +		.addr	= 0x50,
> +	}

The "eeprom" driver is not a new-style i2c driver, so it won't be able
to bind to device. Having it declared here even prevents the legacy
binding to happen, because the address will be busy. So you should
either not list the eeprom here and let the legacy eeprom driver pick
it later, or add a new-style mode to the eeprom driver - but then you
probably want to use David Brownell and Wolfram Sang's at24 driver
instead, it's much better.

> +};
> +
>  /* Standard Osiris devices */
>  
>  static struct platform_device *osiris_devices[] __initdata = {
> @@ -388,6 +402,9 @@ static void __init osiris_init(void)
>  	sysdev_class_register(&osiris_pm_sysclass);
>  	sysdev_register(&osiris_pm_sysdev);
>  
> +	i2c_register_board_info(0, osiris_i2c_info,
> +				ARRAY_SIZE(osiris_i2c_info));
> +
>  	platform_add_devices(osiris_devices, ARRAY_SIZE(osiris_devices));
>  };
>  
> 

Same comments apply to the next 3 patches of the series.

-- 
Jean Delvare