From: Jarkko Nikula <jarkko.nikula@nokia.com>
Date: Mon, 1 Sep 2008 13:05:04 +0000 (+0300)
Subject: ARM: OMAP2: Fix Nokia N8x0 second I2C bus device registration
X-Git-Tag: v2.6.27-omap1~264
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b7a2e57f617d8a66c13fb698a7241a8b31230dd2;p=linux-2.6-omap-h63xx.git

ARM: OMAP2: Fix Nokia N8x0 second I2C bus device registration

- 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>
---

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 95cc84ab42c..1df9f3dcc28 100644
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -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));