aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/s5p-fimc/fimc-reg.c4
-rw-r--r--drivers/media/video/s5p-fimc/regs-fimc.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c
index 8e5a0bbae580..10684aef5b2d 100644
--- a/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/drivers/media/video/s5p-fimc/fimc-reg.c
@@ -437,7 +437,9 @@ void fimc_hw_set_in_dma(struct fimc_ctx *ctx)
437 | S5P_MSCTRL_C_INT_IN_MASK 437 | S5P_MSCTRL_C_INT_IN_MASK
438 | S5P_MSCTRL_2P_IN_ORDER_MASK); 438 | S5P_MSCTRL_2P_IN_ORDER_MASK);
439 439
440 cfg |= S5P_MSCTRL_IN_BURST_COUNT(4) | S5P_MSCTRL_INPUT_MEMORY; 440 cfg |= (S5P_MSCTRL_IN_BURST_COUNT(4)
441 | S5P_MSCTRL_INPUT_MEMORY
442 | S5P_MSCTRL_FIFO_CTRL_FULL);
441 443
442 switch (frame->fmt->color) { 444 switch (frame->fmt->color) {
443 case S5P_FIMC_RGB565...S5P_FIMC_RGB888: 445 case S5P_FIMC_RGB565...S5P_FIMC_RGB888:
diff --git a/drivers/media/video/s5p-fimc/regs-fimc.h b/drivers/media/video/s5p-fimc/regs-fimc.h
index 04669a54a3c2..0fea3e635d76 100644
--- a/drivers/media/video/s5p-fimc/regs-fimc.h
+++ b/drivers/media/video/s5p-fimc/regs-fimc.h
@@ -226,6 +226,7 @@
226#define S5P_MSCTRL_FLIP_X_MIRROR (1 << 13) 226#define S5P_MSCTRL_FLIP_X_MIRROR (1 << 13)
227#define S5P_MSCTRL_FLIP_Y_MIRROR (2 << 13) 227#define S5P_MSCTRL_FLIP_Y_MIRROR (2 << 13)
228#define S5P_MSCTRL_FLIP_180 (3 << 13) 228#define S5P_MSCTRL_FLIP_180 (3 << 13)
229#define S5P_MSCTRL_FIFO_CTRL_FULL (1 << 12)
229#define S5P_MSCTRL_ORDER422_SHIFT 4 230#define S5P_MSCTRL_ORDER422_SHIFT 4
230#define S5P_MSCTRL_ORDER422_YCBYCR (0 << 4) 231#define S5P_MSCTRL_ORDER422_YCBYCR (0 << 4)
231#define S5P_MSCTRL_ORDER422_CBYCRY (1 << 4) 232#define S5P_MSCTRL_ORDER422_CBYCRY (1 << 4)