rpms/kernel/FC-6 linux-2.6-marvell-update.patch, NONE, 1.1 kernel-2.6.spec, 1.2815, 1.2816

[fedora-cvs-commits at redhat.com]

Author: mtosatti

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv14763

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-marvell-update.patch 
Log Message:
Marvell camera driver update (OLPC)



linux-2.6-marvell-update.patch:
 m88alp01-ccic.c    |   11 ++++++++---
 ovcamchip/ov7670.c |    4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-marvell-update.patch ---
4af6a81e1087b5ffc034ac36bda38e780c73ba5c
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);
 }
 
1aa00c3c680d94dee971d2544cc19e695e4f7dd5
diff --git a/drivers/media/video/ovcamchip/ov7670.c b/drivers/media/video/ovcamchip/ov7670.c
index 004113f..c89d4dc 100644
--- a/drivers/media/video/ovcamchip/ov7670.c
+++ b/drivers/media/video/ovcamchip/ov7670.c
@@ -253,8 +253,8 @@ static struct ovcamchip_regvals regvals_
 	{ REG_COM5, 0x61 },
 	{ REG_COM6, 0x4b },
 	{ 0x16, 0x02 },
-//	{ REG_MVFP, 0x07 },
-	{ REG_MVFP, 0x07 | MVFP_FLIP }, // Flip needed on dev system
+	{ REG_MVFP, 0x07 },
+//	{ REG_MVFP, 0x07 | MVFP_FLIP }, // Flip needed on dev system
 	{ 0x21, 0x02 },
 	{ 0x22, 0x91 },
 	{ 0x29, 0x07 },


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2815
retrieving revision 1.2816
diff -u -r1.2815 -r1.2816
--- kernel-2.6.spec	22 Oct 2006 01:14:48 -0000	1.2815
+++ kernel-2.6.spec	23 Oct 2006 05:04:28 -0000	1.2816
@@ -557,6 +557,7 @@
 Patch5000: linux-2.6-mtd-update.patch
 Patch5001: linux-2.6-cafe-nand.patch
 Patch5010: linux-2.6-marvell-88alp01.patch
+Patch5011: linux-2.6-marvell-update.patch
 Patch5020: linux-2.6-olpc-dcon.patch
 Patch5030: linux-2.6-libertas.diff
 Patch5040: linux-2.6-olpc-touchpad.diff
@@ -1228,6 +1229,7 @@
 
 # Marvell 88ALP01 camera
 %patch5010 -p1
+%patch5011 -p1
 # OLPC DCON fb driver 
 %patch5020 -p1
 # Marvell Libertas wireless driver