r4950 - developers/werner/gta03/cam/patches

werner at docs.openmoko.org werner at docs.openmoko.org
Thu Mar 5 04:59:06 CET 2009


Author: werner
Date: 2009-03-05 04:59:05 +0100 (Thu, 05 Mar 2009)
New Revision: 4950

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-platform.patch
   developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
   developers/werner/gta03/cam/patches/series
   developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
Log:
Now, really the final 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 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch	2009-03-05 03:59:05 UTC (rev 4950)
@@ -8,9 +8,9 @@
 
 Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c
 ===================================================================
---- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-04 19:24:55.000000000 +0800
-+++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-04 19:24:58.000000000 +0800
-@@ -595,6 +595,33 @@
+--- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-05 11:22:20.000000000 +0800
++++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-05 11:22:24.000000000 +0800
+@@ -520,6 +520,33 @@
  	.reg_divider	= S3C_CLK_DIV2,
  };
  
@@ -44,7 +44,7 @@
  /* Clock initialisation code */
  
  static struct clksrc_clk *init_parents[] = {
-@@ -611,6 +638,7 @@
+@@ -536,6 +563,7 @@
  	&clk_audio0,
  	&clk_audio1,
  	&clk_irda,
@@ -52,10 +52,10 @@
  };
  
  static void __init_or_cpufreq s3c6400_set_clksrc(struct clksrc_clk *clk)
-@@ -712,6 +740,7 @@
+@@ -636,6 +664,7 @@
+ 	&clk_audio0.clk,
  	&clk_audio1.clk,
  	&clk_irda.clk,
- 	&clk_arm,
 +	&clk_camif.clk,
  };
  

Modified: developers/werner/gta03/cam/patches/add-64xx-hclk2.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-64xx-hclk2.patch	2009-03-04 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/add-64xx-hclk2.patch	2009-03-05 03:59:05 UTC (rev 4950)
@@ -8,8 +8,8 @@
 
 Index: cam/arch/arm/plat-s3c/include/plat/clock.h
 ===================================================================
---- cam.orig/arch/arm/plat-s3c/include/plat/clock.h	2009-03-04 19:24:46.000000000 +0800
-+++ cam/arch/arm/plat-s3c/include/plat/clock.h	2009-03-04 19:24:55.000000000 +0800
+--- cam.orig/arch/arm/plat-s3c/include/plat/clock.h	2009-03-05 11:22:09.000000000 +0800
++++ cam/arch/arm/plat-s3c/include/plat/clock.h	2009-03-05 11:22:20.000000000 +0800
 @@ -50,6 +50,7 @@
  extern struct clk clk_ext;
  
@@ -20,8 +20,8 @@
  
 Index: cam/arch/arm/plat-s3c64xx/clock.c
 ===================================================================
---- cam.orig/arch/arm/plat-s3c64xx/clock.c	2009-03-04 19:24:46.000000000 +0800
-+++ cam/arch/arm/plat-s3c64xx/clock.c	2009-03-04 19:24:55.000000000 +0800
+--- cam.orig/arch/arm/plat-s3c64xx/clock.c	2009-03-05 11:22:09.000000000 +0800
++++ cam/arch/arm/plat-s3c64xx/clock.c	2009-03-05 11:22:20.000000000 +0800
 @@ -27,6 +27,12 @@
  #include <plat/devs.h>
  #include <plat/clock.h>
@@ -45,9 +45,9 @@
  void s3c64xx_register_clocks(void)
 Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c
 ===================================================================
---- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-04 19:24:49.000000000 +0800
-+++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-04 19:24:55.000000000 +0800
-@@ -683,6 +683,7 @@
+--- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-05 11:22:13.000000000 +0800
++++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-05 11:22:20.000000000 +0800
+@@ -608,6 +608,7 @@
  	clk_fout_epll.rate = epll;
  	clk_fout_apll.rate = apll;
  

Modified: developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch	2009-03-04 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch	2009-03-05 03:59:05 UTC (rev 4950)
@@ -13,7 +13,7 @@
 ===================================================================
 --- /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,65 @@
+@@ -0,0 +1,64 @@
 +/* linux/arch/arm/plat-s3c/dev-camif.c
 + *
 + * Copyright 2009 Openmoko, Inc.

Modified: developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
===================================================================
--- developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch	2009-03-04 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch	2009-03-05 03:59:05 UTC (rev 4950)
@@ -15,9 +15,9 @@
 
 Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c
 ===================================================================
---- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-04 19:24:46.000000000 +0800
-+++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-04 19:24:49.000000000 +0800
-@@ -314,10 +314,12 @@
+--- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-05 11:22:09.000000000 +0800
++++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c	2009-03-05 11:22:13.000000000 +0800
+@@ -239,10 +239,12 @@
  
  	rate = clk_round_rate(clk, rate);
  	div = clk_get_rate(clk->parent) / rate;

Modified: developers/werner/gta03/cam/patches/series
===================================================================
--- developers/werner/gta03/cam/patches/series	2009-03-04 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/series	2009-03-05 03:59:05 UTC (rev 4950)
@@ -1,14 +1,19 @@
 # submit with
 #
 # quilt mail --mbox foo --prefix PATCH \
-# --sender 'Werner Almesberger <werner at openmoko.org>' \
-# --subject 'Samsung camera driver for 3D7K' \
+# --from 'Werner Almesberger <werner at openmoko.org>' \
+# --sender werner at openmoko.org \
+# --subject 'Samsung camera driver for 3D7K, 3rd try' \
 # --to openmoko-kernel at lists.openmoko.org
 #
+# Then DO NOT
+# formail -ds sendmail openmoko-kernel at lists.openmoko.org <foo
+#
 
 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

Modified: developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
===================================================================
--- developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch	2009-03-04 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch	2009-03-05 03:59:05 UTC (rev 4950)
@@ -8,17 +8,8 @@
 
 Index: cam/arch/arm/configs/om_3d7k_defconfig
 ===================================================================
---- cam.orig/arch/arm/configs/om_3d7k_defconfig	2009-03-03 21:52:58.000000000 +0800
-+++ cam/arch/arm/configs/om_3d7k_defconfig	2009-03-03 21:53:04.000000000 +0800
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.29-rc3
--# Mon Mar  2 16:20:27 2009
-+# Tue Mar  3 19:23:50 2009
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+--- cam.orig/arch/arm/configs/om_3d7k_defconfig	2009-03-05 11:22:08.000000000 +0800
++++ cam/arch/arm/configs/om_3d7k_defconfig	2009-03-05 11:22:32.000000000 +0800
 @@ -204,6 +204,7 @@
  CONFIG_S3C_DEV_HSMMC1=y
  CONFIG_S3C_DEV_I2C1=y
@@ -27,7 +18,7 @@
  CONFIG_CPU_S3C6410=y
  CONFIG_S3C6410_SETUP_SDHCI=y
  # CONFIG_MACH_SMDK6410 is not set
-@@ -1010,13 +1011,101 @@
+@@ -991,13 +992,101 @@
  #
  # Multimedia core support
  #




More information about the commitlog mailing list