diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-10-14 11:30:02 -0400 |
---|---|---|
committer | Jean Delvare <khali@mahadeva.delvare> | 2008-10-14 11:30:02 -0400 |
commit | 9df013b3e46c67dd3745df91eaccdc719118e0cc (patch) | |
tree | 81fe2d8b900e6ef9508a11a7f354ace9c2e04d03 /arch/arm/mach-omap2/board-h4.c | |
parent | a5f08a327abc45eb6cb3cc1f5fabf38607ae2acc (diff) |
i2c/isp1301_omap: Convert to a new-style i2c driver, part 2
Based on David Brownell's patch for tps65010 and previous work by
Felipe Balbi, this patch finishes converting isp1301_omap to a
new-style i2c driver.
There's definitely room for further drivers cleanups, but these are
out of the scope of this patch.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-h4.c')
-rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index d4e3b6fc4705..2fef2c845083 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/mtd/partitions.h> | 18 | #include <linux/mtd/partitions.h> |
19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
20 | #include <linux/workqueue.h> | 20 | #include <linux/workqueue.h> |
21 | #include <linux/i2c.h> | ||
21 | #include <linux/input.h> | 22 | #include <linux/input.h> |
22 | #include <linux/err.h> | 23 | #include <linux/err.h> |
23 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
@@ -391,6 +392,13 @@ static struct omap_board_config_kernel h4_config[] = { | |||
391 | { OMAP_TAG_LCD, &h4_lcd_config }, | 392 | { OMAP_TAG_LCD, &h4_lcd_config }, |
392 | }; | 393 | }; |
393 | 394 | ||
395 | static struct i2c_board_info __initdata h4_i2c_board_info[] = { | ||
396 | { | ||
397 | I2C_BOARD_INFO("isp1301_omap", 0x2d), | ||
398 | .irq = OMAP_GPIO_IRQ(125), | ||
399 | }, | ||
400 | }; | ||
401 | |||
394 | static void __init omap_h4_init(void) | 402 | static void __init omap_h4_init(void) |
395 | { | 403 | { |
396 | /* | 404 | /* |
@@ -411,6 +419,9 @@ static void __init omap_h4_init(void) | |||
411 | } | 419 | } |
412 | #endif | 420 | #endif |
413 | 421 | ||
422 | i2c_register_board_info(1, h4_i2c_board_info, | ||
423 | ARRAY_SIZE(h4_i2c_board_info)); | ||
424 | |||
414 | platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices)); | 425 | platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices)); |
415 | omap_board_config = h4_config; | 426 | omap_board_config = h4_config; |
416 | omap_board_config_size = ARRAY_SIZE(h4_config); | 427 | omap_board_config_size = ARRAY_SIZE(h4_config); |