Changeset 4942


Ignore:
Timestamp:
02/27/09 13:41:19 (4 years ago)
Author:
werner
Message:
  • hacked I2C registration to "work" (driver needs updating for new API)
  • frequency is still x10 too high. can tweak this from user space.
  • work around minor numbers not being assigned the way the driver expects
Location:
developers/werner/gta03/cam/patches
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

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

    r4938 r4942  
    11Index: cam/drivers/media/video/Kconfig 
    22=================================================================== 
    3 --- cam.orig/drivers/media/video/Kconfig        2009-02-26 19:40:37.000000000 +0800 
    4 +++ cam/drivers/media/video/Kconfig     2009-02-26 19:42:02.000000000 +0800 
     3--- cam.orig/drivers/media/video/Kconfig        2009-02-27 18:34:40.000000000 +0800 
     4+++ cam/drivers/media/video/Kconfig     2009-02-27 18:42:11.000000000 +0800 
    55@@ -711,6 +711,25 @@ 
    66          CMOS camera controller.  This is the controller found on first- 
    … …  
    3131Index: cam/drivers/media/video/Makefile 
    3232=================================================================== 
    33 --- cam.orig/drivers/media/video/Makefile       2009-02-26 19:42:41.000000000 +0800 
    34 +++ cam/drivers/media/video/Makefile    2009-02-26 19:43:10.000000000 +0800 
     33--- cam.orig/drivers/media/video/Makefile       2009-02-27 18:34:40.000000000 +0800 
     34+++ cam/drivers/media/video/Makefile    2009-02-27 18:34:45.000000000 +0800 
    3535@@ -134,6 +134,8 @@ 
    3636 obj-$(CONFIG_VIDEO_VIVI) += vivi.o 

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

    r4941 r4942  
    22=================================================================== 
    33--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    4 +++ cam/drivers/media/video/s3c_camera_driver.c 2009-02-27 15:24:15.000000000 +0800 
    5 @@ -0,0 +1,1885 @@ 
     4+++ cam/drivers/media/video/s3c_camera_driver.c 2009-02-27 19:07:42.000000000 +0800 
     5@@ -0,0 +1,1884 @@ 
    66+/* drivers/media/video/s3c_camera_driver.c 
    77+ * 
    … …  
    18471847+void s3c_camif_open_sensor(camif_cis_t *cis) 
    18481848+{ 
    1849 +printk("@@@ s3c_camif_open_sensor: cam_clock %p cis %p\n", cam_clock, cis); 
    18501849+       clk_set_rate(cam_clock, cis->camclk); 
    18511850+       s3c_camif_reset(cis->reset_type, cis->reset_udelay); 
    … …  
    18921891=================================================================== 
    18931892--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    1894 +++ cam/drivers/media/video/s3c_camif.c 2009-02-27 15:24:15.000000000 +0800 
     1893+++ cam/drivers/media/video/s3c_camif.c 2009-02-27 18:55:24.000000000 +0800 
    18951894@@ -0,0 +1,1872 @@ 
    18961895+/* drivers/media/video/s3c_camif.c 
    … …  
    37693768=================================================================== 
    37703769--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    3771 +++ cam/drivers/media/video/s3c_camif.h 2009-02-27 15:24:15.000000000 +0800 
     3770+++ cam/drivers/media/video/s3c_camif.h 2009-02-27 18:55:24.000000000 +0800 
    37723771@@ -0,0 +1,404 @@ 
    37733772+/* drivers/media/video/s3c_camif.h 
    … …  
    41784177=================================================================== 
    41794178--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    4180 +++ cam/drivers/media/video/videodev2_s3c.h     2009-02-27 15:24:15.000000000 +0800 
     4179+++ cam/drivers/media/video/videodev2_s3c.h     2009-02-27 18:55:24.000000000 +0800 
    41814180@@ -0,0 +1,210 @@ 
    41824181+#ifndef __VIDEODEV2_S3C_H_ 

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

    r4941 r4942  
    22appears to be parent clock selection logic. This patch corrects it. 
    33 
    4 I also added a BUG_ON, since an overly large divider can cause 
    5 unrelated clocks to be changed. 
     4I also added a check for overly large dividers to prevent them 
     5from changing unrelated clocks. 
    66 
    77Signed-off-by: Werner Almesberger <werner@openmoko.org> 
    … …  
    1111Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 
    1212=================================================================== 
    13 --- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c      2009-02-27 16:17:15.000000000 +0800 
    14 +++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c   2009-02-27 16:52:50.000000000 +0800 
    15 @@ -239,10 +239,11 @@ 
     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 @@ 
    1616  
    1717        rate = clk_round_rate(clk, rate); 
    1818        div = clk_get_rate(clk->parent) / rate; 
    19 +       BUG_ON(div > 16); 
     19+       if (div > 16) 
     20+               return -EINVAL; 
    2021  
    2122        val = __raw_readl(reg); 

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

    r4941 r4942  
    11Index: cam/arch/arm/mach-s3c6410/mach-om-gta03.c 
    22=================================================================== 
    3 --- cam.orig/arch/arm/mach-s3c6410/mach-om-gta03.c      2009-02-27 14:02:45.000000000 +0800 
    4 +++ cam/arch/arm/mach-s3c6410/mach-om-gta03.c   2009-02-27 14:05:14.000000000 +0800 
     3--- cam.orig/arch/arm/mach-s3c6410/mach-om-gta03.c      2009-02-27 17:54:12.000000000 +0800 
     4+++ cam/arch/arm/mach-s3c6410/mach-om-gta03.c   2009-02-27 18:20:14.000000000 +0800 
    55@@ -84,6 +84,8 @@ 
    66 #include <plat/regs-usb-hs-otg.h> 
    … …  
    1212 /* ------------------------------------------------------------------------------- 
    1313  * GTA03 FIQ related 
    14 @@ -873,6 +875,7 @@ 
     14@@ -878,6 +880,9 @@ 
     15                .irq = GTA03_IRQ_LED, 
     16                .platform_data = &om_gta03_lp5521_pdata, 
     17        }, 
     18+       { 
     19+               I2C_BOARD_INFO("s5k4xa", 0x2d), 
     20+       }, 
     21  
     22 }; 
     23  
     24@@ -894,6 +899,7 @@ 
    1525        &gta03_device_spi_lcm, 
    1626        &s3c_device_usbgadget, 
    … …  
    2030  
    2131  
     32@@ -951,6 +957,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_gta03_pcf, 0x30, 0x21); 
     38+       pcf50633_reg_write(om_gta03_pcf, 0x39, 0x13); 
     39+       pcf50633_reg_write(om_gta03_pcf, 0x3a, 0x21); 
     40 } 
     41  
     42 static void gta03_l1k002_pwronoff(int level) 
    2243Index: cam/arch/arm/mach-s3c6410/Kconfig 
    2344=================================================================== 
    24 --- cam.orig/arch/arm/mach-s3c6410/Kconfig      2009-02-27 14:02:44.000000000 +0800 
    25 +++ cam/arch/arm/mach-s3c6410/Kconfig   2009-02-27 14:02:52.000000000 +0800 
     45--- cam.orig/arch/arm/mach-s3c6410/Kconfig      2009-02-27 17:54:12.000000000 +0800 
     46+++ cam/arch/arm/mach-s3c6410/Kconfig   2009-02-27 17:54:24.000000000 +0800 
    2647@@ -70,6 +70,7 @@ 
    2748        select S3C6410_SETUP_SDHCI 

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

    r4941 r4942  
    44add-s5k4.patch 
    55add-s3c-cam-platform.patch 
    6 mach-gta03-add-cam.patch 
    76add-64xx-cam-clock.patch 
    87add-s3c-camif.patch 
     8mach-gta03-add-cam.patch 
    99fix-s3c64xx_setrate_clksrc.patch 
     10wip.patch 
Note: See TracChangeset for help on using the changeset viewer.