board-raho support camera and sensor ov2655
authorddl <ddl@rock-chips.com>
Fri, 30 Jul 2010 10:26:22 +0000 (18:26 +0800)
committerddl <ddl@rock-chips.com>
Fri, 30 Jul 2010 10:29:02 +0000 (18:29 +0800)
12 files changed:
arch/arm/mach-rk2818/board-raho.c
arch/arm/mach-rk2818/devices.c
arch/arm/mach-rk2818/devices.h
drivers/fpga/spi_gpio.c
drivers/media/video/Kconfig
drivers/media/video/Makefile
drivers/media/video/soc_camera.c
drivers/media/video/videobuf-core.c
drivers/media/video/videobuf-dma-contig.c
include/linux/videodev2.h
include/media/soc_camera.h
include/media/v4l2-chip-ident.h

index 40702cce4521c92410ae8f19567a5788666b6214..246964c802fb1b79ad5a2c376b3febce18210ace 100644 (file)
@@ -22,6 +22,8 @@
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/mmc/host.h>
+#include <linux/circ_buf.h>
+#include <linux/miscdevice.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <mach/rk2818_iomap.h>
 #include <mach/iomux.h>
 #include <mach/gpio.h>
+#include <mach/spi_fpga.h>
+#include <mach/rk2818_camera.h>                          /* ddl@rock-chips.com : camera support */
 
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 
+#include <media/soc_camera.h>                               /* ddl@rock-chips.com : camera support */
+
+
 #include "devices.h"
 
 #include "../../../drivers/spi/rk2818_spim.h"
@@ -406,6 +413,306 @@ struct rk2818_spi_chip spi_xpt2046_info = {
 };
 
 
