]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP2: Fix Nokia N8x0 second I2C bus device registration
authorJarkko Nikula <jarkko.nikula@nokia.com>
Mon, 1 Sep 2008 13:05:04 +0000 (16:05 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 5 Sep 2008 16:11:36 +0000 (09:11 -0700)
- TSL2563 and LP5521 are found only in N810
- Fix one typo

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: Riku voipio <riku.voipio@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-n800.c

index 95cc84ab42c8d7a2dc4adcd08aaec38c965f6aab..1df9f3dcc28dccb00ffeee5585fa3ef3ab290958 100644 (file)
@@ -649,12 +649,6 @@ static struct i2c_board_info __initdata_or_module n8x0_i2c_board_info_2[] = {
                .platform_data = &n800_tcm825x_platform_data,
 #endif
        },
-       {
-               I2C_BOARD_INFO("tsl2563", 0x29),
-       },
-       {
-               I2C_BOARD_INFO("lp5521", 0x32),
-       },
 };
 
 
@@ -670,6 +664,12 @@ static struct i2c_board_info __initdata_or_module n810_i2c_board_info_2[] = {
                .irq            = OMAP_GPIO_IRQ(109),
                .platform_data  = &lm8323_pdata,
        },
+       {
+               I2C_BOARD_INFO("tsl2563", 0x29),
+       },
+       {
+               I2C_BOARD_INFO("lp5521", 0x32),
+       },
 };
 
 void __init nokia_n800_common_init(void)
@@ -694,7 +694,7 @@ void __init nokia_n800_common_init(void)
        omap_register_i2c_bus(1, 400, n800_i2c_board_info_1,
                              ARRAY_SIZE(n800_i2c_board_info_1));
        omap_register_i2c_bus(2, 400, n8x0_i2c_board_info_2,
-                             ARRAY_SIZE(n800_i2c_board_info_2));
+                             ARRAY_SIZE(n8x0_i2c_board_info_2));
        if (machine_is_nokia_n800())
                i2c_register_board_info(2, n800_i2c_board_info_2,
                        ARRAY_SIZE(n800_i2c_board_info_2));