[COMMON] fimc-is2: support Front2 sensor position(code sync)

 PR JIRA ID: CPR-153

Change-Id: I885b4d5b75f2f4de3ae1561a83e2085bfe7da1d2
Signed-off-by: Jeongtae Park <jtp.park@samsung.com>

diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-ischain.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-ischain.c
index 7c732cc414a230248359504cdd21b45a134e6899..045eba6961195d34509b6a1d51dd65d9375ba60b 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-ischain.c
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-ischain.c
@@ -3845,17 +3845,20 @@ static int fimc_is_ischain_init_wrap(struct fimc_is_device_ischain *device,
                        case SENSOR_POSITION_FRONT:
                                sensor_id = priv->front_sensor_id;
                                break;
-#ifdef CONFIG_SECURE_CAMERA_USE
-                       case SENSOR_POSITION_SECURE:
-                               sensor_id = priv->secure_sensor_id;
-                               break;
-#endif
                        case SENSOR_POSITION_REAR2:
                                sensor_id = priv->rear_second_sensor_id;
                                break;
+                       case SENSOR_POSITION_FRONT2:
+                               sensor_id = priv->front_second_sensor_id;
+                               break;
                        case SENSOR_POSITION_REAR3:
                                sensor_id = priv->rear_third_sensor_id;
                                break;
+#ifdef CONFIG_SECURE_CAMERA_USE
+                       case SENSOR_POSITION_SECURE:
+                               sensor_id = priv->secure_sensor_id;
+                               break;
+#endif
                        default:
                                merr("invalid module position(%d)", device, module->position);
                                ret = -EINVAL;

diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-sensor_v2.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-sensor_v2.c
index eca4eec6d13612f29158265c9ba2e605ca52ea32..e76e98c55a27ad59a34848b173d44cee86f1ec77 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-sensor_v2.c
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-sensor_v2.c
@@ -102,17 +102,20 @@ int fimc_is_search_sensor_module_with_position(struct fimc_is_device_sensor *dev
        case SENSOR_POSITION_FRONT:
                sensor_id = priv->front_sensor_id;
                break;
-#ifdef CONFIG_SECURE_CAMERA_USE
-       case SENSOR_POSITION_SECURE:
-               sensor_id = priv->secure_sensor_id;
-               break;
-#endif
        case SENSOR_POSITION_REAR2:
                sensor_id = priv->rear_second_sensor_id;
                break;
+       case SENSOR_POSITION_FRONT2:
+               sensor_id = priv->front_second_sensor_id;
+               break;
        case SENSOR_POSITION_REAR3:
                sensor_id = priv->rear_third_sensor_id;
                break;
+#ifdef CONFIG_SECURE_CAMERA_USE
+       case SENSOR_POSITION_SECURE:
+               sensor_id = priv->secure_sensor_id;
+               break;
+#endif
 #ifdef CONFIG_VENDER_PSV
        case SENSOR_POSITION_VIRTUAL:
                sensor_id = SENSOR_NAME_VIRTUAL;