shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera: rockchip: camsys v0.0x21.0xa

Browse Source 
Change-Id: Ic9c5661ba76eaf8aee36e1a1822aa9bcd288e0ac
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
This commit is contained in:
dalon.zhang
2017-03-19 11:50:59 +08:00
committed by Huang, Tao
parent 92f81f9d04
commit df804a00a9
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/rk_camsys/camsys_internal.h
View File

@@ -151,8 +151,10 @@
if process cameraserver was died during streaming, iommu resource
was not released correctly. when cameraserver was recovered and
streaming again, iommu resource may be conflicted.
*v0.0x21.0xa:
1) clock clk_vio0_noc would cause mipi lcdc no display on 3368h, remove it.
*/
#define CAMSYS_DRIVER_VERSION KERNEL_VERSION(0, 0x21, 9)
#define CAMSYS_DRIVER_VERSION KERNEL_VERSION(0, 0x21, 0xa)
#define CAMSYS_PLATFORM_DRV_NAME "RockChip-CamSys"
#define CAMSYS_PLATFORM_MARVIN_NAME "Platform_MarvinDev"

4
drivers/media/video/rk_camsys/camsys_marvin.c Executable file → Normal file
View File

@@ -627,8 +627,6 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
if (CHIP_TYPE == 3368 || CHIP_TYPE == 3366) {
clk_prepare_enable(clk->cif_clk_out);
clk_prepare_enable(clk->pclk_dphyrx);
if (CHIP_TYPE == 3368)
clk_prepare_enable(clk->clk_vio0_noc);
} else {
clk_prepare_enable(clk->clk_mipi_24m);
}
@@ -648,8 +646,6 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
if (CHIP_TYPE == 3368 || CHIP_TYPE == 3366) {
clk_disable_unprepare(clk->cif_clk_out);
clk_disable_unprepare(clk->pclk_dphyrx);
if (CHIP_TYPE == 3368)
clk_disable_unprepare(clk->clk_vio0_noc);
} else {
clk_disable_unprepare(clk->clk_mipi_24m);
}