camera: rockchip: camsys driver 0.0x21.4

Change-Id: Ieddb355952150d170ee52a5d80d25c9642a2ec8a
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index 318cc9ff600c2c1c59b2f6dc23e2758163ba0832..6d0c891b19331925c329c87df2cb0afd1e363f45 100644 (file)
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -136,8 +136,10 @@
                1) support rk3399.
 *v0.0x21.3:
                1) some modifications.
+*v0.0x21.4:
+               1) modify for rk3399.
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0, 0x21, 3)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0, 0x21, 4)
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"
 #define CAMSYS_PLATFORM_MARVIN_NAME             "Platform_MarvinDev"

diff --git a/drivers/media/video/rk_camsys/camsys_marvin.c b/drivers/media/video/rk_camsys/camsys_marvin.c
index 8373a951c89b40ce598a88e4132db14b1da96c7e..93abc28ba952467e24e5d9226a0bb1dd4895e615 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_marvin.c
+++ b/drivers/media/video/rk_camsys/camsys_marvin.c
@@ -198,7 +198,7 @@ static int camsys_mrv_flash_trigger_cb(void *ptr, int mode, unsigned int on)
                                }
                        }
                }
-       } else{
+       } else {
                strcpy(state_str, "isp_flash_as_trigger_out");
                pinctrl = devm_pinctrl_get(dev);
                if (IS_ERR(pinctrl)) {
@@ -281,7 +281,7 @@ static int camsys_mrv_iommu_cb(void *ptr, camsys_sysctrl_t *devctl)
                iommu_dev =
                        rockchip_get_sysmmu_device_by_compatible
                                (ISP1_IOMMU_COMPATIBLE_NAME);
-       } else{
+       } else {
                if (CHIP_TYPE == 3399) {
                        iommu_dev =
                                rockchip_get_sysmmu_device_by_compatible
@@ -331,7 +331,7 @@ static int camsys_mrv_iommu_cb(void *ptr, camsys_sysctrl_t *devctl)
                ret = rockchip_iovmm_activate(dev);
                ret = ion_map_iommu(dev, client, handle,
                        &(iommu->linear_addr), &(iommu->len));
-       } else{
+       } else {
                ion_unmap_iommu(dev, client, handle);
                platform_set_sysmmu(iommu_dev, dev);
                rockchip_iovmm_deactivate(dev);
@@ -372,7 +372,7 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
                        if (on == 1)
                                isp_clk = 210000000;
                        else
-                               isp_clk = 210000000;
+                               isp_clk = 420000000;
 
                        if (strstr(camsys_dev->miscdev.name,
                                "camsys_marvin1")) {
@@ -389,7 +389,7 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
 
                                clk_prepare_enable(clk->pclkin_isp);
                                clk_prepare_enable(clk->cif_clk_out);
-                       } else{
+                       } else {
                                clk_set_rate(clk->clk_isp0, isp_clk);
                                clk_prepare_enable(clk->hclk_isp0_noc);
                                clk_prepare_enable(clk->hclk_isp0_wrapper);
@@ -401,9 +401,6 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
                                clk_prepare_enable(clk->pclk_dphy_ref);
                        }
 
-               clk_set_rate(clk->clk_isp0, isp_clk);
-               clk_set_rate(clk->clk_isp1, isp_clk);
-
                clk->in_on = true;
 
                camsys_trace(1, "%s clock(f: %ld Hz) in turn on",
@@ -425,7 +422,7 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
                                clk_disable_unprepare(clk->pclk_dphy_ref);
 
                                clk_disable_unprepare(clk->pclkin_isp);
-                       } else{
+                       } else {
                                clk_disable_unprepare(clk->hclk_isp0_noc);
                                clk_disable_unprepare(clk->hclk_isp0_wrapper);
                                clk_disable_unprepare(clk->aclk_isp0_noc);
@@ -465,7 +462,7 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
                        clk_prepare_enable(clk->pclk_dphyrx);
                        if (CHIP_TYPE == 3368)
                                clk_prepare_enable(clk->clk_vio0_noc);
-               } else{
+               } else {
                        clk_prepare_enable(clk->clk_mipi_24m);
                }
                        clk->in_on = true;
@@ -486,7 +483,7 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
                        clk_disable_unprepare(clk->pclk_dphyrx);
                        if (CHIP_TYPE == 3368)
                                clk_disable_unprepare(clk->clk_vio0_noc);
-               } else{
+               } else {
                        clk_disable_unprepare(clk->clk_mipi_24m);
                }
                /* clk_disable_unprepare(clk->pd_isp); */
@@ -831,9 +828,7 @@ int camsys_mrv_probe_cb(struct platform_device *pdev, camsys_dev_t *camsys_dev)
                                devm_clk_get(&pdev->dev, "pclk_isp1");
                        mrv_clk->pclk_dphytxrx     =
                                devm_clk_get(&pdev->dev, "pclk_dphytxrx");
-               }
-               else
-               {
+               } else{
                        mrv_clk->hclk_isp0_noc     =
                                devm_clk_get(&pdev->dev, "hclk_isp0_noc");
                        mrv_clk->hclk_isp0_wrapper =
@@ -868,9 +863,7 @@ int camsys_mrv_probe_cb(struct platform_device *pdev, camsys_dev_t *camsys_dev)
                                err = -EINVAL;
                                goto clk_failed;
                        }
-               }
-               else
-               {
+               } else{
                        if (IS_ERR_OR_NULL(mrv_clk->hclk_isp0_noc)       ||
                                IS_ERR_OR_NULL(mrv_clk->hclk_isp0_wrapper)   ||
                                IS_ERR_OR_NULL(mrv_clk->aclk_isp0_noc)       ||
@@ -885,7 +878,6 @@ int camsys_mrv_probe_cb(struct platform_device *pdev, camsys_dev_t *camsys_dev)
                                goto clk_failed;
                        }
                }
