Power fixes from Jonathon Corbet; Marvell changed the camera power up.

[Andres Salomon]

Commit:     4af6a81e1087b5ffc034ac36bda38e780c73ba5c
Parent:     658625b92bdfe18d7a5b3f27516f6106a9639e1b
commit 4af6a81e1087b5ffc034ac36bda38e780c73ba5c
Author:     Andres Salomon <dilinger at debian.org>
AuthorDate: Fri Oct 20 17:18:10 2006 -0400
Commit:     Andres Salomon <dilinger at debian.org>
CommitDate: Fri Oct 20 17:18:10 2006 -0400

    Power fixes from Jonathon Corbet; Marvell changed the camera power up.
---
 drivers/media/video/m88alp01-ccic.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/media/video/m88alp01-ccic.c b/drivers/media/video/m88alp01-ccic.c
index 77922bc..22f505f 100644
--- a/drivers/media/video/m88alp01-ccic.c
+++ b/drivers/media/video/m88alp01-ccic.c
@@ -708,6 +708,11 @@ static void m88_ctlr_init(struct m88_cam
 
 	spin_lock_irqsave(&cam->dev_lock, flags);
 	/*
+	 * Added magic to bring up the hardware on the B-Test board
+	 */
+	m88_reg_write(cam, 0x3038, 0x8);
+	m88_reg_write(cam, 0x315c, 0x80008);
+	/*
 	 * Go through the dance needed to wake the device up.
 	 * Note that these registers are global and shared
 	 * with the NAND and SD devices.  Interaction between the
@@ -783,10 +788,10 @@ static void m88_ctlr_power_up(struct m88
 	 * wiring).  Control 0 is reset - set to 1 to operate.
 	 * Control 1 is power down, set to 0 to operate.
 	 */
-	m88_reg_write(cam, REG_GPR, GPR_C1EN|GPR_C0EN);
-	mdelay(500); /* FIXME */
+	m88_reg_write(cam, REG_GPR, GPR_C1EN|GPR_C0EN|GPR_C1);
+	mdelay(1); /* Marvell says 1ms will do it */
 	m88_reg_write(cam, REG_GPR, GPR_C1EN|GPR_C0EN|GPR_C0);
-	mdelay(10); /* Enough? */
+	mdelay(1); /* Enough? */
 	spin_unlock_irqrestore(&cam->dev_lock, flags);
 }