Linux 3.14.25

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / media / platform / exynos4-is / fimc-is.h

diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/exynos4-is/fimc-is.h
index d7db133..61bb012 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is.h
+++ b/drivers/media/platform/exynos4-is/fimc-is.h
@@ -33,8 +33,8 @@
 
 #define FIMC_IS_DRV_NAME               "exynos4-fimc-is"
 
-#define FIMC_IS_FW_FILENAME            "fimc_is_fw.bin"
-#define FIMC_IS_SETFILE_6A3            "setfile.bin"
+#define FIMC_IS_FW_FILENAME            "exynos4_fimc_is_fw.bin"
+#define FIMC_IS_SETFILE_6A3            "exynos4_s5k6a3_setfile.bin"
 
 #define FIMC_IS_FW_LOAD_TIMEOUT                1000 /* ms */
 #define FIMC_IS_POWER_ON_TIMEOUT       1000 /* us */
@@ -225,8 +225,7 @@ struct chain_config {
        struct drc_param        drc;
        struct fd_param         fd;
 
-       unsigned long           p_region_index1;
-       unsigned long           p_region_index2;
+       unsigned long           p_region_index[2];
 };
 
 /**
@@ -302,10 +301,7 @@ static inline void fimc_is_set_param_bit(struct fimc_is *is, int num)
 {
        struct chain_config *cfg = &is->config[is->config_index];
 
-       if (num >= 32)
-               set_bit(num - 32, &cfg->p_region_index2);
-       else
-               set_bit(num, &cfg->p_region_index1);
+       set_bit(num, &cfg->p_region_index[0]);
 }
 
 static inline void fimc_is_set_param_ctrl_cmd(struct fimc_is *is, int cmd)