r4949 - developers/werner/gta03/cam/patches
werner at docs.openmoko.org
werner at docs.openmoko.org
Wed Mar 4 15:48:47 CET 2009
Author: werner
Date: 2009-03-04 15:48:46 +0100 (Wed, 04 Mar 2009)
New Revision: 4949
Modified:
developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
developers/werner/gta03/cam/patches/add-64xx-hclk2.patch
developers/werner/gta03/cam/patches/add-s3c-cam-config.patch
developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
developers/werner/gta03/cam/patches/add-s3c-camif-original.patch
developers/werner/gta03/cam/patches/add-s5k4-original.patch
developers/werner/gta03/cam/patches/add-samsung-cams-i2c.patch
developers/werner/gta03/cam/patches/fix-s3c-camif.patch
developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
developers/werner/gta03/cam/patches/fix-s5k4.patch
developers/werner/gta03/cam/patches/hacks.patch
developers/werner/gta03/cam/patches/mach-om3d7k-add-cam.patch
developers/werner/gta03/cam/patches/series
developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
Log:
Final revision for submission.
Modified: developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,7 @@
Add CAMIF clock to S3C6410.
+Add camera interface clock to S3C6410.
+
Signed-off-by: Werner Almesberger <werner at openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/add-64xx-hclk2.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-64xx-hclk2.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-64xx-hclk2.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,7 @@
Add HCLKx2 to S3C64xx.
+Add doubled HCLK to S3C64xx.
+
Signed-off-by: Werner Almesberger <werner at openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/add-s3c-cam-config.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-cam-config.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-s3c-cam-config.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,6 @@
-Add Samsung S3C video driver to kernel configuration and build process.
+Samsung S3C camera subsystem config and Makefile
+Add Samsung S3C camera subsystem to kernel configuration and build process.
Original code is from Samsung's BSP.
Signed-off-by: Werner Almesberger <werner at openmoko.org>
Modified: developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,6 @@
+Add Samsung S3C CAMIF driver
+
Add Samsung S3C camera interface driver.
-
Original code is from Samsung's BSP and was written for 2.6.21.
Only tested on S3C6410.
@@ -12,9 +13,14 @@
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ cam/arch/arm/plat-s3c/dev-camif.c 2009-03-03 19:06:20.000000000 +0800
-@@ -0,0 +1,59 @@
-+/* linux/arch/arm/plat-s3c/dev-hsmmc.c
+@@ -0,0 +1,65 @@
++/* linux/arch/arm/plat-s3c/dev-camif.c
+ *
++ * Copyright 2009 Openmoko, Inc.
++ * Werner Almesberger <werner at openmoko.org>
++ *
++ * based on dev-hsmmc.c which is
++ *
+ * Copyright (c) 2008 Simtec Electronics
+ * Ben Dooks <ben at simtec.co.uk>
+ * http://armlinux.simtec.co.uk/
Modified: developers/werner/gta03/cam/patches/add-s3c-camif-original.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-camif-original.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-s3c-camif-original.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,9 +1,9 @@
-Add Samsung S3C camera driver for V4L.
+Add Samsung S3C camera driver for V4L
-This is the original code from Samsung's 2.6.21 BSP.
+This is the original Samsung S3C camera driver code from the 2.6.21 BSP.
+The changes that are needed to make this work in 2.6.29 are in the next
+patch.
-The changes that are needed to make this work are in the next patch.
-
Signed-off-by: Werner Almesberger <werner at openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/add-s5k4-original.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s5k4-original.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-s5k4-original.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,9 +1,9 @@
-Add Samsung S5K4BA camera driver.
+Add Samsung S5K4BA camera driver
-This is the original code from Samsung's 2.6.21 BSP.
+This is the original Samsung S5K4BA camera driver code from the 2.6.21
+BSP. The changes that are needed to make this work in 2.6.29 are in
+the next patch.
-The changes that are needed to make this work are in the next patch.
-
Signed-off-by: Werner Almesberger <werner at openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/add-samsung-cams-i2c.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-samsung-cams-i2c.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-samsung-cams-i2c.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,6 +1,7 @@
-Add I2C IDs for Samsung S5K series cameras.
+Add I2C IDs for Samsung S5K series cameras
-This code is directly from Samsung's BSP.
+These are te I2C IDs for all the Samsung S5K series cameras. This code
+is directly from Samsung's BSP.
Signed-off-by: Werner Almesberger <werner at openmoko.org>
Modified: developers/werner/gta03/cam/patches/fix-s3c-camif.patch
===================================================================
--- developers/werner/gta03/cam/patches/fix-s3c-camif.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/fix-s3c-camif.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,7 +1,7 @@
-This updates the Samsung S3C camera interface driver from 2.6.21 to
-2.6.29 and fixes some trivial issues.
+Update Samsung S3C camera interface driver
-There are still a few ugly spots, marked with "@@@ - WA".
+Update the camera interface driver from 2.6.21 to 2.6.29 and fix some
+trivial issues. There are still a few ugly spots, marked with "@@@".
Only tested on S3C6410.
Modified: developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
===================================================================
--- developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,3 +1,8 @@
+Fix s3c64xx_setrate_clksrc
+
+Note: this patch is already on the way upstream but is currently missing
+in the Openmoko kernel.
+
Some of the rate selection logic in s3c64xx_setrate_clksrc uses what
appears to be parent clock selection logic. This patch corrects it.
Modified: developers/werner/gta03/cam/patches/fix-s5k4.patch
===================================================================
--- developers/werner/gta03/cam/patches/fix-s5k4.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/fix-s5k4.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,8 @@
-Fix Samsung S5K4BA camera driver. Mainly trailing whitespace issues.
+Fix Samsung S5K4BA camera driver.
+This patch makes the Samsung S5K4BA driver work in 2.6.29 and also solves
+a few minor issues, such as trailing whitespace.
+
Signed-off-by: Werner Almesberger <werner at openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/hacks.patch
===================================================================
--- developers/werner/gta03/cam/patches/hacks.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/hacks.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,3 +1,5 @@
+Dirty hacks to make it all work
+
A few dirty hacks to make the camera driver work:
- because V4L no longer guarantees that minor numbers provided by the
@@ -14,8 +16,8 @@
Index: cam/drivers/media/video/s3c_camera_driver.c
===================================================================
---- cam.orig/drivers/media/video/s3c_camera_driver.c 2009-03-04 18:05:16.000000000 +0800
-+++ cam/drivers/media/video/s3c_camera_driver.c 2009-03-04 18:05:53.000000000 +0800
+--- cam.orig/drivers/media/video/s3c_camera_driver.c 2009-03-04 20:52:03.000000000 +0800
++++ cam/drivers/media/video/s3c_camera_driver.c 2009-03-04 20:54:08.000000000 +0800
@@ -74,6 +74,7 @@
default:
@@ -26,11 +28,11 @@
return ret;
Index: cam/arch/arm/mach-s3c6410/mach-om-3d7k.c
===================================================================
---- cam.orig/arch/arm/mach-s3c6410/mach-om-3d7k.c 2009-03-04 18:05:47.000000000 +0800
-+++ cam/arch/arm/mach-s3c6410/mach-om-3d7k.c 2009-03-04 18:06:18.000000000 +0800
-@@ -422,6 +422,10 @@
- unsigned int power)
- {
+--- cam.orig/arch/arm/mach-s3c6410/mach-om-3d7k.c 2009-03-04 20:52:03.000000000 +0800
++++ cam/arch/arm/mach-s3c6410/mach-om-3d7k.c 2009-03-04 20:56:40.000000000 +0800
+@@ -1025,6 +1025,10 @@
+ pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 0x01);
+ pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
+ /* @@@ do this properly later - WA */
+ pcf50633_reg_write(om_3d7k_pcf, 0x30, 0x21);
@@ -38,4 +40,4 @@
+ pcf50633_reg_write(om_3d7k_pcf, 0x3a, 0x21);
}
- static struct plat_lcd_data om_3d7k_lcd_power_data = {
+ static void om_3d7k_l1k002_pwronoff(int level)
Modified: developers/werner/gta03/cam/patches/mach-om3d7k-add-cam.patch
===================================================================
--- developers/werner/gta03/cam/patches/mach-om3d7k-add-cam.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/mach-om3d7k-add-cam.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,8 @@
-Add camera interface driver to 3D7K machine.
+Add camera interface driver to 3D7K
+This patch adds the camera interface driver and the corresponding
+configuration option to the 3D7K machine.
+
Signed-off-by: Werner Almesberger <werner at openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/series
===================================================================
--- developers/werner/gta03/cam/patches/series 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/series 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,7 +1,14 @@
+# submit with
+#
+# quilt mail --mbox foo --prefix PATCH \
+# --sender 'Werner Almesberger <werner at openmoko.org>' \
+# --subject 'Samsung camera driver for 3D7K' \
+# --to openmoko-kernel at lists.openmoko.org
+#
+
fix-s3c64xx_setrate_clksrc.patch
add-64xx-hclk2.patch
add-64xx-cam-clock.patch
-#add-s3c-camif-regs.patch
add-s3c-camif-original.patch
fix-s3c-camif.patch
add-s3c-cam-platform.patch
@@ -10,6 +17,5 @@
fix-s5k4.patch
add-s3c-cam-config.patch
mach-om3d7k-add-cam.patch
-# defconfig
update-om3d7k-defconfig.patch
hacks.patch
Modified: developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
===================================================================
--- developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch 2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch 2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,3 +1,5 @@
+Enable camera in 3D7K defconfig
+
Enable V4L and camera driver in 3D7K default configuration.
Signed-off-by: Werner Almesberger <werner at openmoko.org>
More information about the commitlog
mailing list