+/*****************************************************************************************
+ * camera  devices
+ *author: ddl@rock-chips.com
+ *****************************************************************************************/
+#if 1
+#define RK2818_CAM_POWER_PIN    FPGA_PIN_PC5//SPI_GPIO_P1_05
+#define RK2818_CAM_RESET_PIN    FPGA_PIN_PD6//SPI_GPIO_P1_14    
+
+static int rk28_sensor_init(void);
+static int rk28_sensor_deinit(void);
+
+struct rk28camera_platform_data rk28_camera_platform_data = {
+    .init = rk28_sensor_init,
+    .deinit = rk28_sensor_deinit,
+    .gpio_res = {
+        {
+            .gpio_reset = RK2818_CAM_RESET_PIN,
+            .gpio_power = RK2818_CAM_POWER_PIN,
+            .dev_name = "ov2655"
+        }, {
+            .gpio_reset = 0xFFFFFFFF,
+            .gpio_power = 0xFFFFFFFF,
+            .dev_name = NULL
+        }
+    }
+};
+
+static int rk28_sensor_init(void)
+{
+    int ret = 0, i;
+    unsigned int camera_reset=0xffffffff,camera_power=0xffffffff;
+
+    printk("\n%s....%d    ******** ddl *********\n",__FUNCTION__,__LINE__);
+    
+    for (i=0; i<2; i++) { 
+        camera_reset = rk28_camera_platform_data.gpio_res[i].gpio_reset;
+        camera_power = rk28_camera_platform_data.gpio_res[i].gpio_power; 
+        
+        if (camera_power != 0xffffffff) {            
+            ret = gpio_request(camera_power, "camera power");
+            if (ret)
+                continue;
+                
+            gpio_set_value(camera_reset, 1);
+            gpio_direction_output(camera_power, 0);   
+        }
+        
+        if (camera_reset != 0xffffffff) {
+            ret = gpio_request(camera_reset, "camera reset");
+            if (ret) {
+                if (camera_power != 0xffffffff) 
+                    gpio_free(camera_power);    
+
+                continue;
+            }
+
+            gpio_set_value(camera_reset, 0);
+            gpio_direction_output(camera_reset, 0);            
+        }
+    }
+    
+    return 0;
+}
+
+static int rk28_sensor_deinit(void)
+{
+    unsigned int i;
+    unsigned int camera_reset=0xffffffff,camera_power=0xffffffff;
+
+    printk("\n%s....%d    ******** ddl *********\n",__FUNCTION__,__LINE__); 
+   
+    for (i=0; i<2; i++) { 
+        camera_reset = rk28_camera_platform_data.gpio_res[i].gpio_reset;
+        camera_power = rk28_camera_platform_data.gpio_res[i].gpio_power; 
+        
+        if (camera_power != 0xffffffff){
+            gpio_direction_input(camera_power);
+            gpio_free(camera_power);    
+        }
+        
+        if (camera_reset != 0xffffffff)  {
+            gpio_direction_input(camera_reset);
+            gpio_free(camera_reset);    
+        }
+    }
+
+    return 0;
+}
+
+
+static int rk28_sensor_power(struct device *dev, int on)
+{
+    unsigned int camera_reset=0xffffffff,camera_power=0xffffffff;
+    
+    if(rk28_camera_platform_data.gpio_res[0].dev_name &&  (strcmp(rk28_camera_platform_data.gpio_res[0].dev_name, dev_name(dev)) == 0)) {
+        camera_reset = rk28_camera_platform_data.gpio_res[0].gpio_reset;
+        camera_power = rk28_camera_platform_data.gpio_res[0].gpio_power;
+    } else if (rk28_camera_platform_data.gpio_res[1].dev_name && (strcmp(rk28_camera_platform_data.gpio_res[1].dev_name, dev_name(dev)) == 0)) {
+        camera_reset = rk28_camera_platform_data.gpio_res[1].gpio_reset;
+        camera_power = rk28_camera_platform_data.gpio_res[1].gpio_power;
+    }
+
+    if (camera_reset != 0xffffffff) {
+        gpio_set_value(camera_reset, !on);
+        //printk("\n%s..%s..ResetPin=%d ..PinLevel = %x   ******** ddl *********\n",__FUNCTION__,dev_name(dev),camera_reset, on);
+    }
+    if (camera_power != 0xffffffff)  {       
+        gpio_set_value(camera_power, !on);
+        printk("\n%s..%s..PowerPin=%d ..PinLevel = %x   ******** ddl *********\n",__FUNCTION__,dev_name(dev), camera_power, !on);
+    }
+    if (camera_reset != 0xffffffff) {
+        msleep(3);          /* delay 3 ms */
+        gpio_set_value(camera_reset,on);
+        printk("\n%s..%s..ResetPin= %d..PinLevel = %x   ******** ddl *********\n",__FUNCTION__,dev_name(dev), camera_reset, on);
+    }      
+    return 0;
+}
+#else
+
+ /*****************************************************************************************
+ * camera  devices
+ *author: ddl@rock-chips.com
+ *****************************************************************************************/
+#define RK2818_CAM_POWER_PIN    SPI_GPIO_P1_05
+#define RK2818_CAM_RESET_PIN    SPI_GPIO_P1_14    
+
+static int rk28_sensor_init(void);
+static int rk28_sensor_deinit(void);
+
+struct rk28camera_platform_data rk28_camera_platform_data = {
+    .init = rk28_sensor_init,
+    .deinit = rk28_sensor_deinit,
+    .gpio_res = {
+        {
+            .gpio_reset = RK2818_CAM_RESET_PIN,
+            .gpio_power = RK2818_CAM_POWER_PIN,
+            .gpio_flag = 0x03,
+            .dev_name = "ov2655"
+        }, {
+            .gpio_reset = 0xFFFFFFFF,
+            .gpio_power = 0xFFFFFFFF,
+            .gpio_flag = 0x00,
+            .dev_name = NULL
+        }
+    }
+};
+
+static int rk28_sensor_init(void)
+{
+    int ret = 0, i;
+    unsigned int camera_reset=0xffffffff,camera_power=0xffffffff, camera_ioflag;
+
+    printk("\n%s....%d    ******** ddl *********\n",__FUNCTION__,__LINE__);
+    
+    for (i=0; i<2; i++) { 
+        camera_reset = rk28_camera_platform_data.gpio_res[i].gpio_reset;
+        camera_power = rk28_camera_platform_data.gpio_res[i].gpio_power; 
+        camera_ioflag = rk28_camera_platform_data.gpio_res[i].gpio_flag;
+        
+        if (camera_power != 0xffffffff) {
+            if (camera_ioflag & 0x02) {                 /* ddl@rock-chips.com : fpga io extern */
+                spi_gpio_set_pinlevel(camera_power, SPI_GPIO_LOW);
+                spi_gpio_set_pindirection(camera_power, SPI_GPIO_OUT);
+            } else {
+                ret = gpio_request(camera_power, "camera power");
+                if (ret)
+                    continue;
+                    
+                gpio_set_value(camera_reset, 1);
+                gpio_direction_output(camera_power, 0);   
+            }
+        }
+        
+        if (camera_reset != 0xffffffff) {
+            if (camera_ioflag & 0x01) {
+                spi_gpio_set_pinlevel(camera_reset, SPI_GPIO_HIGH);
+                spi_gpio_set_pindirection(camera_reset, SPI_GPIO_OUT);
+            } else {
+                ret = gpio_request(camera_reset, "camera reset");
+                if (ret) {
+                    if (camera_power != 0xffffffff) 
+                        gpio_free(camera_power);    
+
+                    continue;
+                }
+                gpio_direction_output(camera_reset, 0);
+                gpio_set_value(camera_reset, 1);
+            }
+        }
+    }
+    
+    return 0;
+}
+
+static int rk28_sensor_deinit(void)
+{
+    unsigned int i;
+    unsigned int camera_reset=0xffffffff,camera_power=0xffffffff,camera_ioflag;
+
+    printk("\n%s....%d    ******** ddl *********\n",__FUNCTION__,__LINE__); 
+   
+    for (i=0; i<2; i++) { 
+        camera_reset = rk28_camera_platform_data.gpio_res[i].gpio_reset;
+        camera_power = rk28_camera_platform_data.gpio_res[i].gpio_power; 
+        camera_ioflag = rk28_camera_platform_data.gpio_res[i].gpio_flag;
+        
+        if (camera_power != 0xffffffff){
+            if  ((camera_ioflag & 0x02) == 0) {
+                gpio_direction_input(camera_power);
+                gpio_free(camera_power);    
+            } else {
+                spi_gpio_set_pinlevel(camera_power, SPI_GPIO_HIGH);
+                spi_gpio_set_pindirection(camera_power, SPI_GPIO_IN);
+            }
+        }
+        
+        if (camera_reset != 0xffffffff)  {
+            if  ((camera_ioflag & 0x01) == 0) {
+                gpio_direction_input(camera_reset);
+                gpio_free(camera_reset);    
+            } else {
+                spi_gpio_set_pinlevel(camera_reset, SPI_GPIO_HIGH);
+                spi_gpio_set_pindirection(camera_reset, SPI_GPIO_IN);
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+static int rk28_sensor_power(struct device *dev, int on)
+{
+    unsigned int camera_reset=0xffffffff,camera_power=0xffffffff,camera_ioflag;
+    
+    if(rk28_camera_platform_data.gpio_res[0].dev_name &&  (strcmp(rk28_camera_platform_data.gpio_res[0].dev_name, dev_name(dev)) == 0)) {
+        camera_reset = rk28_camera_platform_data.gpio_res[0].gpio_reset;
+        camera_power = rk28_camera_platform_data.gpio_res[0].gpio_power;
+        camera_ioflag = rk28_camera_platform_data.gpio_res[0].gpio_flag;           
+    } else if (rk28_camera_platform_data.gpio_res[1].dev_name && (strcmp(rk28_camera_platform_data.gpio_res[1].dev_name, dev_name(dev)) == 0)) {
+        camera_reset = rk28_camera_platform_data.gpio_res[1].gpio_reset;
+        camera_power = rk28_camera_platform_data.gpio_res[1].gpio_power;
+        camera_ioflag = rk28_camera_platform_data.gpio_res[1].gpio_flag;
+    }
+
+    if (camera_reset != 0xffffffff) {
+        if (camera_ioflag & 0x01) {
+            spi_gpio_set_pinlevel(camera_reset, on);
+        } else {
+            gpio_set_value(camera_reset, on);
+        }        
+        printk("\n%s..%s..ResetPin=%d ..PinLevel = %x   ******** ddl *********\n",__FUNCTION__,dev_name(dev),camera_reset, on);
+    }
+    if (camera_power != 0xffffffff)  {       
+        if (camera_ioflag & 0x02) {
+            spi_gpio_set_pinlevel(camera_power, !on);
+        } else {
+            gpio_set_value(camera_power, !on);
+        }
+        printk("\n%s..%s..PowerPin=%d ..PinLevel = %x   ******** ddl *********\n",__FUNCTION__,dev_name(dev), camera_power, !on);
+    }
+    if (camera_reset != 0xffffffff) {
+        mdelay(3);
+        if (camera_ioflag & 0x01) {
+            spi_gpio_set_pinlevel(camera_reset,on);
+        } else {
+            gpio_set_value(camera_reset,on);
+        }   
+        printk("\n%s..%s..ResetPin= %d..PinLevel = %x   ******** ddl *********\n",__FUNCTION__,dev_name(dev), camera_reset, on);
+    }        
+
+    mdelay(3000);
+
+    return 0;
+}
+
+
+#endif
+#define OV2655_IIC_ADDR            0x60
+static struct i2c_board_info rk2818_i2c_cam_info[] = {
+#ifdef CONFIG_SOC_CAMERA_OV2655
+       {
+               I2C_BOARD_INFO("ov2655", OV2655_IIC_ADDR>>1)
+       },
+#endif 
+};
+
+struct soc_camera_link rk2818_iclink = {
+       .bus_id         = RK28_CAM_PLATFORM_DEV_ID,
+       .power          = rk28_sensor_power,
+       .board_info     = &rk2818_i2c_cam_info[0],
+       .i2c_adapter_id = 2,
+#ifdef CONFIG_SOC_CAMERA_OV2655        
+       .module_name    = "ov2655",
+#endif 
+};
+
+
 /*****************************************************************************************
  * SPI devices
  *author: lhh
@@ -500,6 +807,12 @@ static struct platform_device *devices[] __initdata = {
     &rk2818_device_fb,    
     &rk2818_device_backlight,
        &rk2818_device_dsp,
+
+#ifdef CONFIG_VIDEO_RK2818
+       &rk2818_device_camera,      /* ddl@rock-chips.com : camera support  */
+       &rk2818_soc_camera_pdrv,
+ #endif
 #ifdef CONFIG_MTD_NAND_RK2818
        &rk2818_nand_device,
 #endif
index ccc428fbc70332efa487e7a8e1e053a9b00b8252..e9c1ae8cb8005c3f486e16222edcf16b9954e974 100755 (executable)
@@ -18,7 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/android_pmem.h>
 #include <linux/usb/android_composite.h>
-
+#include <linux/delay.h>
 #include <mach/irqs.h>
 #include <mach/rk2818_iomap.h>
 #include "devices.h"
 #include <linux/dm9000.h>
 #include <mach/gpio.h>
 #include <mach/rk2818_nand.h>
+#include <mach/iomux.h>
+#include <mach/rk2818_camera.h>                          /* ddl@rock-chips.com : camera support */
+#include <linux/i2c.h>                                      
+#include <media/soc_camera.h>
 static struct resource resources_sdmmc0[] = {
        {
                .start  = IRQ_NR_SDMMC0,
@@ -272,6 +276,48 @@ struct platform_device rk2818_device_backlight = {
         }
 };
 
+/* RK2818 Camera :  ddl@rock-chips.com  */
+#ifdef CONFIG_VIDEO_RK2818
+
+static struct resource rk2818_camera_resource[] = {
+       [0] = {
+               .start = RK2818_VIP_PHYS,
+               .end   = RK2818_VIP_PHYS + RK2818_VIP_SIZE - 1,
+               .flags = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start = IRQ_NR_VIP,
+               .end   = IRQ_NR_VIP,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static u64 rockchip_device_camera_dmamask = 0xffffffffUL;
+
+/*platform_device : */
+struct platform_device rk2818_device_camera = {
+       .name             = RK28_CAM_DRV_NAME,
+       .id               = RK28_CAM_PLATFORM_DEV_ID,               /* This is used to put cameras on this interface */
+       .num_resources    = ARRAY_SIZE(rk2818_camera_resource),
+       .resource         = rk2818_camera_resource,
+       .dev            = {
+               .dma_mask = &rockchip_device_camera_dmamask,
+               .coherent_dma_mask = 0xffffffffUL,
+               .platform_data  = &rk28_camera_platform_data,
+       }
+};
+
+/*platform_device : soc-camera need  */
+struct platform_device rk2818_soc_camera_pdrv = {
+       .name   = "soc-camera-pdrv",
+       .id     = -1,
+       .dev    = {
+               .init_name = "ov2655",
+               .platform_data = &rk2818_iclink,
+       },
+};
+#endif 
+
 //net device
 /* DM9000 */
 #ifdef CONFIG_DM9000
index 631eb18b28fe9cc780f52fd6679a15a8d743c020..9f7613beec22c36894eb1d3f90eddd6c54d77ae8 100644 (file)
@@ -30,6 +30,9 @@ extern struct rk2818_i2c_platform_data default_i2c1_data;
 extern struct rk2818_i2c_spi_data default_i2c2_data;
 extern struct rk2818_i2c_spi_data default_i2c3_data;
 
+extern struct soc_camera_link rk2818_iclink;                /* ddl@rock-chips.com : camera support */
+extern struct rk28camera_platform_data rk28_camera_platform_data;
+
 extern struct platform_device rk2818_device_sdmmc0;
 extern struct platform_device rk2818_device_sdmmc1;
 extern struct rk2818_sdmmc_platform_data default_sdmmc0_data;
@@ -43,6 +46,8 @@ extern struct platform_device rk2818_device_adc;
 extern struct platform_device rk2818_device_adckey;
 extern struct platform_device rk2818_device_battery;
 extern struct platform_device rk2818_device_backlight;
+extern struct platform_device rk2818_device_camera;             /* ddl@rock-chips.com : camera support */
+extern struct platform_device rk2818_soc_camera_pdrv;
 extern struct platform_device rk2818_device_dsp;
 extern struct platform_device rk2818_nand_device;
 extern struct platform_device rk2818_device_dwc_otg;
index 6113f4bc6e1c095a59851056b2d7351dc5b0c5c4..56d5f6fe2c1f34a8f02feccb673e51874fc00ca3 100755 (executable)
@@ -1195,4 +1195,4 @@ void spi_gpio_irq_setup(void)
 \r
 MODULE_DESCRIPTION("Driver for spi2gpio.");\r
 MODULE_AUTHOR("luowei <lw@rock-chips.com>");\r
-MODULE_LICENSE("GPL");
\ No newline at end of file
+MODULE_LICENSE("GPL");\r
index e6186b338a12d89dee15f4e423b000cdd4d4da7c..0276c9d83810108e4e873c9fde6484f63af06573 100644 (file)
@@ -865,6 +865,23 @@ config SOC_CAMERA_OV772X
        help
          This is a ov772x camera driver
 
+config SOC_CAMERA_OV2655
+       tristate "ov2655 camera support"
+       depends on SOC_CAMERA && I2C
+       help
+         This is a ov2655 camera driver
+
+config SOC_CAMERA_OV3640
+       tristate "ov3640 camera support"
+       depends on SOC_CAMERA && I2C
+       help
+         This is a ov3640 camera driver
+         
+config SOC_CAMERA_OV5642
+       tristate "ov5642 camera support"
+       depends on SOC_CAMERA && I2C
+       help
+         This is a ov5642 camera driver                     
 config MX1_VIDEO
        bool
 
@@ -909,6 +926,14 @@ config VIDEO_OMAP2
        ---help---
          This is a v4l2 driver for the TI OMAP2 camera capture interface
 
+
+config VIDEO_RK2818
+       tristate "RK2818 Camera Sensor Interface driver"
+       depends on VIDEO_DEV && ARCH_RK2818 && SOC_CAMERA && HAS_DMA
+       select VIDEOBUF_DMA_CONTIG
+       ---help---
+         This is a v4l2 driver for the RK2818 Camera Sensor Interface    
+
 #
 # USB Multimedia device configuration
 #
index e541932a789bcb93ec9c7f45c5419a6a20863510..017e1bda9f3096474b52187c7a36102689b37f71 100644 (file)
@@ -78,6 +78,9 @@ obj-$(CONFIG_SOC_CAMERA_MT9T031)      += mt9t031.o
 obj-$(CONFIG_SOC_CAMERA_MT9V022)       += mt9v022.o
 obj-$(CONFIG_SOC_CAMERA_OV772X)                += ov772x.o
 obj-$(CONFIG_SOC_CAMERA_TW9910)                += tw9910.o
+obj-$(CONFIG_SOC_CAMERA_OV2655)                += ov2655.o
+obj-$(CONFIG_SOC_CAMERA_OV3640)                += ov3640.o
+obj-$(CONFIG_SOC_CAMERA_OV5642)                += ov5642.o
 
 # And now the v4l2 drivers:
 
@@ -154,6 +157,7 @@ obj-$(CONFIG_VIDEO_MX1)                     += mx1_camera.o
 obj-$(CONFIG_VIDEO_MX3)                        += mx3_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)             += pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)      += sh_mobile_ceu_camera.o
+obj-$(CONFIG_VIDEO_RK2818)                     += rk2818_camera.o
 
 obj-$(CONFIG_ARCH_DAVINCI)             += davinci/
 
index 95fdeb23c2c1455f2930c4645369d266f62bc74e..4eb5f65498b6673221aa50274148acb9f0c547d0 100644 (file)
@@ -664,6 +664,40 @@ static int soc_camera_queryctrl(struct file *file, void *priv,
        return -EINVAL;
 }
 
+/* ddl@rock-chips.com : Add ioctrl -VIDIOC_QUERYMENU */
+static int soc_camera_querymenu(struct file *file, void *priv,
+                                struct v4l2_querymenu *qm)
+{
+    struct soc_camera_file *icf = file->private_data;
+    struct soc_camera_device *icd = icf->icd;
+    struct v4l2_queryctrl qctrl;
+    int i,j;
+    
+    qctrl.id = qm->id;
+
+    if (soc_camera_queryctrl(file,priv, &qctrl) == 0) {
+        for (i = 0; i < icd->ops->num_menus; i++) {
+            if (qm->id == icd->ops->menus[i].id) {
+                for (j=0; j<=(qctrl.maximum - qctrl.minimum); j++) {
+                
+                    if (qm->index == icd->ops->menus[i].index) {
+                        snprintf(qm->name, sizeof(qm->name), icd->ops->menus[i].name);
+                        qm->reserved = 0;
+
+                        return 0;
+                    } else {
+                        i++;
+                        if ( i >= icd->ops->num_menus)
+                            return -EINVAL;    
+                    }                    
+                }                
+            }
+        }
+    }
+    
+    return -EINVAL;
+}
+
 static int soc_camera_g_ctrl(struct file *file, void *priv,
                             struct v4l2_control *ctrl)
 {
@@ -704,6 +738,64 @@ static int soc_camera_s_ctrl(struct file *file, void *priv,
        return v4l2_subdev_call(sd, core, s_ctrl, ctrl);
 }
 
+
+ /* ddl@rock-chips.com : Add ioctrl -VIDIOC_XXX_ext_ctrl for soc-camera */
+static int soc_camera_try_ext_ctrl(struct file *file, void *priv,
+                             struct v4l2_ext_controls *ctrl)
+{
+    struct soc_camera_file *icf = file->private_data;
+    struct soc_camera_device *icd = icf->icd;
+    const struct v4l2_queryctrl *qctrl;   
+    int i;
+    
+    WARN_ON(priv != file->private_data);
+
+    if (ctrl->ctrl_class != V4L2_CTRL_CLASS_CAMERA)
+        return -EINVAL;
+
+    for (i=0; i<ctrl->count; i++) {     
+        qctrl = soc_camera_find_qctrl(icd->ops, ctrl->controls[i].id);
+        if (!qctrl)
+            return -EINVAL;
+
+        if ((ctrl->controls[i].value < qctrl->minimum) ||(ctrl->controls[i].value > qctrl->minimum))
+            return -ERANGE;
+    }
+    
+    return 0;
+}
+ /* ddl@rock-chips.com : Add ioctrl -VIDIOC_XXX_ext_ctrl for soc-camera */
+static int soc_camera_g_ext_ctrl(struct file *file, void *priv,
+                             struct v4l2_ext_controls *ctrl)
+{
+    struct soc_camera_file *icf = file->private_data;
+    struct soc_camera_device *icd = icf->icd;
+    struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+    
+    WARN_ON(priv != file->private_data);
+
+    if (ctrl->ctrl_class != V4L2_CTRL_CLASS_CAMERA)
+        return -EINVAL;
+    
+    return v4l2_subdev_call(sd, core, g_ext_ctrls, ctrl);    
+}
+ /* ddl@rock-chips.com : Add ioctrl -VIDIOC_XXX_ext_ctrl for soc-camera */
+static int soc_camera_s_ext_ctrl(struct file *file, void *priv,
+                             struct v4l2_ext_controls *ctrl)
+{
+    struct soc_camera_file *icf = file->private_data;
+    struct soc_camera_device *icd = icf->icd;
+    struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+    
+    WARN_ON(priv != file->private_data);
+
+    if (ctrl->ctrl_class != V4L2_CTRL_CLASS_CAMERA)
+        return -EINVAL;
+    
+    return v4l2_subdev_call(sd, core, s_ext_ctrls, ctrl);    
+}
+
+
 static int soc_camera_cropcap(struct file *file, void *fh,
                              struct v4l2_cropcap *a)
 {
@@ -1241,8 +1333,13 @@ static const struct v4l2_ioctl_ops soc_camera_ioctl_ops = {
        .vidioc_streamon         = soc_camera_streamon,
        .vidioc_streamoff        = soc_camera_streamoff,
        .vidioc_queryctrl        = soc_camera_queryctrl,
+        .vidioc_querymenu       = soc_camera_querymenu,                            /* ddl@rock-chips.com:   Add ioctrl - vidioc_querymenu for soc-camera */
        .vidioc_g_ctrl           = soc_camera_g_ctrl,
        .vidioc_s_ctrl           = soc_camera_s_ctrl,
+       .vidioc_g_ext_ctrls    = soc_camera_g_ext_ctrl,                                 /* ddl@rock-chips.com:   Add ioctrl - vidioc_g_ext_ctrls for soc-camera */
+       .vidioc_s_ext_ctrls    = soc_camera_s_ext_ctrl,                                 /* ddl@rock-chips.com:   Add ioctrl - vidioc_s_ext_ctrls for soc-camera */
+       .vidioc_try_ext_ctrls    = soc_camera_try_ext_ctrl,                         /* ddl@rock-chips.com:   Add ioctrl - vidioc_try_ext_ctrls for soc-camera */
+
        .vidioc_cropcap          = soc_camera_cropcap,
        .vidioc_g_crop           = soc_camera_g_crop,
        .vidioc_s_crop           = soc_camera_s_crop,
index 8e93c6f25c83ae4cab47bc715712b56ff5aa059a..1c6f0fbedbd8d5ed32f9adedd2a60ac7157f3749 100644 (file)
@@ -259,7 +259,9 @@ static void videobuf_status(struct videobuf_queue *q, struct v4l2_buffer *b,
                b->length    = vb->bsize;
                break;
        case V4L2_MEMORY_OVERLAY:
-               b->m.offset  = vb->boff;
+               //b->m.offset  = vb->boff;
+               b->m.offset = vb->boff - vb->bsize* vb->i;    /* ddl@rock-chips.com : nzy modify V4L2_MEMORY_OVERLAY   */
+               b->length    = vb->bsize;
                break;
        }
 
@@ -546,7 +548,8 @@ int videobuf_qbuf(struct videobuf_queue *q,
                buf->baddr = b->m.userptr;
                break;
        case V4L2_MEMORY_OVERLAY:
-               buf->boff = b->m.offset;
+               //buf->boff = b->m.offset;
+               buf->boff = b->m.offset + buf->bsize* buf->i;    /* ddl@rock-chips.com : nzy modify V4L2_MEMORY_OVERLAY   */
                break;
        default:
                dprintk(1, "qbuf: wrong memory type\n");
index c3065c4bcba9fb6019fb664de98f075423348994..9991381943e6202e35e5c53fed7f9ebb641d2825 100644 (file)
@@ -251,6 +251,7 @@ static int __videobuf_iolock(struct videobuf_queue *q,
                        mem->vaddr, mem->size);
                break;
        case V4L2_MEMORY_OVERLAY:
+               break; /* ddl@rock-chips.com : nzy modify V4L2_MEMORY_OVERLAY   */
        default:
                dev_dbg(q->dev, "%s memory method OVERLAY/unknown\n",
                        __func__);
index b59e78c57161451049500609fe40b432dc18a7f0..2c2e6e03b11f8f0b87e32e267c651bc612972a1f 100644 (file)
@@ -1159,6 +1159,13 @@ enum  v4l2_exposure_auto_type {
 
 #define V4L2_CID_PRIVACY                       (V4L2_CID_CAMERA_CLASS_BASE+16)
 
+/* ddl@rock-chips.com : Add ioctrl -  V4L2_CID_SCENE for camera scene control */
+#define V4L2_CID_CAMERA_CLASS_BASE_ROCK                      (V4L2_CID_CAMERA_CLASS_BASE + 30)
+#define V4L2_CID_SCENE                 (V4L2_CID_CAMERA_CLASS_BASE_ROCK+1)             
+#define V4L2_CID_EFFECT                        (V4L2_CID_CAMERA_CLASS_BASE_ROCK+2) 
+#define V4L2_CID_FLASH                      (V4L2_CID_CAMERA_CLASS_BASE_ROCK+3) 
+
+
 /* FM Modulator class control IDs */
 #define V4L2_CID_FM_TX_CLASS_BASE              (V4L2_CTRL_CLASS_FM_TX | 0x900)
 #define V4L2_CID_FM_TX_CLASS                   (V4L2_CTRL_CLASS_FM_TX | 1)
index 3d74e60032ddf27ff02403bc18d8f98f9e8f5c7d..b7227075f6cd39c60a5824eae457e8194e099480 100644 (file)
@@ -196,9 +196,12 @@ struct soc_camera_ops {
        int (*resume)(struct soc_camera_device *);
        unsigned long (*query_bus_param)(struct soc_camera_device *);
        int (*set_bus_param)(struct soc_camera_device *, unsigned long);
-       int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
+       int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);     
+       
        const struct v4l2_queryctrl *controls;
+       const struct v4l2_querymenu *menus;                /* ddl@rock-chips.com : Add ioctrl -VIDIOC_QUERYMENU */
        int num_controls;
+       int num_menus;      /* ddl@rock-chips.com : Add ioctrl -VIDIOC_QUERYMENU */
 };
 
 #define SOCAM_SENSE_PCLK_CHANGED       (1 << 0)
@@ -256,6 +259,10 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
 #define SOCAM_DATA_ACTIVE_HIGH         (1 << 14)
 #define SOCAM_DATA_ACTIVE_LOW          (1 << 15)
 
+#define SOCAM_MCLK_24MHZ   (1<<29)                                      /* ddl@rock-chips.com : add  */ 
+#define SOCAM_MCLK_27MHZ   (1<<30)
+#define SOCAM_MCLK_48MHZ   (1<<31)
+
 #define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \
                              SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \
                              SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_16)
index cf16689adba78707e6c2e8aa3b5b25641ddb72f3..bca6a13b54714288b3dfd01edf31bcfd64c28714 100644 (file)
@@ -64,6 +64,7 @@ enum {
        V4L2_IDENT_OV9650 = 254,
        V4L2_IDENT_OV9655 = 255,
        V4L2_IDENT_SOI968 = 256,
+       V4L2_IDENT_OV2655 = 257,                            /* ddl@rock-chips.com : ov2655 support */
 
        /* module saa7146: reserved range 300-309 */
        V4L2_IDENT_SAA7146 = 300,