public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

media: move CEC USB drivers to a separate directory

Browse source 
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: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2020-04-15 11:14:25 +02:00
parent 4be5e8648b
commit a81068181a
12 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/media/cec/Kconfig
View file

@ -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

2
drivers/media/cec/Makefile
View file

@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
obj-y += core/ platform/ obj-y += core/ platform/ usb/

6
drivers/media/cec/usb/Kconfig Normal file
View file

@ -0,0 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# USB drivers
source "drivers/media/cec/usb/pulse8/Kconfig"
source "drivers/media/cec/usb/rainshadow/Kconfig"

6
drivers/media/cec/usb/Makefile Normal file
View file

@ -0,0 +1,6 @@
# 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/

3
drivers/media/usb/pulse8-cec/Kconfig → drivers/media/cec/usb/pulse8/Kconfig
View file

@ -1,8 +1,9 @@
# 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

0
drivers/media/usb/pulse8-cec/Makefile → drivers/media/cec/usb/pulse8/Makefile
View file

0
drivers/media/usb/pulse8-cec/pulse8-cec.c → drivers/media/cec/usb/pulse8/pulse8-cec.c
View file

3
drivers/media/usb/rainshadow-cec/Kconfig → drivers/media/cec/usb/rainshadow/Kconfig
View file

@ -1,8 +1,9 @@
# 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

0
drivers/media/usb/rainshadow-cec/Makefile → drivers/media/cec/usb/rainshadow/Makefile
View file

0
drivers/media/usb/rainshadow-cec/rainshadow-cec.c → drivers/media/cec/usb/rainshadow/rainshadow-cec.c
View file

6
drivers/media/usb/Kconfig
View file

@ -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

2
drivers/media/usb/Makefile
View file

@ -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/