diff options
| author | Artur Weber <aweber.kernel@gmail.com> | 2023-05-19 19:28:53 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-05-26 10:56:54 +0100 |
| commit | bd947783a2177f9083c4bde5b9db45df2d5adc8b (patch) | |
| tree | e60d2725f6610bd079be26b05b07bec7056d3658 /drivers/media | |
| parent | 645dec333f5f9451ea0f888a8dd9ececa7300424 (diff) | |
| download | linux-stable-bd947783a2177f9083c4bde5b9db45df2d5adc8b.tar.gz linux-stable-bd947783a2177f9083c4bde5b9db45df2d5adc8b.tar.bz2 linux-stable-bd947783a2177f9083c4bde5b9db45df2d5adc8b.zip | |
media: Revert "media: exynos4-is: Remove dependency on obsolete SoC support"
Support for the Exynos4212 SoC was originally dropped as there were
no boards using it. We will be adding a device that uses it, so add
it back.
This reverts commit 2d41a0c9ae51ac363d107f2510022106e7234b33.
Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/samsung/exynos4-is/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/platform/samsung/exynos4-is/fimc-core.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/samsung/exynos4-is/fimc-lite.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/samsung/exynos4-is/Kconfig b/drivers/media/platform/samsung/exynos4-is/Kconfig index da33faa7132e..7f9ba053dd8e 100644 --- a/drivers/media/platform/samsung/exynos4-is/Kconfig +++ b/drivers/media/platform/samsung/exynos4-is/Kconfig @@ -47,7 +47,7 @@ config VIDEO_S5P_MIPI_CSIS config VIDEO_EXYNOS_FIMC_LITE tristate "EXYNOS FIMC-LITE camera interface driver" depends on I2C - depends on SOC_EXYNOS4412 || SOC_EXYNOS5250 || COMPILE_TEST + depends on SOC_EXYNOS4212 || SOC_EXYNOS4412 || SOC_EXYNOS5250 || COMPILE_TEST depends on HAS_DMA select VIDEOBUF2_DMA_CONTIG select VIDEO_EXYNOS4_IS_COMMON diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-core.c b/drivers/media/platform/samsung/exynos4-is/fimc-core.c index a2034ade8b9e..976b4f747ad4 100644 --- a/drivers/media/platform/samsung/exynos4-is/fimc-core.c +++ b/drivers/media/platform/samsung/exynos4-is/fimc-core.c @@ -1128,7 +1128,7 @@ static const struct fimc_drvdata fimc_drvdata_exynos4210 = { .out_buf_count = 32, }; -/* EXYNOS4412 */ +/* EXYNOS4212, EXYNOS4412 */ static const struct fimc_drvdata fimc_drvdata_exynos4x12 = { .num_entities = 4, .lclk_frequency = 166000000UL, diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-lite.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c index 24b3dda26714..c3146ae08447 100644 --- a/drivers/media/platform/samsung/exynos4-is/fimc-lite.c +++ b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c @@ -1621,7 +1621,7 @@ static const struct dev_pm_ops fimc_lite_pm_ops = { NULL) }; -/* EXYNOS4412 */ +/* EXYNOS4212, EXYNOS4412 */ static struct flite_drvdata fimc_lite_drvdata_exynos4 = { .max_width = 8192, .max_height = 8192, |