camera rk30 : fix conflict when merge 2928

diff --git a/arch/arm/mach-rk30/include/mach/rk30_camera.h b/arch/arm/mach-rk30/include/mach/rk30_camera.h
index 5365fabe9aac1f8721afaa64c8530e0545579373..38e771f81e8c08f55569828d30534046757b13ab 100755 (executable)
--- a/arch/arm/mach-rk30/include/mach/rk30_camera.h
+++ b/arch/arm/mach-rk30/include/mach/rk30_camera.h
@@ -21,8 +21,17 @@
 #ifndef __ASM_ARCH_CAMERA_RK30_H_\r
 
 #define __ASM_ARCH_CAMERA_RK29_H_
+#ifdef CONFIG_ARCH_RK30
 #define RK29_CAM_DRV_NAME "rk-camera-rk30"\r
+#define RK_SUPPORT_CIF0   1
+#define RK_SUPPORT_CIF1   1
+#endif
 
+#ifdef CONFIG_ARCH_RK31
+#define RK29_CAM_DRV_NAME "rk-camera-rk31"
+#define RK_SUPPORT_CIF0   1
+#define RK_SUPPORT_CIF1   0
+#endif
 #include <plat/rk_camera.h>
 
 #endif\r

diff --git a/drivers/media/video/rk30_camera.c b/drivers/media/video/rk30_camera.c
index a516643730d500197af59a015491fa1772bd28c7..6d7c3766dca9523aa873c95708f33583ddbf3251 100755 (executable)
--- a/drivers/media/video/rk30_camera.c
+++ b/drivers/media/video/rk30_camera.c
@@ -854,6 +854,7 @@ static int rk_sensor_iomux(int pin)
 \r
 \r
 static u64 rockchip_device_camera_dmamask = 0xffffffffUL;\r
