ARM:OMAP2: Add OVERO_GPIO_BT_XGATE to Overo board init

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

diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c
index b52512536514bd68125733fb616b771fa6769de7..6272263e39867dac0a8aaf4cf986a52e60a72961 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-camera.c
+++ b/arch/arm/mach-omap2/board-n800-camera.c
@@ -25,18 +25,20 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/videodev2.h>
+#include <linux/i2c/menelaus.h>
 
 #include <media/v4l2-int-device.h>
 
 #include <asm/mach-types.h>
 
-#include <asm/arch/menelaus.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/board.h>
+#include <mach/gpio.h>
+#include <mach/board.h>
 
 #include <../drivers/cbus/retu.h>
 #include <../drivers/media/video/tcm825x.h>
 
+#include "board-n800.h"
+
 #if defined (CONFIG_VIDEO_TCM825X) || defined (CONFIG_VIDEO_TCM825X_MODULE)
 
 #define OMAP24XX_CAMERA_JAM_HACK
@@ -73,7 +75,6 @@ static int frames_after_reset;
 static int saturated_count;
 #endif
 
-#ifdef CONFIG_MACH_NOKIA_N800
 const static struct tcm825x_reg tcm825x_regs_n800[] = {
        /* initial settings for 2.5 V */
        {0x00, 0x03}, {0x03, 0x29}, {0xaa, 0x2a}, {0xc0, 0x2b},
@@ -106,9 +107,7 @@ const static struct tcm825x_reg tcm825x_regs_n800[] = {
        {0x08, 0x5c}, {0x08, 0x5d}, {0x08, 0x5e}, {0x08, 0x5f},
        {TCM825X_VAL_TERM, TCM825X_REG_TERM}
 };
-#endif
 
-#ifdef CONFIG_MACH_NOKIA_N810
 const static struct tcm825x_reg tcm825x_regs_n810[] = {
        /* initial settings for 2.5 V */
        {0x00, 0x03}, {0x03, 0x29}, {0xaa, 0x2a}, {0xc0, 0x2b},
@@ -141,7 +140,6 @@ const static struct tcm825x_reg tcm825x_regs_n810[] = {
        {0x08, 0x5c}, {0x08, 0x5d}, {0x08, 0x5e}, {0x08, 0x5f},
        {TCM825X_VAL_TERM, TCM825X_REG_TERM}
 };
-#endif
 
 static int tcm825x_is_okay(void)
 {
@@ -361,7 +359,7 @@ void __init n800_cam_init(void)
        r = omap_request_gpio(N800_CAM_SENSOR_RESET_GPIO);
        if (r < 0) {
                printk(KERN_WARNING "%s: failed to request gpio\n",
-                       __FUNCTION__);
+                       __func__);
                return;
        }