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>

2 files changed, 15 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 2ced6d9984d2..adfcd7b51393 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -476,6 +476,10 @@ static struct i2c_board_info __initdata h3_i2c_board_info[] = {
                 I2C_BOARD_INFO("tps65013", 0x48),
                /* .irq         = OMAP_GPIO_IRQ(??), */
        },
+        {
+                I2C_BOARD_INFO("isp1301_omap", 0x2d),
+                .irq            = OMAP_GPIO_IRQ(14),
+        },
 };
 
 static struct omap_gpio_switch h3_gpio_switches[] __initdata = {
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 @@
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/workqueue.h>
+#include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/err.h>
 #include <linux/clk.h>
@@ -391,6 +392,13 @@ static struct omap_board_config_kernel h4_config[] = {
         { OMAP_TAG_LCD,         &h4_lcd_config },
 };
 
+static struct i2c_board_info __initdata h4_i2c_board_info[] = {
+        {
+                I2C_BOARD_INFO("isp1301_omap", 0x2d),
+                .irq            = OMAP_GPIO_IRQ(125),
+        },
+};
+
 static void __init omap_h4_init(void)
 {
         /*
@@ -411,6 +419,9 @@ static void __init omap_h4_init(void)
         }
 #endif
 
+        i2c_register_board_info(1, h4_i2c_board_info,
+                        ARRAY_SIZE(h4_i2c_board_info));
+
         platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
         omap_board_config = h4_config;
         omap_board_config_size = ARRAY_SIZE(h4_config);