Skip to content

Commit

Permalink
[ARM] OSIRIS: Add i2c device list to Simtec Osiris
Browse files Browse the repository at this point in the history
Add an i2c board information initialisers to the board
to define which devices are present.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>


---
yaml
---
svn_rev: 101292
current_ref: refs/heads/topic-miami
current_commit: f337422
head_branch: refs/heads/topic-miami
  • Loading branch information
Ben Dooks committed Jul 3, 2008
1 parent fad0497 commit d757330
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/topic-miami: 9d529c6e7b73088551057445763b2be755a3b82f
refs/heads/topic-miami: f337422147ca28fad0ff18d67a82c8b475872109
15 changes: 14 additions & 1 deletion trunk/arch/arm/mach-s3c2440/mach-osiris.c
Original file line number Diff line number Diff line change
@@ -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@simtec.co.uk>
*
Expand All @@ -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>
Expand Down Expand Up @@ -322,6 +323,15 @@ static struct sys_device osiris_pm_sysdev = {
.cls = &osiris_pm_sysclass,
};

/* I2C devices fitted. */

static struct i2c_board_info osiris_i2c_devs[] __initdata = {
{
I2C_BOARD_INFO("tps65011", 0x48),
.irq = IRQ_EINT20,
},
};

/* Standard Osiris devices */

static struct platform_device *osiris_devices[] __initdata = {
Expand Down Expand Up @@ -388,6 +398,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_devs,
ARRAY_SIZE(osiris_i2c_devs));

platform_add_devices(osiris_devices, ARRAY_SIZE(osiris_devices));
};

Expand Down

0 comments on commit d757330

Please sign in to comment.