mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 18:41:23 +00:00
[media] s5p-mfc: Move INIT_BUFFER_OPTIONS from v7 to v6
The register S5P_FIMV_D_INIT_BUFFER_OPTIONS holds good for v6 firmware too. So moving the definition from v7 regs to v6. Signed-off-by: Arun Kumar K <arun.kk@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
parent
bf458746b2
commit
1c6f33acd3
@ -141,6 +141,7 @@
|
||||
#define S5P_FIMV_D_SLICE_IF_ENABLE_V6 0xf4c4
|
||||
#define S5P_FIMV_D_PICTURE_TAG_V6 0xf4c8
|
||||
#define S5P_FIMV_D_STREAM_DATA_SIZE_V6 0xf4d0
|
||||
#define S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6 0xf47c
|
||||
|
||||
/* Display information register */
|
||||
#define S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V6 0xf500
|
||||
|
@ -18,8 +18,6 @@
|
||||
#define S5P_FIMV_CODEC_VP8_ENC_V7 25
|
||||
|
||||
/* Additional registers for v7 */
|
||||
#define S5P_FIMV_D_INIT_BUFFER_OPTIONS_V7 0xf47c
|
||||
|
||||
#define S5P_FIMV_E_SOURCE_FIRST_ADDR_V7 0xf9e0
|
||||
#define S5P_FIMV_E_SOURCE_SECOND_ADDR_V7 0xf9e4
|
||||
#define S5P_FIMV_E_SOURCE_THIRD_ADDR_V7 0xf9e8
|
||||
|
@ -1310,7 +1310,7 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
|
||||
reg |= (0x1 << S5P_FIMV_D_OPT_TILE_MODE_SHIFT_V6);
|
||||
|
||||
if (IS_MFCV7(dev))
|
||||
WRITEL(reg, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V7);
|
||||
WRITEL(reg, S5P_FIMV_D_INIT_BUFFER_OPTIONS_V6);
|
||||
else
|
||||
WRITEL(reg, S5P_FIMV_D_DEC_OPTIONS_V6);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user