Merge tag lsk-v3.10-15.03-android

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / rk_camsys / camsys_marvin.h

diff --git a/drivers/media/video/rk_camsys/camsys_marvin.h b/drivers/media/video/rk_camsys/camsys_marvin.h
index dfdd0dbd40f8bcaec97a78fb66280a01fc06dd17..1c70febf8666e779345cbe53dd3d33a1df139b33 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_marvin.h
+++ b/drivers/media/video/rk_camsys/camsys_marvin.h
@@ -17,10 +17,31 @@
 #define MRV_MIPI_ICR                            (MRV_MIPI_BASE+0x14)
 
 #define MRV_MI_BASE                             (0x1400)
+
+#define MRV_MI_MP_Y_OFFS_CNT_START                   (MRV_MI_BASE+0x14)
+#define MRV_MI_INIT                   (MRV_MI_BASE+0x4)
+#define MRV_MI_MP_Y_BASE_AD                   (MRV_MI_BASE+0x8)
+#define MRV_MI_Y_BASE_AD_SHD                   (MRV_MI_BASE+0x78)
+#define MRV_MI_Y_OFFS_CNT_SHD                   (MRV_MI_BASE+0x80)
+#define MRV_MI_IMIS                              (MRV_MI_BASE+0xf8)
+#define MRV_MI_RIS                              (MRV_MI_BASE+0xfc)
 #define MRV_MI_MIS                              (MRV_MI_BASE+0x100)
 #define MRV_MI_ICR                              (MRV_MI_BASE+0x104)
 
+#define MRV_FLASH_CONFIG                        (0x664)
+
+#define MRV_JPG_BASE                             (0x1800)
+#define MRV_JPG_ERR_RIS                          (MRV_JPG_BASE+0x6C)
+#define MRV_JPG_ERR_MIS                          (MRV_JPG_BASE+0x70)
+#define MRV_JPG_ERR_ICR                          (MRV_JPG_BASE+0x74)
+#define MRV_JPG_MIS                              (MRV_JPG_BASE+0x84)
+#define MRV_JPG_RIS                              (MRV_JPG_BASE+0x80)
+#define MRV_JPG_ICR                              (MRV_JPG_BASE+0x88)
 
+typedef enum IO_USE_TYPE_e{
+    USE_AS_GPIO,
+    USE_AS_ISP_INTERNAL,
+}IO_USE_TYPE_t;
 
 typedef struct camsys_mrv_clk_s {
     struct clk      *pd_isp;
@@ -33,9 +54,12 @@ typedef struct camsys_mrv_clk_s {
     bool             in_on;
 
     struct clk      *cif_clk_out;
+    struct clk      *cif_clk_pll;
+       struct clk              *pclk_dphyrx;
+       
     unsigned int     out_on;
 
-    spinlock_t       lock;
+    struct mutex     lock;
 } camsys_mrv_clk_t;
 
 int camsys_mrv_probe_cb(struct platform_device *pdev, camsys_dev_t *camsys_dev);