Changeset 4948


Ignore:
Timestamp:
03/04/09 13:21:28 (4 years ago)
Author:
werner
Message:

Prepare patch stack for submission into OM repository.

Location:
developers/werner/gta03/cam/patches
Files:
5 added
3 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch

    r4945 r4948  
     1Add CAMIF clock to S3C6410. 
     2 
     3Signed-off-by: Werner Almesberger <werner@openmoko.org> 
     4 
     5---  
     6 
    17Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 
    28=================================================================== 
    3 --- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c      2009-03-03 19:07:03.000000000 +0800 
    4 +++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c   2009-03-03 19:07:11.000000000 +0800 
    5 @@ -520,6 +520,33 @@ 
     9--- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c      2009-03-04 19:24:55.000000000 +0800 
     10+++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c   2009-03-04 19:24:58.000000000 +0800 
     11@@ -595,6 +595,33 @@ 
    612        .reg_divider    = S3C_CLK_DIV2, 
    713 }; 
    … …  
    3743  
    3844 static struct clksrc_clk *init_parents[] = { 
    39 @@ -536,6 +563,7 @@ 
     45@@ -611,6 +638,7 @@ 
    4046        &clk_audio0, 
    4147        &clk_audio1, 
    … …  
    4551  
    4652 static void __init_or_cpufreq s3c6400_set_clksrc(struct clksrc_clk *clk) 
    47 @@ -636,6 +664,7 @@ 
    48         &clk_audio0.clk, 
     53@@ -712,6 +740,7 @@ 
    4954        &clk_audio1.clk, 
    5055        &clk_irda.clk, 
     56        &clk_arm, 
    5157+       &clk_camif.clk, 
    5258 }; 

  • developers/werner/gta03/cam/patches/add-64xx-hclk2.patch

    r4945 r4948  
     1Add HCLKx2 to S3C64xx. 
     2 
     3Signed-off-by: Werner Almesberger <werner@openmoko.org> 
     4 
     5---  
     6 
    17Index: cam/arch/arm/plat-s3c/include/plat/clock.h 
    28=================================================================== 
    3 --- cam.orig/arch/arm/plat-s3c/include/plat/clock.h     2009-03-03 19:06:53.000000000 +0800 
    4 +++ cam/arch/arm/plat-s3c/include/plat/clock.h  2009-03-03 19:07:03.000000000 +0800 
     9--- cam.orig/arch/arm/plat-s3c/include/plat/clock.h     2009-03-04 19:24:46.000000000 +0800 
     10+++ cam/arch/arm/plat-s3c/include/plat/clock.h  2009-03-04 19:24:55.000000000 +0800 
    511@@ -50,6 +50,7 @@ 
    612 extern struct clk clk_ext; 
    … …  
    1319Index: cam/arch/arm/plat-s3c64xx/clock.c 
    1420=================================================================== 
    15 --- cam.orig/arch/arm/plat-s3c64xx/clock.c      2009-03-03 19:06:53.000000000 +0800 
    16 +++ cam/arch/arm/plat-s3c64xx/clock.c   2009-03-03 19:07:03.000000000 +0800 
     21--- cam.orig/arch/arm/plat-s3c64xx/clock.c      2009-03-04 19:24:46.000000000 +0800 
     22+++ cam/arch/arm/plat-s3c64xx/clock.c   2009-03-04 19:24:55.000000000 +0800 
    1723@@ -27,6 +27,12 @@ 
    1824 #include <plat/devs.h> 
    … …  
    3844Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 
    3945=================================================================== 
    40 --- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c      2009-03-03 19:07:01.000000000 +0800 
    41 +++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c   2009-03-03 19:07:03.000000000 +0800 
    42 @@ -608,6 +608,7 @@ 
     46--- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c      2009-03-04 19:24:49.000000000 +0800 
     47+++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c   2009-03-04 19:24:55.000000000 +0800 
     48@@ -683,6 +683,7 @@ 
    4349        clk_fout_epll.rate = epll; 
    4450        clk_fout_apll.rate = apll; 

  • developers/werner/gta03/cam/patches/add-s3c-cam-config.patch

    r4942 r4948  
     1Add Samsung S3C video driver to kernel configuration and build process. 
     2 
     3Original code is from Samsung's BSP. 
     4 
     5Signed-off-by: Werner Almesberger <werner@openmoko.org> 
     6 
     7---  
     8 
    19Index: cam/drivers/media/video/Kconfig 
    210=================================================================== 

  • developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch

    r4945 r4948  
     1Add Samsung S3C camera interface driver. 
     2 
     3Original code is from Samsung's BSP and was written for 2.6.21. 
     4 
     5Only tested on S3C6410. 
     6 
     7Signed-off-by: Werner Almesberger <werner@openmoko.org> 
     8 
     9---  
     10 
    111Index: cam/arch/arm/plat-s3c/dev-camif.c 
    212=================================================================== 

  • developers/werner/gta03/cam/patches/add-samsung-cams-i2c.patch

    r4938 r4948  
     1Add I2C IDs for Samsung S5K series cameras. 
     2 
     3This code is directly from Samsung's BSP. 
     4 
     5Signed-off-by: Werner Almesberger <werner@openmoko.org> 
     6 
     7--- 
     8 
    19Index: cam/include/linux/i2c-id.h 
    210=================================================================== 

  • developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch

    r4942 r4948  
    1111Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 
    1212=================================================================== 
    13 --- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c      2009-02-27 18:55:24.000000000 +0800 
    14 +++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c   2009-02-27 18:56:07.000000000 +0800 
    15 @@ -239,10 +239,12 @@ 
     13--- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c      2009-03-04 19:24:46.000000000 +0800 
     14+++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c   2009-03-04 19:24:49.000000000 +0800 
     15@@ -314,10 +314,12 @@ 
    1616  
    1717        rate = clk_round_rate(clk, rate); 

  • developers/werner/gta03/cam/patches/mach-om3d7k-add-cam.patch

    r4945 r4948  
     1Add camera interface driver to 3D7K machine. 
     2 
     3Signed-off-by: Werner Almesberger <werner@openmoko.org> 
     4 
     5--- 
     6 
    17Index: cam/arch/arm/mach-s3c6410/mach-om-3d7k.c 
    28=================================================================== 
    3 --- cam.orig/arch/arm/mach-s3c6410/mach-om-3d7k.c       2009-03-03 16:51:22.000000000 +0800 
    4 +++ cam/arch/arm/mach-s3c6410/mach-om-3d7k.c    2009-03-03 19:13:13.000000000 +0800 
     9--- cam.orig/arch/arm/mach-s3c6410/mach-om-3d7k.c       2009-03-04 19:36:12.000000000 +0800 
     10+++ cam/arch/arm/mach-s3c6410/mach-om-3d7k.c    2009-03-04 20:12:50.000000000 +0800 
    511@@ -84,6 +84,8 @@ 
    612 #include <plat/regs-usb-hs-otg.h> 
    713  
    814 extern struct platform_device s3c_device_usbgadget; 
    9 +extern struct platform_device s3c_device_camif; /* @@@ chgange plat/devs.h */ 
     15+extern struct platform_device s3c_device_camif; /* @@@ change plat/devs.h */ 
    1016+ 
    1117  
    1218 /* ------------------------------------------------------------------------------- 
    1319  * OM_3D7K FIQ related 
    14 @@ -879,6 +881,9 @@ 
    15                 .platform_data = &om_3d7k_lp5521_pdata, 
    16         }, 
    17         { 
    18 +               I2C_BOARD_INFO("s5k4xa", 0x2d), 
    19 +       }, 
    20 +       { 
    21                 I2C_BOARD_INFO("wm8753", 0x1a), 
    22         }, 
    23  }; 
    24 @@ -896,6 +901,7 @@ 
     20@@ -962,6 +964,7 @@ 
    2521        &om_3d7k_device_spi_lcm, 
    2622        &s3c_device_usbgadget, 
    … …  
    3026  
    3127  
    32 @@ -953,6 +959,10 @@ 
    33         pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x01); 
    34         pcf50633_reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f); 
    35   
    36 +       /* @@@ do this properly later - WA */ 
    37 +       pcf50633_reg_write(om_3d7k_pcf, 0x30, 0x21); 
    38 +       pcf50633_reg_write(om_3d7k_pcf, 0x39, 0x13); 
    39 +       pcf50633_reg_write(om_3d7k_pcf, 0x3a, 0x21); 
    40  } 
    41   
    42  static void om_3d7k_l1k002_pwronoff(int level) 
    4328Index: cam/arch/arm/mach-s3c6410/Kconfig 
    4429=================================================================== 
    45 --- cam.orig/arch/arm/mach-s3c6410/Kconfig      2009-03-03 16:51:22.000000000 +0800 
    46 +++ cam/arch/arm/mach-s3c6410/Kconfig   2009-03-03 19:12:24.000000000 +0800 
     30--- cam.orig/arch/arm/mach-s3c6410/Kconfig      2009-03-04 19:36:12.000000000 +0800 
     31+++ cam/arch/arm/mach-s3c6410/Kconfig   2009-03-04 20:12:50.000000000 +0800 
    4732@@ -70,6 +70,7 @@ 
    4833        select S3C6410_SETUP_SDHCI 

  • developers/werner/gta03/cam/patches/series

    r4945 r4948  
    22add-64xx-hclk2.patch 
    33add-64xx-cam-clock.patch 
    4 add-s3c-camif-regs.patch 
    5 add-s3c-camif.patch 
     4#add-s3c-camif-regs.patch 
     5add-s3c-camif-original.patch 
     6fix-s3c-camif.patch 
    67add-s3c-cam-platform.patch 
    78add-samsung-cams-i2c.patch 
    8 add-s5k4.patch 
     9add-s5k4-original.patch 
     10fix-s5k4.patch 
    911add-s3c-cam-config.patch 
    1012mach-om3d7k-add-cam.patch 
    1113# defconfig 
    1214update-om3d7k-defconfig.patch 
     15hacks.patch 

  • developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch

    r4945 r4948  
     1Enable V4L and camera driver in 3D7K default configuration. 
     2 
     3Signed-off-by: Werner Almesberger <werner@openmoko.org> 
     4 
     5--- 
     6 
    17Index: cam/arch/arm/configs/om_3d7k_defconfig 
    28=================================================================== 
Note: See TracChangeset for help on using the changeset viewer.