Commit a8106818 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: move CEC USB drivers to a separate directory

As CEC support doesn't depend on MEDIA_SUPPORT, let's
place the platform drivers outside the media menu.

As a side effect, instead of depends on	USB, drivers
just select it.
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 4be5e864
...@@ -34,4 +34,5 @@ menuconfig MEDIA_CEC_SUPPORT ...@@ -34,4 +34,5 @@ menuconfig MEDIA_CEC_SUPPORT
if MEDIA_CEC_SUPPORT if MEDIA_CEC_SUPPORT
source "drivers/media/cec/platform/Kconfig" source "drivers/media/cec/platform/Kconfig"
source "drivers/media/cec/usb/Kconfig"
endif endif
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
obj-y += core/ platform/ obj-y += core/ platform/ usb/
# SPDX-License-Identifier: GPL-2.0-only
#
# USB drivers
source "drivers/media/cec/usb/pulse8/Kconfig"
source "drivers/media/cec/usb/rainshadow/Kconfig"
# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the CEC USB device drivers.
#
obj-$(CONFIG_USB_PULSE8_CEC) += pulse8/
obj-$(CONFIG_USB_RAINSHADOW_CEC) += rainshadow/
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config USB_PULSE8_CEC config USB_PULSE8_CEC
tristate "Pulse Eight HDMI CEC" tristate "Pulse Eight HDMI CEC"
depends on USB_ACM
select CEC_CORE select CEC_CORE
select USB
select USB_ACM
select SERIO select SERIO
select SERIO_SERPORT select SERIO_SERPORT
help help
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config USB_RAINSHADOW_CEC config USB_RAINSHADOW_CEC
tristate "RainShadow Tech HDMI CEC" tristate "RainShadow Tech HDMI CEC"
depends on USB_ACM
select CEC_CORE select CEC_CORE
select USB
select USB_ACM
select SERIO select SERIO
select SERIO_SERPORT select SERIO_SERPORT
help help
......
...@@ -66,11 +66,5 @@ source "drivers/media/usb/hackrf/Kconfig" ...@@ -66,11 +66,5 @@ source "drivers/media/usb/hackrf/Kconfig"
source "drivers/media/usb/msi2500/Kconfig" source "drivers/media/usb/msi2500/Kconfig"
endif endif
if MEDIA_CEC_SUPPORT
comment "USB HDMI CEC adapters"
source "drivers/media/usb/pulse8-cec/Kconfig"
source "drivers/media/usb/rainshadow-cec/Kconfig"
endif
endif #MEDIA_USB_SUPPORT endif #MEDIA_USB_SUPPORT
endif #USB endif #USB
...@@ -24,5 +24,3 @@ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ ...@@ -24,5 +24,3 @@ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
obj-$(CONFIG_VIDEO_USBTV) += usbtv/ obj-$(CONFIG_VIDEO_USBTV) += usbtv/
obj-$(CONFIG_VIDEO_GO7007) += go7007/ obj-$(CONFIG_VIDEO_GO7007) += go7007/
obj-$(CONFIG_DVB_AS102) += as102/ obj-$(CONFIG_DVB_AS102) += as102/
obj-$(CONFIG_USB_PULSE8_CEC) += pulse8-cec/
obj-$(CONFIG_USB_RAINSHADOW_CEC) += rainshadow-cec/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment