| From 98c3f0a1b3ef83f6be6b212c970bee795e1a0467 Mon Sep 17 00:00:00 2001 |
| From: Joel Stanley <joel@jms.id.au> |
| Date: Wed, 26 Aug 2020 16:49:16 +0930 |
| Subject: ARM: config: aspeed: Fix selection of media drivers |
| |
| From: Joel Stanley <joel@jms.id.au> |
| |
| commit 98c3f0a1b3ef83f6be6b212c970bee795e1a0467 upstream. |
| |
| 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 b0cd4fb27665). |
| 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: 06b93644f4d1 ("media: Kconfig: add an option to filter in/out platform drivers") |
| Fixes: b0cd4fb27665 ("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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/configs/aspeed_g4_defconfig | 3 ++- |
| arch/arm/configs/aspeed_g5_defconfig | 3 ++- |
| 2 files changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/arch/arm/configs/aspeed_g4_defconfig |
| +++ b/arch/arm/configs/aspeed_g4_defconfig |
| @@ -160,7 +160,8 @@ CONFIG_SENSORS_TMP421=y |
| CONFIG_SENSORS_W83773G=y |
| CONFIG_WATCHDOG_SYSFS=y |
| CONFIG_MEDIA_SUPPORT=y |
| -CONFIG_MEDIA_CAMERA_SUPPORT=y |
| +CONFIG_MEDIA_SUPPORT_FILTER=y |
| +CONFIG_MEDIA_PLATFORM_SUPPORT=y |
| CONFIG_V4L_PLATFORM_DRIVERS=y |
| CONFIG_VIDEO_ASPEED=y |
| CONFIG_DRM=y |
| --- a/arch/arm/configs/aspeed_g5_defconfig |
| +++ b/arch/arm/configs/aspeed_g5_defconfig |
| @@ -175,7 +175,8 @@ CONFIG_SENSORS_TMP421=y |
| CONFIG_SENSORS_W83773G=y |
| CONFIG_WATCHDOG_SYSFS=y |
| CONFIG_MEDIA_SUPPORT=y |
| -CONFIG_MEDIA_CAMERA_SUPPORT=y |
| +CONFIG_MEDIA_SUPPORT_FILTER=y |
| +CONFIG_MEDIA_PLATFORM_SUPPORT=y |
| CONFIG_V4L_PLATFORM_DRIVERS=y |
| CONFIG_VIDEO_ASPEED=y |
| CONFIG_DRM=y |
