diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-07-03 11:24:42 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-03 16:51:29 +0100 |
commit | 60d6698bb39a16f11006735cde9d55a4654c34ca (patch) | |
tree | d67f8ca15cc830f51b4e66a31f600c27098b8888 /arch/arm/mach-s3c2410 | |
parent | 042cf0f21feebc07b70bab9176c6be59f5fcdbc5 (diff) | |
download | op-kernel-dev-60d6698bb39a16f11006735cde9d55a4654c34ca.zip op-kernel-dev-60d6698bb39a16f11006735cde9d55a4654c34ca.tar.gz |
[ARM] VR1000: Add i2c device list to Thorcom VR1000
Add i2c board intialisers to specify the I2C devices
attached on the Thorcom VR1000.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-vr1000.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index f133ccfc..a88b154 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c @@ -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@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,16 @@ static struct platform_device vr1000_led3 = { }, }; +/* I2C devices. */ + +static struct i2c_board_info vr1000_i2c_devs[] __initdata = { + { + I2C_BOARD_INFO("tlv320aic23", 0x1a), + }, { + I2C_BOARD_INFO("m41st87", 0x68), + }, +}; + /* devices for this board */ static struct platform_device *vr1000_devices[] __initdata = { @@ -373,6 +384,9 @@ static void __init vr1000_init(void) { platform_add_devices(vr1000_devices, ARRAY_SIZE(vr1000_devices)); + i2c_register_board_info(0, vr1000_i2c_devs, + ARRAY_SIZE(vr1000_i2c_devs)); + nor_simtec_init(); } |