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

Revert "media: rockchip: isp: raw data dma read/write default to burst16*4"

Browse Source 
This reverts commit dd7a2a2505.

Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Change-Id: I84c189c21d538e94ba403ed84db0ee6fcf971567
This commit is contained in:
Cai YiWei
2021-12-08 11:14:02 +08:00
parent 32f68af611
commit 5b5c996628
2 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/rockchip/isp/hw.c
View File

@@ -758,18 +758,6 @@ static int enable_sys_clk(struct rkisp_hw_dev *dev)
writel(0, dev->base_addr + CIF_ISP_CSI0_MASK1);
writel(0, dev->base_addr + CIF_ISP_CSI0_MASK2);
writel(0, dev->base_addr + CIF_ISP_CSI0_MASK3);
} else if (dev->isp_ver == ISP_V30) {
writel(ISP3X_RAWX_RD_BURST_LEN16 |
ISP3X_RAWX_WR_BURST_LEN16 |
ISP3X_RD_RAWX_GROUP_MODE_X4 |
ISP3X_WR_RAWX_GROUP_MODE_X4,
dev->base_addr + ISP3X_MI_RD_CTRL2);
if (dev->is_unite)
writel(ISP3X_RAWX_RD_BURST_LEN16 |
ISP3X_RAWX_WR_BURST_LEN16 |
ISP3X_RD_RAWX_GROUP_MODE_X4 |
ISP3X_WR_RAWX_GROUP_MODE_X4,
dev->base_next_addr + ISP3X_MI_RD_CTRL2);
}
return 0;

22
drivers/media/platform/rockchip/isp/regs_v3x.h
View File

@@ -1684,28 +1684,6 @@
#define ISP3X_DBR_ST_MODE BIT(30)
#define ISP3X_DBR_ST BIT(31)
/* MI_RD_CTRL2 */
#define ISP3X_RAWX_RD_BURST_LEN_MASK GENMASK(23, 22)
#define ISP3X_RAWX_WR_BURST_LEN_MASK GENMASK(21, 20)
#define ISP3X_RD_RAWX_GROUP_MODE_MASK GENMASK(19, 18)
#define ISP3X_WR_RAWX_GROUP_MODE_MASK GENMASK(17, 16)
#define ISP3X_RAWX_RD_BURST_LEN4 0
#define ISP3X_RAWX_RD_BURST_LEN8 BIT(22)
#define ISP3X_RAWX_RD_BURST_LEN16 BIT(23)
#define ISP3X_RAWX_RD_BURST_LEN2 (0x3 << 22)
#define ISP3X_RAWX_WR_BURST_LEN4 0
#define ISP3X_RAWX_WR_BURST_LEN8 BIT(20)
#define ISP3X_RAWX_WR_BURST_LEN16 BIT(21)
#define ISP3X_RAWX_WR_BURST_LEN2 (0x3 << 20)
#define ISP3X_RD_RAWX_GROUP_MODE_X4 0
#define ISP3X_RD_RAWX_GROUP_MODE_X3 BIT(18)
#define ISP3X_RD_RAWX_GROUP_MODE_X2 BIT(19)
#define ISP3X_RD_RAWX_GROUP_MODE_X1 (0x3 << 18)
#define ISP3X_WR_RAWX_GROUP_MODE_X4 0
#define ISP3X_WR_RAWX_GROUP_MODE_X3 BIT(16)
#define ISP3X_WR_RAWX_GROUP_MODE_X2 BIT(17)
#define ISP3X_WR_RAWX_GROUP_MODE_X1 (0x3 << 16)
/* BP_WR_CTRL */
#define ISP3X_BP_ENABLE BIT(0)
#define ISP3X_BP_AUTO_UPD BIT(1)