github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert commit "camera: rockchip: camsys_drv v0.0x22.3"

Browse Source 
This reverts commit 42d1f377e2.

Reason for revert: affect display when DSI uses TX1/RX1.

Change-Id: I1efeffdc21f9fcc2e53eb79b1af99431a09e23a3
Signed-off-by: Zhang Yunlong <dalon.zhang@rock-chips.com>
This commit is contained in:
Zhang Yunlong 2017-12-05 10:41:21 +08:00 committed by Tao Huang
parent 169c390240
commit a3dc10d1fb
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,9 +178,11 @@
1) enable SYS_STATUS_ISP status set.
*v0.0x22.5:
1) gpio base start from 1000,adapt to it.
*v0.0x22.6:
1) revert v0.0x22.3.
*/
#define CAMSYS_DRIVER_VERSION KERNEL_VERSION(0, 0x22, 5)
#define CAMSYS_DRIVER_VERSION KERNEL_VERSION(0, 0x22, 6)
#define CAMSYS_PLATFORM_DRV_NAME "RockChip-CamSys"
#define CAMSYS_PLATFORM_MARVIN_NAME "Platform_MarvinDev"

2
drivers/media/video/rk_camsys/camsys_soc_rk3288.c
View File

@ -345,8 +345,6 @@ camsys_dev_t *camsys_dev, camsys_soc_cfg_t cfg_cmd, void *cfg_para)
para_int = (unsigned int *)cfg_para;
__raw_writel((((*para_int) & 0x03) << 3)|(0x03 << 3),
(void *)(camsys_dev->rk_grf_base + 0x01d4));
/* TX1/RX1 DPHY switch to RX status */
__raw_writel(0xa000a000, (void *)(camsys_dev->rk_grf_base + 0x027c));
break;
}

2
drivers/media/video/rk_camsys/camsys_soc_rk3399.c
View File

@ -368,8 +368,6 @@ int camsys_rk3399_cfg
para_int = (unsigned int *)cfg_para;
__raw_writel((((*para_int) & 0x03) << 3) | (0x03 << 3),
(void *)(camsys_dev->rk_grf_base + 0x204));
/* TX1/RX1 DPHY switch to RX status */
__raw_writel(0x300020, (void *)(camsys_dev->rk_grf_base + 0x6260));
break;
}