Merge tag 'lsk-v4.4-17.03-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

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

diff --git a/drivers/media/video/rk_camsys/camsys_mipicsi_phy.h b/drivers/media/video/rk_camsys/camsys_mipicsi_phy.h
index 4c0d64cb1bd73a41b3a67bd6c876b0f3c56f1935..0be00a1c97df27cc5e71ccb9758dfbcec832e760 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_mipicsi_phy.h
+++ b/drivers/media/video/rk_camsys/camsys_mipicsi_phy.h
@@ -3,26 +3,12 @@
 
 #include "camsys_internal.h"
 
-#if defined(CONFIG_ARCH_ROCKCHIP)
-
-#define write_grf_reg(addr, val)           __raw_writel(val, addr+RK_GRF_VIRT)
-#define read_grf_reg(addr)                 __raw_readl(addr+RK_GRF_VIRT)
-#define mask_grf_reg(addr, msk, val)       write_grf_reg(addr,(val)|((~(msk))&read_grf_reg(addr)))
-#else
-#define write_grf_reg(addr, val)  
-#define read_grf_reg(addr)                 0
-#define mask_grf_reg(addr, msk, val)   
-#endif
-
-
 typedef struct camsys_mipiphy_clk_s {
-    struct clk       *pd_mipi_csi;
-    struct clk       *pclk_mipiphy_csi;
-    bool             in_on;
-    spinlock_t       lock;
-} camsys_mipiphy_clk_t;
-
+       struct clk *hclk;
 
-int camsys_mipiphy_probe_cb(struct platform_device *pdev, camsys_dev_t *camsys_dev);
+       unsigned int on;
+} camsys_mipiphy_clk_t;
 
+int camsys_mipiphy_probe_cb
+(struct platform_device *pdev, camsys_dev_t *camsys_dev);
 #endif