Commit 46d2a3b9 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: place CEC menu before MEDIA_SUPPORT



The only item that opens at the CEC Kconfig menu is related
to Remote Controller. Also, its support should not depend on
media support, so it makes sense to keep both RC and CEC together.

After this change, the main media menus that are visible
under "Device Drivers" menu are:

	<*> Remote Controller support  --->
	[ ] HDMI CEC RC integration (NEW)
	< > HDMI CEC drivers
	<M> Multimedia support  --->

Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent de73b88c
Loading
Loading
Loading
Loading
+2 −28
Original line number Diff line number Diff line
@@ -4,19 +4,10 @@
#

#
# NOTE: Those symbols can't depend on MEDIA_SUPPORT, as it would cause
# unmatched dependencies
# NOTE: CEC and Remote Controller support should not depend on MEDIA_SUPPORT
#
config CEC_CORE
	tristate

config CEC_NOTIFIER
	bool

config CEC_PIN
	bool

source "drivers/media/rc/Kconfig"
source "drivers/media/cec/Kconfig"

menuconfig MEDIA_SUPPORT
	tristate "Multimedia support"
@@ -132,17 +123,6 @@ config MEDIA_SDR_SUPPORT

	  Say Y when you have a software defined radio device.

config MEDIA_CEC_SUPPORT
	bool
	prompt "HDMI CEC support" if MEDIA_SUPPORT_FILTER
	default y if !MEDIA_SUPPORT_FILTER
	help
	  Enable support for HDMI CEC (Consumer Electronics Control),
	  which is an optional HDMI feature.

	  Say Y when you have an HDMI receiver, transmitter or a USB CEC
	  adapter that supports HDMI CEC.

config MEDIA_PLATFORM_SUPPORT
	bool
	prompt "Platform-specific devices" if MEDIA_SUPPORT_FILTER
@@ -232,12 +212,6 @@ menu "Digital TV options"
source "drivers/media/dvb-core/Kconfig"
endmenu

menu "HDMI CEC options"
	visible if CEC_CORE

source "drivers/media/cec/Kconfig"
endmenu

menu "Media drivers"

comment "Drivers filtered as selected at 'Filter media drivers'"
+20 −0
Original line number Diff line number Diff line
# 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
@@ -11,3 +20,14 @@ config CEC_PIN_ERROR_INJ
	depends on CEC_PIN && DEBUG_FS
	help
	  This option enables CEC error injection using debugfs.

config MEDIA_CEC_SUPPORT
	bool
	prompt "HDMI CEC drivers"
	default y if !MEDIA_SUPPORT_FILTER
	help
	  Enable support for HDMI CEC (Consumer Electronics Control),
	  which is an optional HDMI feature.

	  Say Y when you have an HDMI receiver, transmitter or a USB CEC
	  adapter that supports HDMI CEC.