summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2020-08-07 12:21:03 +0200
committerKrzysztof Kozlowski <krzk@kernel.org>2020-08-17 17:52:50 +0200
commit68ed226fae9d853900f0fd6025bb776ecf155250 (patch)
tree7d0922a3065fa0458bf1eacb60f9518cde9d1c2e /arch/arm/configs
parent9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 (diff)
downloadlinux-stable-68ed226fae9d853900f0fd6025bb776ecf155250.tar.gz
linux-stable-68ed226fae9d853900f0fd6025bb776ecf155250.tar.bz2
linux-stable-68ed226fae9d853900f0fd6025bb776ecf155250.zip
ARM: exynos_defconfig: enable platform media drivers
Commit 06b93644f4d1 ("media: Kconfig: add an option to filter in/out platform drivers") introduced a dependency of all platform media drivers on the new CONFIG_MEDIA_PLATFORM_SUPPORT symbol, so add it also to exynos_defconfig. While touching this part, update the media related configs to the current layout. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/exynos_defconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 6e8b5ff0859c..cf82c9d23a08 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -191,11 +191,14 @@ CONFIG_REGULATOR_S2MPS11=y
CONFIG_REGULATOR_S5M8767=y
CONFIG_REGULATOR_TPS65090=y
CONFIG_REGULATOR_WM8994=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_SAMSUNG_S5P=m
CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m
CONFIG_V4L_PLATFORM_DRIVERS=y
@@ -210,9 +213,6 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VIDEO_VIVID=m
-CONFIG_CEC_PLATFORM_DRIVERS=y
-CONFIG_CEC_SAMSUNG_S5P=m
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_S5K6A3=m
CONFIG_VIDEO_S5C73M3=m
CONFIG_DRM=y