-       clk_set_rate(mrv_clk->clk_isp0, 210000000);
        } else{
                mrv_clk->pd_isp           =
                        devm_clk_get(&pdev->dev, "pd_isp");

diff --git a/drivers/media/video/rk_camsys/camsys_soc_rk3399.c b/drivers/media/video/rk_camsys/camsys_soc_rk3399.c
index 856b9e8bbd3523e3778b0eac9ff1e0ab55743f55..a0d0a936d46de6990b2ab2c7be7872c8c836d7c3 100644 (file)
--- a/drivers/media/video/rk_camsys/camsys_soc_rk3399.c
+++ b/drivers/media/video/rk_camsys/camsys_soc_rk3399.c
@@ -305,11 +305,9 @@ static int camsys_rk3399_mipihpy_cfg
                        write_dsihost_reg(DSIHOST_PHY_TEST_CTRL0, 0x00000002);
                        /*TESTEN =0*/
                        write_dsihost_reg(DSIHOST_PHY_TEST_CTRL1, 0x00000000);
-                       /*SHUTDOWNZ=1*/
-                       write_dsihost_reg(DSIHOST_PHY_SHUTDOWNZ, 0x00000001);
+                       /*SHUTDOWNZ=1*//*RSTZ=1*/
                        /*__raw_writel(0x60f00, (void*)(0x1c00+vir_base));*/
-                       /*RSTZ=1*/
-                       write_dsihost_reg(DSIHOST_DPHY_RSTZ, 0x00000001);
+                       write_dsihost_reg(DSIHOST_DPHY_RSTZ, 0x00000002);
                }
 
        } else {

diff --git a/drivers/media/video/rk_camsys/camsys_soc_rk3399.h b/drivers/media/video/rk_camsys/camsys_soc_rk3399.h
index cb7c28a4c385bdc74a395260e6852e8940fb490e..af246a8873a50127c56014aaeff35361a9eb77cd 100644 (file)
--- a/drivers/media/video/rk_camsys/camsys_soc_rk3399.h
+++ b/drivers/media/video/rk_camsys/camsys_soc_rk3399.h
@@ -19,6 +19,7 @@
 */
 
 #define GRF_SOC_STATUS21                  (0x2D4)
+#define GRF_SOC_STATUS1                   (0x0e2a4)
 
 #define CSIHOST_PHY_TEST_CTRL0            (0x30)
 #define CSIHOST_PHY_TEST_CTRL1            (0x34)