From: Eunyoung Lee Date: Wed, 23 May 2018 06:22:08 +0000 (+0900) Subject: [9610] fimc-is2: Added new enum for Bayer+, Bayer_compressor and MONO X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eafe2fcbc6a7db91809bc4c052bf3127d832bc9d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [9610] fimc-is2: Added new enum for Bayer+, Bayer_compressor and MONO Change-Id: I43905332b705439d3c82506509f93e568202709c Signed-off-by: Eunyoung Lee --- diff --git a/drivers/media/platform/exynos/fimc-is2/ischain/fimc-is-v6_10_0/fimc-is-param.h b/drivers/media/platform/exynos/fimc-is2/ischain/fimc-is-v6_10_0/fimc-is-param.h index e8ce959dbe62..ca48bc66a717 100644 --- a/drivers/media/platform/exynos/fimc-is2/ischain/fimc-is-v6_10_0/fimc-is-param.h +++ b/drivers/media/platform/exynos/fimc-is2/ischain/fimc-is-v6_10_0/fimc-is-param.h @@ -61,6 +61,8 @@ enum is_param { PARAM_3AA_OTF_OUTPUT, PARAM_3AA_VDMA4_OUTPUT, PARAM_3AA_VDMA2_OUTPUT, + PARAM_3AA_FDDMA_OUTPUT, + PARAM_3AA_MRGDMA_OUTPUT, PARAM_3AA_DDMA_OUTPUT, PARAM_ISP_CONTROL, PARAM_ISP_OTF_INPUT, @@ -130,8 +132,9 @@ enum otf_input_format { OTF_INPUT_FORMAT_YUV444 = 1, /* 3 Channel */ OTF_INPUT_FORMAT_YUV422 = 2, /* 3 Channel */ OTF_INPUT_FORMAT_YUV420 = 3, /* 3 Channel */ - OTF_INPUT_FORMAT_STRGEN_COLORBAR_BAYER = 10, - OTF_INPUT_FORMAT_BAYER_DMA = 11, + OTF_INPUT_FORMAT_Y = 7, + OTF_INPUT_FORMAT_BAYER_PLUS = 10, + OTF_INPUT_FORMAT_BAYER_COMP = 11, }; enum otf_input_bitwidth { @@ -164,7 +167,7 @@ enum dma_input_command { DMA_INPUT_COMMAND_ENABLE = 1, }; -enum dma_inut_format { +enum dma_input_format { DMA_INPUT_FORMAT_BAYER = 0, DMA_INPUT_FORMAT_YUV444 = 1, DMA_INPUT_FORMAT_YUV422 = 2, @@ -173,6 +176,8 @@ enum dma_inut_format { DMA_INPUT_FORMAT_BAYER_PACKED = 5, DMA_INPUT_FORMAT_YUV422_CHUNKER = 6, DMA_INPUT_FORMAT_Y = 7, + DMA_INPUT_FORMAT_BAYER_PLUS = 10, + DMA_INPUT_FORMAT_BAYER_COMP = 11, }; enum dma_input_bitwidth { @@ -242,7 +247,10 @@ enum otf_output_format { OTF_OUTPUT_FORMAT_YUV420 = 3, OTF_OUTPUT_FORMAT_RGB = 4, OTF_OUTPUT_FORMAT_YUV444_TRUNCATED = 5, - OTF_OUTPUT_FORMAT_YUV422_TRUNCATED = 6 + OTF_OUTPUT_FORMAT_YUV422_TRUNCATED = 6, + OTF_OUTPUT_FORMAT_Y = 9, + OTF_OUTPUT_FORMAT_BAYER_PLUS = 10, + OTF_OUTPUT_FORMAT_BAYER_COMP = 11, }; enum otf_output_bitwidth { @@ -279,7 +287,9 @@ enum dma_output_format { DMA_OUTPUT_FORMAT_YUV422_CHUNKER = 6, DMA_OUTPUT_FORMAT_YUV444_TRUNCATED = 7, DMA_OUTPUT_FORMAT_YUV422_TRUNCATED = 8, - DMA_OUTPUT_FORMAT_Y = 9 + DMA_OUTPUT_FORMAT_Y = 9, + DMA_OUTPUT_FORMAT_BAYER_PLUS = 10, + DMA_OUTPUT_FORMAT_BAYER_COMP = 11, }; enum dma_output_bitwidth {