korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] cec: select CEC_CORE instead of depend on it

Browse Source 
The CEC framework is used by both drm and media. That makes it tricky
to get the dependencies right.

This patch moves the CEC_CORE and MEDIA_CEC_NOTIFIER config options
out of the media menu and instead drivers that want to use CEC should
select CEC_CORE and MEDIA_CEC_NOTIFIER (if needed).

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Hans Verkuil 2017-05-28 05:48:37 -03:00 committed by Mauro Carvalho Chehab
parent ca33784ba4
commit 9177e51d14
8 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/Kconfig
View File

@ -2,6 +2,12 @@
# Multimedia device configuration
#
config CEC_CORE
tristate
config MEDIA_CEC_NOTIFIER
bool
menuconfig MEDIA_SUPPORT
tristate "Multimedia support"
depends on HAS_IOMEM

4
drivers/media/Makefile
View File

@ -4,8 +4,6 @@
media-objs := media-device.o media-devnode.o media-entity.o
obj-$(CONFIG_CEC_CORE) += cec/
#
# I2C drivers should come before other drivers, otherwise they'll fail
# when compiled as builtin drivers
@ -26,6 +24,8 @@ obj-$(CONFIG_DVB_CORE) += dvb-core/
# There are both core and drivers at RC subtree - merge before drivers
obj-y += rc/
obj-$(CONFIG_CEC_CORE) += cec/
#
# Finally, merge the drivers that require the core
#

8
drivers/media/cec/Kconfig
View File

@ -1,11 +1,3 @@
config CEC_CORE
tristate
depends on MEDIA_CEC_SUPPORT
default y
config MEDIA_CEC_NOTIFIER
bool
config MEDIA_CEC_RC
bool "HDMI CEC RC integration"
depends on CEC_CORE && RC_CORE

9
drivers/media/i2c/Kconfig
View File

@ -220,7 +220,8 @@ config VIDEO_ADV7604
config VIDEO_ADV7604_CEC
bool "Enable Analog Devices ADV7604 CEC support"
depends on VIDEO_ADV7604 && CEC_CORE
depends on VIDEO_ADV7604
select CEC_CORE
---help---
When selected the adv7604 will support the optional
HDMI CEC feature.
@ -240,7 +241,8 @@ config VIDEO_ADV7842
config VIDEO_ADV7842_CEC
bool "Enable Analog Devices ADV7842 CEC support"
depends on VIDEO_ADV7842 && CEC_CORE
depends on VIDEO_ADV7842
select CEC_CORE
---help---
When selected the adv7842 will support the optional
HDMI CEC feature.
@ -478,7 +480,8 @@ config VIDEO_ADV7511
config VIDEO_ADV7511_CEC
bool "Enable Analog Devices ADV7511 CEC support"
depends on VIDEO_ADV7511 && CEC_CORE
depends on VIDEO_ADV7511
select CEC_CORE
---help---
When selected the adv7511 will support the optional
HDMI CEC feature.

6
drivers/media/platform/Kconfig
View File

@ -501,7 +501,8 @@ if CEC_PLATFORM_DRIVERS
config VIDEO_SAMSUNG_S5P_CEC
tristate "Samsung S5P CEC driver"
depends on CEC_CORE && (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST)
depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
select CEC_CORE
select MEDIA_CEC_NOTIFIER
---help---
This is a driver for Samsung S5P HDMI CEC interface. It uses the
@ -511,7 +512,8 @@ config VIDEO_SAMSUNG_S5P_CEC
config VIDEO_STI_HDMI_CEC
tristate "STMicroelectronics STiH4xx HDMI CEC driver"
depends on CEC_CORE && (ARCH_STI || COMPILE_TEST)
depends on ARCH_STI || COMPILE_TEST
select CEC_CORE
select MEDIA_CEC_NOTIFIER
---help---
This is a driver for STIH4xx HDMI CEC interface. It uses the

3
drivers/media/platform/vivid/Kconfig
View File

@ -26,7 +26,8 @@ config VIDEO_VIVID
config VIDEO_VIVID_CEC
bool "Enable CEC emulation support"
depends on VIDEO_VIVID && CEC_CORE
depends on VIDEO_VIVID
select CEC_CORE
---help---
When selected the vivid module will emulate the optional
HDMI CEC feature.

3
drivers/media/usb/pulse8-cec/Kconfig
View File

@ -1,6 +1,7 @@
config USB_PULSE8_CEC
tristate "Pulse Eight HDMI CEC"
depends on USB_ACM && CEC_CORE
depends on USB_ACM
select CEC_CORE
select SERIO
select SERIO_SERPORT
---help---

3
drivers/media/usb/rainshadow-cec/Kconfig
View File

@ -1,6 +1,7 @@
config USB_RAINSHADOW_CEC
tristate "RainShadow Tech HDMI CEC"
depends on USB_ACM && CEC_CORE
depends on USB_ACM
select CEC_CORE
select SERIO
select SERIO_SERPORT
---help---