aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-07-03 06:24:42 -0400
committerBen Dooks <ben-linux@fluff.org>2008-07-03 11:51:29 -0400
commit60d6698bb39a16f11006735cde9d55a4654c34ca (patch)
treed67f8ca15cc830f51b4e66a31f600c27098b8888 /arch/arm
parent042cf0f21feebc07b70bab9176c6be59f5fcdbc5 (diff)
[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')
-rw-r--r--arch/arm/mach-s3c2410/mach-vr1000.c16
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 f133ccfc359e..a88b154273a9 100644
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -1,6 +1,6 @@
1/* linux/arch/arm/mach-s3c2410/mach-vr1000.c 1/* linux/arch/arm/mach-s3c2410/mach-vr1000.c
2 * 2 *
3 * Copyright (c) 2003-2005 Simtec Electronics 3 * Copyright (c) 2003-2005,2008 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
5 * 5 *
6 * Machine support for Thorcom VR1000 board. Designed for Thorcom by 6 * Machine support for Thorcom VR1000 board. Designed for Thorcom by
@@ -19,6 +19,7 @@
19#include <linux/timer.h> 19#include <linux/timer.h>
20#include <linux/init.h> 20#include <linux/init.h>
21#include <linux/dm9000.h> 21#include <linux/dm9000.h>
22#include <linux/i2c.h>
22 23
23#include <linux/serial.h> 24#include <linux/serial.h>
24#include <linux/tty.h> 25#include <linux/tty.h>
@@ -315,6 +316,16 @@ static struct platform_device vr1000_led3 = {
315 }, 316 },
316}; 317};
317 318
319/* I2C devices. */
320
321static struct i2c_board_info vr1000_i2c_devs[] __initdata = {
322 {
323 I2C_BOARD_INFO("tlv320aic23", 0x1a),
324 }, {
325 I2C_BOARD_INFO("m41st87", 0x68),
326 },
327};
328
318/* devices for this board */ 329/* devices for this board */
319 330
320static struct platform_device *vr1000_devices[] __initdata = { 331static struct platform_device *vr1000_devices[] __initdata = {
@@ -373,6 +384,9 @@ static void __init vr1000_init(void)
373{ 384{
374 platform_add_devices(vr1000_devices, ARRAY_SIZE(vr1000_devices)); 385 platform_add_devices(vr1000_devices, ARRAY_SIZE(vr1000_devices));
375 386
387 i2c_register_board_info(0, vr1000_i2c_devs,
388 ARRAY_SIZE(vr1000_i2c_devs));
389
376 nor_simtec_init(); 390 nor_simtec_init();
377} 391}
378 392