diff options
| -rw-r--r-- | drivers/media/platform/exynos5-is/fimc-is-sensor.c | 14 | ||||
| -rw-r--r-- | drivers/media/platform/exynos5-is/fimc-is-sensor.h | 6 |
2 files changed, 16 insertions, 4 deletions
diff --git a/drivers/media/platform/exynos5-is/fimc-is-sensor.c b/drivers/media/platform/exynos5-is/fimc-is-sensor.c index 475f1c3051b..2ad648ef508 100644 --- a/drivers/media/platform/exynos5-is/fimc-is-sensor.c +++ b/drivers/media/platform/exynos5-is/fimc-is-sensor.c @@ -23,16 +23,24 @@ static const struct sensor_drv_data s5k4e5_drvdata = { .setfile_name = "exynos5_s5k4e5_setfile.bin", }; +static const struct sensor_drv_data s5k8b1_drvdata = { + .id = FIMC_IS_SENSOR_ID_S5K8B1, + .open_timeout = S5K8B1_OPEN_TIMEOUT, + .setfile_name = "exynos5_s5k8b1_setfile.bin", +}; + static const struct of_device_id fimc_is_sensor_of_ids[] = { { .compatible = "samsung,s5k6a3", .data = &s5k6a3_drvdata, - }, - { + }, { .compatible = "samsung,s5k4e5", .data = &s5k4e5_drvdata, + }, { + .compatible = "samsung,s5k8b1", + .data = &s5k8b1_drvdata, }, - { } + { /* sentinel */ } }; const struct sensor_drv_data *exynos5_is_sensor_get_drvdata( diff --git a/drivers/media/platform/exynos5-is/fimc-is-sensor.h b/drivers/media/platform/exynos5-is/fimc-is-sensor.h index 0ba57333d0f..06709b85615 100644 --- a/drivers/media/platform/exynos5-is/fimc-is-sensor.h +++ b/drivers/media/platform/exynos5-is/fimc-is-sensor.h @@ -22,15 +22,19 @@ #define S5K4E5_SENSOR_WIDTH 2560 #define S5K4E5_SENSOR_HEIGHT 1920 +#define S5K8B1_OPEN_TIMEOUT 2000 /* ms */ + #define SENSOR_WIDTH_PADDING 16 #define SENSOR_HEIGHT_PADDING 10 enum fimc_is_sensor_id { - FIMC_IS_SENSOR_ID_S5K3H2 = 1, + FIMC_IS_SENSOR_ID_S5K3H2 = 1, FIMC_IS_SENSOR_ID_S5K6A3, FIMC_IS_SENSOR_ID_S5K4E5, FIMC_IS_SENSOR_ID_S5K3H7, FIMC_IS_SENSOR_ID_CUSTOM, + FIMC_IS_SENSOR_ID_S5K6B2 = 7, + FIMC_IS_SENSOR_ID_S5K8B1 = 11, FIMC_IS_SENSOR_ID_END }; |