Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "media: Kconfig: move CEC-specific options to cec/Kconfig"

Browse Source 
The CEC_CORE symbols are selected by DRM, and should be
independent of MEDIA_SUPPORT.

Fixes this warning when doing "make multi_v7_defconfig":

	WARNING: unmet direct dependencies detected for CEC_CORE
	  Depends on [m]: MEDIA_SUPPORT [=m]
	  Selected by [y]:
	  - DRM_TEGRA [=y] && HAS_IOMEM [=y] && (ARCH_TEGRA [=y] || ARM [=y] && COMPILE_TEST [=n]) && COMMON_CLK [=y] && DRM [=y] && OF [=y] && CEC_NOTIFIER [=y]
	  Selected by [m]:
	  - VIDEO_SAMSUNG_S5P_CEC [=m] && MEDIA_SUPPORT [=m] && MEDIA_PLATFORM_SUPPORT [=y] && CEC_PLATFORM_DRIVERS [=y] && (ARCH_EXYNOS [=y] || COMPILE_TEST [=n])
	  - DRM_EXYNOS_HDMI [=y] && HAS_IOMEM [=y] && DRM_EXYNOS [=m] && (DRM_EXYNOS_MIXER [=y] || DRM_EXYNOS5433_DECON [=n]) && CEC_NOTIFIER [=y]
	  - DRM_I2C_ADV7511_CEC [=y] && HAS_IOMEM [=y] && DRM [=y] && DRM_BRIDGE [=y] && DRM_I2C_ADV7511 [=m]
	  - DRM_DW_HDMI [=m] && HAS_IOMEM [=y] && DRM [=y] && DRM_BRIDGE [=y] && CEC_NOTIFIER [=y]

This reverts commit f199141125.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2020-04-15 09:46:06 +02:00
parent 860b511766
commit 9393d050c8
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/Kconfig
View File

@ -3,6 +3,19 @@
# Multimedia device configuration
#
#
# NOTE: Those symbols can't depend on MEDIA_SUPPORT, as it would cause
# unmatched dependencies
#
config CEC_CORE
tristate
config CEC_NOTIFIER
bool
config CEC_PIN
bool
source "drivers/media/rc/Kconfig"
menuconfig MEDIA_SUPPORT

10
drivers/media/cec/Kconfig
View File

@ -1,14 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
config CEC_CORE
tristate
config CEC_NOTIFIER
bool
config CEC_PIN
bool
config MEDIA_CEC_RC
bool "HDMI CEC RC integration"
depends on CEC_CORE && RC_CORE