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: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index e8bd354a0f754d963411f9c1bab3300c4ab9e959..8694e3c6d1833edc5e0c8141c4df9a9c4b858c59 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -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'"

diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig
index c01919713ab956cbab98cddb91604a4b7f62aaa9..1586dd899302f74ba05e8d287d07e2e57b70c986 100644 (file)
--- a/drivers/media/cec/Kconfig
+++ b/drivers/media/cec/Kconfig
@@ -1,4 +1,13 @@
 # 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.