[i2c] [patch 7/8] VR1000: Add i2c device list to Thorcom VR1000

[Jean Delvare]

On Thu, 29 May 2008 14:22:51 +0100, Ben Dooks wrote:
> Add i2c board intialisers to specify the I2C devices
> attached on the Thorcom VR1000.
> 
> Signed-off-by: Ben Dooks <ben-linux at fluff.org>
> 
> Index: linux-2.6.26-rc4-quilt1/arch/arm/mach-s3c2410/mach-vr1000.c
> ===================================================================
> --- linux-2.6.26-rc4-quilt1.orig/arch/arm/mach-s3c2410/mach-vr1000.c	2008-05-27 23:31:41.000000000 +0100
> +++ linux-2.6.26-rc4-quilt1/arch/arm/mach-s3c2410/mach-vr1000.c	2008-05-27 23:59:05.000000000 +0100
> @@ -1,6 +1,6 @@
>  /* linux/arch/arm/mach-s3c2410/mach-vr1000.c
>   *
> - * Copyright (c) 2003-2005 Simtec Electronics
> + * Copyright (c) 2003-2005,2008 Simtec Electronics
>   *   Ben Dooks <ben at simtec.co.uk>
>   *
>   * Machine support for Thorcom VR1000 board. Designed for Thorcom by
> @@ -19,6 +19,7 @@
>  #include <linux/timer.h>
>  #include <linux/init.h>
>  #include <linux/dm9000.h>
> +#include <linux/i2c.h>
>  
>  #include <linux/serial.h>
>  #include <linux/tty.h>
> @@ -315,6 +316,24 @@ static struct platform_device vr1000_led
>  	},
>  };
>  
> +/* I2C devices. */
> +
> +static struct i2c_board_info vr1000_i2c_info[] __initdata = {
> +	{
> +		.type	= "tlv320aic23",
> +		.addr	= 0x1a,
> +	}, {
> +		.type	= "tmp101",
> +		.addr	= 0x48,

Same problem as "eeprom"... The lm75 driver doesn't yet support the
"tmp101" as a new-style device in mainline, so this won't work and will
prevent the lm75 driver from attaching as a legacy driver too. So this
device declaration should be delayed or commented out until the lm75
driver is ready.

> +	}, {
> +		.type	= "eeprom",
> +		.addr	= 0x50,
> +	}, {
> +		.type	= "m41st87",
> +		.addr	= 0x68,
> +	},
> +};
> +
>  /* devices for this board */
>  
>  static struct platform_device *vr1000_devices[] __initdata = {
> @@ -373,6 +392,9 @@ static void __init vr1000_init(void)
>  {
>  	platform_add_devices(vr1000_devices, ARRAY_SIZE(vr1000_devices));
>  
> +	i2c_register_board_info(0, vr1000_i2c_info,
> +				ARRAY_SIZE(vr1000_i2c_info));
> +
>  	nor_simtec_init();
>  }
>  
> 


-- 
Jean Delvare