[COMMON] fimc-is2: add rear3 sensor(code sync)

 PR JIRA ID: CPR-153

Change-Id: Ic8ff33d8d3538e871678e2986c4734746010a591
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 f7d1f6134f6f8c02f54bc914c43c114b0b5e5e14..7c732cc414a230248359504cdd21b45a134e6899 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
@@ -3853,6 +3853,9 @@ static int fimc_is_ischain_init_wrap(struct fimc_is_device_ischain *device,
                        case SENSOR_POSITION_REAR2:
                                sensor_id = priv->rear_second_sensor_id;
                                break;
+                       case SENSOR_POSITION_REAR3:
+                               sensor_id = priv->rear_third_sensor_id;
+                               break;
                        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 8d2dc963f25bc10c392e358dacc46b477a0df884..eca4eec6d13612f29158265c9ba2e605ca52ea32 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
@@ -110,6 +110,9 @@ int fimc_is_search_sensor_module_with_position(struct fimc_is_device_sensor *dev
        case SENSOR_POSITION_REAR2:
                sensor_id = priv->rear_second_sensor_id;
                break;
+       case SENSOR_POSITION_REAR3:
+               sensor_id = priv->rear_third_sensor_id;
+               break;
 #ifdef CONFIG_VENDER_PSV
        case SENSOR_POSITION_VIRTUAL:
                sensor_id = SENSOR_NAME_VIRTUAL;

diff --git a/drivers/media/platform/exynos/fimc-is2/include/exynos-fimc-is-sensor.h b/drivers/media/platform/exynos/fimc-is2/include/exynos-fimc-is-sensor.h
index 4d923650528dc606f6d5b57ed0a41c2b90758c20..63206a1cd7ea0eafe3479b893ef6b0eb4a57d7d3 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/include/exynos-fimc-is-sensor.h
+++ b/drivers/media/platform/exynos/fimc-is2/include/exynos-fimc-is-sensor.h
@@ -13,6 +13,7 @@
 #ifndef MEDIA_EXYNOS_SENSOR_H
 #define MEDIA_EXYNOS_SENSOR_H
 
+#include <dt-bindings/camera/fimc_is.h>
 #include <linux/platform_device.h>
 
 #define FIMC_IS_SENSOR_DEV_NAME "exynos-fimc-is-sensor"
@@ -48,13 +49,14 @@ enum exynos_sensor_channel {
 };
 
 enum exynos_sensor_position {
-       SENSOR_POSITION_REAR    = 0,
-       SENSOR_POSITION_FRONT   = 1,
-       SENSOR_POSITION_REAR2   = 2,
-       SENSOR_POSITION_SECURE  = 3,
-       SENSOR_POSITION_FRONT2  = 4,
+       SENSOR_POSITION_REAR    = SP_REAR,
+       SENSOR_POSITION_FRONT   = SP_FRONT,
+       SENSOR_POSITION_REAR2   = SP_REAR2,
+       SENSOR_POSITION_SECURE  = SP_SECURE,
+       SENSOR_POSITION_FRONT2  = SP_FRONT2,
+       SENSOR_POSITION_REAR3   = SP_REAR3,
 #ifdef CONFIG_VENDER_PSV
-       SENSOR_POSITION_VIRTUAL = 5,
+       SENSOR_POSITION_VIRTUAL = SP_VIRTUAL,
 #endif
        SENSOR_POSITION_END
 };