aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/exynos4-is/fimc-is.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/exynos4-is/fimc-is.h')
-rw-r--r--drivers/media/platform/exynos4-is/fimc-is.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/exynos4-is/fimc-is.h
index 61bb0127e19d..e0be691af2d3 100644
--- a/drivers/media/platform/exynos4-is/fimc-is.h
+++ b/drivers/media/platform/exynos4-is/fimc-is.h
@@ -39,7 +39,7 @@
39#define FIMC_IS_FW_LOAD_TIMEOUT 1000 /* ms */ 39#define FIMC_IS_FW_LOAD_TIMEOUT 1000 /* ms */
40#define FIMC_IS_POWER_ON_TIMEOUT 1000 /* us */ 40#define FIMC_IS_POWER_ON_TIMEOUT 1000 /* us */
41 41
42#define FIMC_IS_SENSOR_NUM 2 42#define FIMC_IS_SENSORS_NUM 2
43 43
44/* Memory definitions */ 44/* Memory definitions */
45#define FIMC_IS_CPU_MEM_SIZE (0xa00000) 45#define FIMC_IS_CPU_MEM_SIZE (0xa00000)
@@ -253,7 +253,7 @@ struct fimc_is {
253 struct firmware *f_w; 253 struct firmware *f_w;
254 254
255 struct fimc_isp isp; 255 struct fimc_isp isp;
256 struct fimc_is_sensor *sensor; 256 struct fimc_is_sensor sensor[FIMC_IS_SENSORS_NUM];
257 struct fimc_is_setfile setfile; 257 struct fimc_is_setfile setfile;
258 258
259 struct vb2_alloc_ctx *alloc_ctx; 259 struct vb2_alloc_ctx *alloc_ctx;
@@ -292,6 +292,11 @@ static inline struct fimc_is *fimc_isp_to_is(struct fimc_isp *isp)
292 return container_of(isp, struct fimc_is, isp); 292 return container_of(isp, struct fimc_is, isp);
293} 293}
294 294
295static inline struct chain_config *__get_curr_is_config(struct fimc_is *is)
296{
297 return &is->config[is->config_index];
298}
299
295static inline void fimc_is_mem_barrier(void) 300static inline void fimc_is_mem_barrier(void)
296{ 301{
297 mb(); 302 mb();