[COMMON] fimc-is2: fixed mcsc_v410 compile error after LT sync.
authorEunyoung Lee <ey470.lee@samsung.com>
Wed, 7 Mar 2018 04:22:41 +0000 (13:22 +0900)
committerEunyoung Lee <ey470.lee@samsung.com>
Tue, 19 Jun 2018 08:43:30 +0000 (17:43 +0900)
Change-Id: I1dda9bb59889ad57d5492871fdf7ff7eea4e69c9
Signed-off-by: Eunyoung Lee <ey470.lee@samsung.com>
drivers/media/platform/exynos/fimc-is2/hardware/api/fimc-is-hw-api-mcscaler-v410.c

index 5db70110ee5d00d766cbe69085f02e924df1636f..8824955a0a84815c2081a9c697b911cdc4d6367a 100644 (file)
@@ -849,7 +849,11 @@ void fimc_is_scaler_set_poly_scaler_v_coef(void __iomem *base_addr, u32 output_i
        }
 }
 
-void fimc_is_scaler_set_poly_scaler_coef(void __iomem *base_addr, u32 output_id, u32 hratio, u32 vratio)
+void fimc_is_scaler_set_poly_scaler_coef(void __iomem *base_addr,
+       u32 output_id,
+       u32 hratio,
+       u32 vratio,
+       enum exynos_sensor_position sensor_position)
 {
        u32 h_coef = 0;
        u32 v_coef = 0;
@@ -3796,17 +3800,21 @@ void fimc_is_scaler_set_ds_enable(void __iomem *base_addr, u32 ds_enable)
        fimc_is_hw_set_field(base_addr, &mcsc_regs[MCSC_R_DS_CTRL], &mcsc_fields[MCSC_F_DS_ENABLE], ds_enable);
 }
 
-void fimc_is_scaler_set_ds_src_size(void __iomem *base_addr, u32 width, u32 height)
+void fimc_is_scaler_set_ds_img_size(void __iomem *base_addr, u32 width, u32 height)
 {
        u32 reg_value = 0;
 
        reg_value = fimc_is_hw_set_field_value(reg_value, &mcsc_fields[MCSC_F_DS_IMG_HSIZE], width);
        reg_value = fimc_is_hw_set_field_value(reg_value, &mcsc_fields[MCSC_F_DS_IMG_VSIZE], height);
        fimc_is_hw_set_reg(base_addr, &mcsc_regs[MCSC_R_DS_IMG_SIZE], reg_value);
+}
 
-       reg_value = 0;
-       reg_value = fimc_is_hw_set_field_value(reg_value, &mcsc_fields[MCSC_F_DS_CROP_POS_H], 0);
-       reg_value = fimc_is_hw_set_field_value(reg_value, &mcsc_fields[MCSC_F_DS_CROP_POS_V], 0);
+void fimc_is_scaler_set_ds_src_size(void __iomem *base_addr, u32 width, u32 height, u32 x_pos, u32 y_pos)
+{
+       u32 reg_value = 0;
+
+       reg_value = fimc_is_hw_set_field_value(reg_value, &mcsc_fields[MCSC_F_DS_CROP_POS_H], x_pos);
+       reg_value = fimc_is_hw_set_field_value(reg_value, &mcsc_fields[MCSC_F_DS_CROP_POS_V], y_pos);
        fimc_is_hw_set_reg(base_addr, &mcsc_regs[MCSC_R_DS_CROP_POS], reg_value);
 
        reg_value = 0;