Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-n800.c

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index b62f2d5b4d1bf1a7c00bca8195151782b3e59749..95cc84ab42c8d7a2dc4adcd08aaec38c965f6aab 100644 (file)
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -25,21 +25,21 @@
 #include <linux/irq.h>
 #include <linux/i2c.h>
 #include <linux/i2c/lm8323.h>
-#include <asm/hardware.h>
+#include <linux/i2c/menelaus.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
-#include <asm/arch/mcspi.h>
-#include <asm/arch/menelaus.h>
-#include <asm/arch/lcd_mipid.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/gpio-switch.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/blizzard.h>
+#include <mach/gpio.h>
+#include <mach/usb.h>
+#include <mach/board.h>
+#include <mach/common.h>
+#include <mach/mcspi.h>
+#include <mach/lcd_mipid.h>
+#include <mach/clock.h>
+#include <mach/gpio-switch.h>
+#include <mach/omapfb.h>
+#include <mach/blizzard.h>
 
 #include <../drivers/cbus/tahvo.h>
 #include <../drivers/media/video/tcm825x.h>
@@ -122,7 +122,7 @@ static struct lm8323_platform_data lm8323_pdata = {
 
 void __init nokia_n800_init_irq(void)
 {
-       omap2_init_common_hw();
+       omap2_init_common_hw(NULL);
        omap_init_irq();
        omap_gpio_init();
 
@@ -642,33 +642,33 @@ static struct i2c_board_info __initdata n800_i2c_board_info_1[] = {
 
 extern struct tcm825x_platform_data n800_tcm825x_platform_data;
 
-static struct i2c_board_info __initdata n800_i2c_board_info_2[] = {
-#if defined (CONFIG_VIDEO_TCM825X) || defined (CONFIG_VIDEO_TCM825X_MODULE)
+static struct i2c_board_info __initdata_or_module n8x0_i2c_board_info_2[] = {
        {
                I2C_BOARD_INFO(TCM825X_NAME, TCM825X_I2C_ADDR),
+#if defined (CONFIG_VIDEO_TCM825X) || defined (CONFIG_VIDEO_TCM825X_MODULE)
                .platform_data = &n800_tcm825x_platform_data,
-       },
 #endif
-#if defined(CONFIG_RADIO_TEA5761) || defined(CONFIG_RADIO_TEA5761_MODULE)
+       },
        {
-               I2C_BOARD_INFO("tea5761", 0x10),
+               I2C_BOARD_INFO("tsl2563", 0x29),
        },
-#endif
-#ifdef CONFIG_MACH_NOKIA_N810
        {
-               I2C_BOARD_INFO("lm8323", 0x45),
-               .type           = "lm8323",
-               .irq            = OMAP_GPIO_IRQ(109),
-               .platform_data  = &lm8323_pdata,
+               I2C_BOARD_INFO("lp5521", 0x32),
        },
-#endif
+};
+
+
+static struct i2c_board_info __initdata_or_module n800_i2c_board_info_2[] = {
        {
-               I2C_BOARD_INFO("tsl2563", 0x29),
-               .type           = "tsl2563",
+               I2C_BOARD_INFO("tea5761", 0x10),
        },
+};
+
+static struct i2c_board_info __initdata_or_module n810_i2c_board_info_2[] = {
        {
-               I2C_BOARD_INFO("lp5521", 0x32),
-               .type           = "lp5521",
+               I2C_BOARD_INFO("lm8323", 0x45),
+               .irq            = OMAP_GPIO_IRQ(109),
+               .platform_data  = &lm8323_pdata,
        },
 };
 
@@ -693,8 +693,15 @@ void __init nokia_n800_common_init(void)
        omap_serial_init();
        omap_register_i2c_bus(1, 400, n800_i2c_board_info_1,
                              ARRAY_SIZE(n800_i2c_board_info_1));
-       omap_register_i2c_bus(2, 400, n800_i2c_board_info_2,
+       omap_register_i2c_bus(2, 400, n8x0_i2c_board_info_2,
                              ARRAY_SIZE(n800_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));
+       if (machine_is_nokia_n810())
+               i2c_register_board_info(2, n810_i2c_board_info_2,
+                       ARRAY_SIZE(n810_i2c_board_info_2));
+               
        mipid_dev_init();
        blizzard_dev_init();
 }