diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/media/video/exynos/fimc-is/fimc-is-param.h | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/media/video/exynos/fimc-is/fimc-is-param.h')
-rw-r--r-- | drivers/media/video/exynos/fimc-is/fimc-is-param.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/media/video/exynos/fimc-is/fimc-is-param.h b/drivers/media/video/exynos/fimc-is/fimc-is-param.h index 9383c4a..b978e16 100644 --- a/drivers/media/video/exynos/fimc-is/fimc-is-param.h +++ b/drivers/media/video/exynos/fimc-is/fimc-is-param.h @@ -14,7 +14,7 @@ #ifndef FIMC_IS_PARAMS_H_ #define FIMC_IS_PARAMS_H_ -#define IS_REGION_VER 122 /* IS REGION VERSION 1.22 */ +#define IS_REGION_VER 124 /* IS REGION VERSION 1.24 */ /* MACROs */ #define IS_SET_PARAM_BIT(dev, num) \ @@ -237,6 +237,8 @@ (dev->is_p_region->parameter.isp.dma1_output.buffer_address = x) #define IS_ISP_SET_PARAM_DMA_OUTPUT1_NODIFY_DMA_DONE(dev, x) \ (dev->is_p_region->parameter.isp.dma1_output.notify_dma_done = x) +#define IS_ISP_SET_PARAM_DMA_OUTPUT1_MASK(dev, x) \ + (dev->is_p_region->parameter.isp.dma1_output.dma_out_mask = x) #define IS_ISP_SET_PARAM_DMA_OUTPUT1_ERR(dev, x) \ (dev->is_p_region->parameter.isp.dma1_output.err = x) @@ -260,6 +262,8 @@ (dev->is_p_region->parameter.isp.dma2_output.buffer_address = x) #define IS_ISP_SET_PARAM_DMA_OUTPUT2_NODIFY_DMA_DONE(dev, x) \ (dev->is_p_region->parameter.isp.dma2_output.notify_dma_done = x) +#define IS_ISP_SET_PARAM_DMA_OUTPUT2_MASK(dev, x) \ + (dev->is_p_region->parameter.isp.dma2_output.dma_out_mask = x) #define IS_ISP_SET_PARAM_DMA_OUTPUT2_ERR(dev, x) \ (dev->is_p_region->parameter.isp.dma2_output.err = x) @@ -1228,7 +1232,8 @@ struct param_dma_output { u32 buffer_number; u32 buffer_address; u32 notify_dma_done; - u32 reserved[PARAMETER_MAX_MEMBER-11]; + u32 dma_out_mask; + u32 reserved[PARAMETER_MAX_MEMBER-12]; u32 err; }; @@ -1697,5 +1702,8 @@ struct sensor_open_extended { u32 fast_open_sensor; /* Activatiing sensor self calibration mode (6A3) */ u32 self_calibration_mode; + /* This field is to adjust I2c clock based on ACLK200 */ + /* This value is varied in case of rev 0.2 */ + u32 i2c_sclk; }; #endif |