+#if RK_SUPPORT_CIF0\r
 static struct resource rk_camera_resource_host_0[] = {\r
        [0] = {\r
                .start = RK30_CIF0_PHYS,\r
@@ -866,6 +867,8 @@ static struct resource rk_camera_resource_host_0[] = {
                .flags = IORESOURCE_IRQ,\r
        }\r
 };\r
+#endif\r
+#if RK_SUPPORT_CIF1\r
 static struct resource rk_camera_resource_host_1[] = {\r
        [0] = {\r
                .start = RK30_CIF1_PHYS,\r
@@ -878,7 +881,10 @@ static struct resource rk_camera_resource_host_1[] = {
                .flags = IORESOURCE_IRQ,\r
        }\r
 };\r
+#endif\r
+\r
 /*platform_device : */\r
+#if RK_SUPPORT_CIF0\r
  struct platform_device rk_device_camera_host_0 = {\r
        .name             = RK29_CAM_DRV_NAME,\r
        .id       = RK_CAM_PLATFORM_DEV_ID_0,                           /* This is used to put cameras on this interface */\r
@@ -890,6 +896,9 @@ static struct resource rk_camera_resource_host_1[] = {
                .platform_data  = &rk_camera_platform_data,\r
        }\r
 };\r
+#endif\r
+\r
+#if RK_SUPPORT_CIF1\r
 /*platform_device : */\r
  struct platform_device rk_device_camera_host_1 = {\r
        .name             = RK29_CAM_DRV_NAME,\r
@@ -902,6 +911,7 @@ static struct resource rk_camera_resource_host_1[] = {
                .platform_data  = &rk_camera_platform_data,\r
        }\r
 };\r
+#endif\r
 \r
 static void rk_init_camera_plateform_data(void)\r
 {\r
@@ -923,8 +933,8 @@ static void rk_init_camera_plateform_data(void)
 \r
 static void rk30_camera_request_reserve_mem(void)\r
 {\r
-#ifdef CONFIG_VIDEO_RK29_WORK_IPP\r
-    #ifdef CONFIG_VIDEO_RKCIF_WORK_SIMUL_OFF\r
+#ifdef CONFIG_VIDEO_RK29_WORK_IPP    \r
+    #if defined(CONFIG_VIDEO_RKCIF_WORK_SIMUL_OFF) || ((RK_SUPPORT_CIF0 && RK_SUPPORT_CIF1) == false)\r
         rk_camera_platform_data.meminfo.name = "camera_ipp_mem";\r
         rk_camera_platform_data.meminfo.start = board_mem_reserve_add("camera_ipp_mem",PMEM_CAMIPP_NECESSARY);\r
         rk_camera_platform_data.meminfo.size= PMEM_CAMIPP_NECESSARY;\r
@@ -958,15 +968,25 @@ static int rk_register_camera_devices(void)
     for (i=0; i<RK_CAM_NUM; i++) {\r
         if (rk_camera_platform_data.register_dev[i].device_info.name) {\r
             if (rk_camera_platform_data.register_dev[i].link_info.bus_id == RK_CAM_PLATFORM_DEV_ID_0) {\r
+            #if RK_SUPPORT_CIF0\r
                 if (!host_registered_0) {\r
                     platform_device_register(&rk_device_camera_host_0);\r
                     host_registered_0 = 1;\r
                 }\r
-            } else if (rk_camera_platform_data.register_dev[i].link_info.bus_id == RK_CAM_PLATFORM_DEV_ID_1) {\r
+            #else\r
+                printk(KERN_ERR "%s(%d) : This chip isn't support CIF0, Please user check ...\n",__FUNCTION__,__LINE__);\r
+            #endif\r
+            } \r
+\r
+            if (rk_camera_platform_data.register_dev[i].link_info.bus_id == RK_CAM_PLATFORM_DEV_ID_1) {\r
+            #if RK_SUPPORT_CIF1\r
                 if (!host_registered_1) {\r
                     platform_device_register(&rk_device_camera_host_1);\r
                     host_registered_1 = 1;\r
                 }\r
+            #else\r
+                printk(KERN_ERR "%s(%d) : This chip isn't support CIF1, Please user check ...\n",__FUNCTION__,__LINE__);\r
+            #endif\r
             } \r
         }\r
     }\r

diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c
index 2a77b42d67d986b9602a397b5701c1e2d5f77988..b77d345e94ce3b3acb3f15e8187ab43b8a6eab75 100755 (executable)
--- a/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@ -9,7 +9,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  */
-#ifdef CONFIG_ARCH_RK30
+#if defined(CONFIG_ARCH_RK2928) || defined(CONFIG_ARCH_RK30) || defined(CONFIG_ARCH_RK31)
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/io.h>
@@ -38,9 +38,16 @@
 #include <media/soc_mediabus.h>
 #include <mach/io.h>
 #include <plat/ipp.h>
+
+#if defined(CONFIG_ARCH_RK30) || defined(CONFIG_ARCH_RK31)
 #include <mach/rk30_camera.h>
 #include <mach/cru.h>
 #include <mach/pmu.h>
+#endif
+
+#if defined(CONFIG_ARCH_RK2928)
+#include <mach/rk2928_camera.h>
+#endif
 
 static int debug ;
 module_param(debug, int, S_IRUGO|S_IWUSR);
@@ -140,6 +147,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define ENABLE_32BIT_BYPASS                (0x01<<6)
 #define DISABLE_32BIT_BYPASS               (0x00<<6)
 
+#if (defined(CONFIG_ARCH_RK30) || defined(CONFIG_ARCH_RK31))
 //CRU,PIXCLOCK
 #define CRU_PCLK_REG30                     0xbc
 #define ENANABLE_INVERT_PCLK_CIF0          ((0x1<<24)|(0x1<<8))
@@ -152,6 +160,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define MASK_RST_CIF1                      (0x01 << 31)
 #define RQUEST_RST_CIF0                    (0x01 << 14)
 #define RQUEST_RST_CIF1                    (0x01 << 15)
+#endif
 
 #define MIN(x,y)   ((x<y) ? x: y)
 #define MAX(x,y)    ((x>y) ? x: y)
@@ -162,9 +171,18 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define read_cif_reg(base,addr) __raw_readl(addr+(base))
 #define mask_cif_reg(addr, msk, val)    write_cif_reg(addr, (val)|((~(msk))&read_cif_reg(addr)))
 
+#if (defined(CONFIG_ARCH_RK30) || defined(CONFIG_ARCH_RK31))
 #define write_cru_reg(addr, val)  __raw_writel(val, addr+RK30_CRU_BASE)
 #define read_cru_reg(addr) __raw_readl(addr+RK30_CRU_BASE)
 #define mask_cru_reg(addr, msk, val)   write_cru_reg(addr,(val)|((~(msk))&read_cru_reg(addr)))
+#endif
+
+#if defined(CONFIG_ARCH_RK2928)
+#define write_cru_reg(addr, val)  
+#define read_cru_reg(addr)                 0 
+#define mask_cru_reg(addr, msk, val)   
+#endif
+
 
 //when work_with_ipp is not enabled,CONFIG_VIDEO_RK29_DIGITALZOOM_IPP_OFF is not defined.something wrong with it
 #ifdef CONFIG_VIDEO_RK29_WORK_IPP//CONFIG_VIDEO_RK29_DIGITALZOOM_IPP_OFF
@@ -940,8 +958,9 @@ static int rk_camera_add_device(struct soc_camera_device *icd)
         goto ebusy;
     }
 
-    RKCAMERA_DG("RK Camera driver attached to %s\n",dev_name(icd->pdev));
-    
+    dev_info(&icd->dev, "RK Camera driver attached to camera%d(%s)\n",
+             icd->devnum,dev_name(icd->pdev));
+
        pcdev->frame_inval = RK_CAM_FRAME_INVAL_INIT;
     pcdev->active = NULL;
     pcdev->icd = NULL;
@@ -1005,7 +1024,8 @@ static void rk_camera_remove_device(struct soc_camera_device *icd)
        mutex_lock(&camera_lock);
     BUG_ON(icd != pcdev->icd);
 
-    RKCAMERA_DG("RK Camera driver detached from %s\n",dev_name(icd->pdev));
+    dev_info(&icd->dev, "RK Camera driver detached from camera%d(%s)\n",
+             icd->devnum,dev_name(icd->pdev));
 
        /* ddl@rock-chips.com: Application will call VIDIOC_STREAMOFF before close device, but
           stream may be turn on again before close device, if suspend and resume happened. */
@@ -1246,26 +1266,29 @@ static void rk_camera_setup_format(struct soc_camera_device *icd, __u32 host_pix
                        cif_fmt_val = YUV_INPUT_ORDER_YUYV(cif_fmt_val);
             break;
     }
-
-    {
-       mdelay(100);
-        if(IS_CIF0()){
-    //         pmu_set_idle_request(IDLE_REQ_VIO, true);
-               cru_set_soft_reset(SOFT_RST_CIF0, true);
-               udelay(5);
-               cru_set_soft_reset(SOFT_RST_CIF0, false);
-    //         pmu_set_idle_request(IDLE_REQ_VIO, false);
-
-        }else{
-    //         pmu_set_idle_request(IDLE_REQ_VIO, true);
-               cru_set_soft_reset(SOFT_RST_CIF1, true);
-               udelay(5);
-               cru_set_soft_reset(SOFT_RST_CIF1, false);
-    //         pmu_set_idle_request(IDLE_REQ_VIO, false);  
+#if 1
+        {
+#ifdef CONFIG_ARCH_RK30
+           mdelay(100);
+            if(IS_CIF0()){
+        //             pmu_set_idle_request(IDLE_REQ_VIO, true);
+                       cru_set_soft_reset(SOFT_RST_CIF0, true);
+                       udelay(5);
+                       cru_set_soft_reset(SOFT_RST_CIF0, false);
+        //             pmu_set_idle_request(IDLE_REQ_VIO, false);
+
+            }else{
+        //             pmu_set_idle_request(IDLE_REQ_VIO, true);
+                       cru_set_soft_reset(SOFT_RST_CIF1, true);
+                       udelay(5);
+                       cru_set_soft_reset(SOFT_RST_CIF1, false);
+        //             pmu_set_idle_request(IDLE_REQ_VIO, false);  
+            }
+#endif
         }
-    }
     write_cif_reg(pcdev->base,CIF_CIF_CTRL,AXI_BURST_16|MODE_ONEFRAME|DISABLE_CAPTURE);   /* ddl@rock-chips.com : vip ahb burst 16 */
     write_cif_reg(pcdev->base,CIF_CIF_INTEN, 0x01|0x200);    //capture complete interrupt enable
+#endif
     write_cif_reg(pcdev->base,CIF_CIF_FOR,cif_fmt_val);         /* ddl@rock-chips.com: VIP capture mode and capture format must be set before FS register set */
 
    // read_cif_reg(pcdev->base,CIF_CIF_INTSTAT);                     /* clear vip interrupte single  */
@@ -2173,7 +2196,9 @@ static int rk_camera_set_ctrl(struct soc_camera_device *icd,
 
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        const struct v4l2_queryctrl *qctrl;
+#ifdef CONFIG_VIDEO_RK29_DIGITALZOOM_IPP_ON    
     struct rk_camera_dev *pcdev = ici->priv;
+#endif
     int ret = 0;
 
        qctrl = rk_camera_soc_camera_find_qctrl(ici->ops, sctrl->id);
@@ -2234,6 +2259,7 @@ static struct soc_camera_host_ops rk_soc_camera_host_ops =
 };
 static void rk_camera_cif_iomux(int cif_index)
 {
+#ifdef CONFIG_ARCH_RK30
     switch(cif_index){
         case 0:
             rk30_mux_api_set(GPIO1B3_CIF0CLKOUT_NAME, GPIO1B_CIF0_CLKOUT);
@@ -2260,6 +2286,8 @@ static void rk_camera_cif_iomux(int cif_index)
         default:
             printk("cif index is erro!!!\n");
         }
+#else
+#endif
                 
             
 }
@@ -2271,9 +2299,18 @@ static int rk_camera_probe(struct platform_device *pdev)
     int irq,i;
     int err = 0;
 
-    RKCAMERA_TR("RK30 Camera driver version: v%d.%d.%d\n",(RK_CAM_VERSION_CODE&0xff0000)>>16,
-        (RK_CAM_VERSION_CODE&0xff00)>>8,RK_CAM_VERSION_CODE&0xff);
+    RKCAMERA_DG("%s(%d) Enter..\n",__FUNCTION__,__LINE__);    
 
+    if ((pdev->id == RK_CAM_PLATFORM_DEV_ID_1) && (RK_SUPPORT_CIF1 == 0)) {
+        RKCAMERA_TR("%s(%d): This chip is not support CIF1!!\n",__FUNCTION__,__LINE__);
+        BUG();
+    }
+
+    if ((pdev->id == RK_CAM_PLATFORM_DEV_ID_0) && (RK_SUPPORT_CIF0 == 0)) {
+        RKCAMERA_TR("%s(%d): This chip is not support CIF0!!\n",__FUNCTION__,__LINE__);
+        BUG();
+    }
+    
     res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
     irq = platform_get_irq(pdev, 0);
     if (!res || irq < 0) {
@@ -2372,7 +2409,7 @@ static int rk_camera_probe(struct platform_device *pdev)
         }
        }
    
-#ifdef CONFIG_VIDEO_RK29_WORK_IPP
+//#ifdef CONFIG_VIDEO_RK29_WORK_IPP
     if(IS_CIF0()) {
        pcdev->camera_wq = create_workqueue("rk_cam_wkque_cif0");
     } else {
@@ -2380,7 +2417,7 @@ static int rk_camera_probe(struct platform_device *pdev)
     }
     if (pcdev->camera_wq == NULL)
        goto exit_free_irq;
-#endif
+//#endif
 
        pcdev->camera_reinit_work.pcdev = pcdev;
        INIT_WORK(&(pcdev->camera_reinit_work.work), rk_camera_reinit_work);