From d869c7f5c9ed1b4d80406f0166629b1db6b51e94 Mon Sep 17 00:00:00 2001
From: Robert Jarzmik <robert.jarzmik@free.fr>
Date: Sun, 22 Apr 2012 23:24:00 +0200
Subject: [PATCH] --- yaml --- r: 303423 b: refs/heads/master c:
 c2219e4dac89fbd2ac4c75a95062a02d558211c1 h: refs/heads/master i:   303421:
 f10d60e1a115e8f289252bd8ad8923ee42e9b10a   303419:
 a94dc38b792210827263ac36a6212a37a2ea3bc4   303415:
 a8561c5c4aa17935121e36d99043f9621a89c3c9   303407:
 3c23cebc7625de9e8f22fa9145596e4d25652162   303391:
 168321811f092a111ae13e28e49ce3933288b73a   303359:
 6b4391575ba57bbd47f7c1f3cfcc6de17fab7602 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/mach-pxa/include/mach/mioa701.h | 3 +++
 trunk/arch/arm/mach-pxa/mioa701.c              | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7149af56ae6a..bf2593aa1257 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b298322b7576c9d5750fdc7d3e588ec9238af1d3
+refs/heads/master: c2219e4dac89fbd2ac4c75a95062a02d558211c1
diff --git a/trunk/arch/arm/mach-pxa/include/mach/mioa701.h b/trunk/arch/arm/mach-pxa/include/mach/mioa701.h
index 02868447b0b1..e57f5c724e8a 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/mioa701.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/mioa701.h
@@ -61,6 +61,9 @@
 #define GPIO93_KEY_VOLUME_UP			93
 #define GPIO94_KEY_VOLUME_DOWN			94
 
+/* Camera */
+#define GPIO56_MT9M111_nOE			56
+
 extern struct input_dev *mioa701_evdev;
 extern void mioa701_gpio_lpm_set(unsigned long mfp_pin);
 
diff --git a/trunk/arch/arm/mach-pxa/mioa701.c b/trunk/arch/arm/mach-pxa/mioa701.c
index 061d57009cee..929c62b47b76 100644
--- a/trunk/arch/arm/mach-pxa/mioa701.c
+++ b/trunk/arch/arm/mach-pxa/mioa701.c
@@ -103,6 +103,7 @@ static unsigned long mioa701_pin_config[] = {
 	GPIO82_CIF_DD_5,
 	GPIO84_CIF_FV,
 	GPIO85_CIF_LV,
+	MIO_CFG_OUT(GPIO56_MT9M111_nOE, AF0, DRIVE_LOW),
 
 	/* Bluetooth */
 	MIO_CFG_IN(GPIO14_BT_nACTIVITY, AF0),
@@ -705,6 +706,7 @@ static struct gpio global_gpios[] = {
 	{ GPIO9_CHARGE_EN, GPIOF_OUT_INIT_HIGH, "Charger enable" },
 	{ GPIO18_POWEROFF, GPIOF_OUT_INIT_LOW, "Power Off" },
 	{ GPIO87_LCD_POWER, GPIOF_OUT_INIT_LOW, "LCD Power" },
+	{ GPIO56_MT9M111_nOE, GPIOF_OUT_INIT_LOW, "Camera nOE" },
 };
 
 static void __init mioa701_machine_init(void)