Skip to content

Commit 98c3f0a

Browse files
committed
ARM: config: aspeed: Fix selection of media drivers
In the 5.7 merge window the media kconfig was restructued. For most platforms these changes set CONFIG_MEDIA_SUPPORT_FILTER=y which keeps unwanted drivers disabled. The exception is if a config sets EMBEDDED or EXPERT (see b0cd4fb). In that case the filter is set to =n, causing a bunch of DVB tuner drivers (MEDIA_TUNER_*) to be accidentally enabled. This was noticed as it blew out the build time for the Aspeed defconfigs. Enabling the filter means the Aspeed config also needs to set CONFIG_MEDIA_PLATFORM_SUPPORT=y in order to have the CONFIG_VIDEO_ASPEED driver enabled. Fixes: 06b9364 ("media: Kconfig: add an option to filter in/out platform drivers") Fixes: b0cd4fb ("media: Kconfig: on !EMBEDDED && !EXPERT, enable driver filtering") Signed-off-by: Joel Stanley <joel@jms.id.au> Cc: stable@vger.kernel.org CC: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
1 parent 9123e3a commit 98c3f0a

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

arch/arm/configs/aspeed_g4_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ CONFIG_SENSORS_TMP421=y
160160
CONFIG_SENSORS_W83773G=y
161161
CONFIG_WATCHDOG_SYSFS=y
162162
CONFIG_MEDIA_SUPPORT=y
163-
CONFIG_MEDIA_CAMERA_SUPPORT=y
163+
CONFIG_MEDIA_SUPPORT_FILTER=y
164+
CONFIG_MEDIA_PLATFORM_SUPPORT=y
164165
CONFIG_V4L_PLATFORM_DRIVERS=y
165166
CONFIG_VIDEO_ASPEED=y
166167
CONFIG_DRM=y

arch/arm/configs/aspeed_g5_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ CONFIG_SENSORS_TMP421=y
175175
CONFIG_SENSORS_W83773G=y
176176
CONFIG_WATCHDOG_SYSFS=y
177177
CONFIG_MEDIA_SUPPORT=y
178-
CONFIG_MEDIA_CAMERA_SUPPORT=y
178+
CONFIG_MEDIA_SUPPORT_FILTER=y
179+
CONFIG_MEDIA_PLATFORM_SUPPORT=y
179180
CONFIG_V4L_PLATFORM_DRIVERS=y
180181
CONFIG_VIDEO_ASPEED=y
181182
CONFIG_DRM=y

0 commit comments

Comments
 (0)