Skip to contentSkip to conversation

Move CEC drivers and menu to be out of MEDIA_SUPPORT

PATCH Superseded Mauro Carvalho Chehab 2 participants 6 messages Apr 15, 2020 – Apr 28, 2020

Subsystems (11)
Media (V4L/DVB) Arm Samsung Exynos Tegra architecture support CEC framework +7 more subsystems

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Mauro Carvalho Chehab

author
#0 lore raw

cover Move CEC drivers and menu to be out of MEDIA_SUPPORT

The CEC_CORE doesn't depend on MEDIA_SUPPORT. So, it doesn't make much sense to keep it under its menu.

This series move it to be just after RC support. As a side effect, now dependencies like PCI and USB are now selected, making easier to enable CEC drivers.

Mauro Carvalho Chehab (4):
media: cec: move the core to a separate directory
media: place CEC menu before MEDIA_SUPPORT
media: move CEC platform drivers to a separate directory
media: move CEC USB drivers to a separate directory

 drivers/media/Kconfig                         |  30 +----
 drivers/media/cec/Kconfig                     |  25 ++++
 drivers/media/cec/Makefile                    |  16 +--
 drivers/media/cec/core/Makefile               |  16 +++
 drivers/media/cec/{ => core}/cec-adap.c       |   0
 drivers/media/cec/{ => core}/cec-api.c        |   0
 drivers/media/cec/{ => core}/cec-core.c       |   0
 drivers/media/cec/{ => core}/cec-notifier.c   |   0
 .../media/cec/{ => core}/cec-pin-error-inj.c  |   0
 drivers/media/cec/{ => core}/cec-pin-priv.h   |   0
 drivers/media/cec/{ => core}/cec-pin.c        |   0
 drivers/media/cec/{ => core}/cec-priv.h       |   0
 drivers/media/cec/platform/Kconfig            | 121 ++++++++++++++++++
 drivers/media/cec/platform/Makefile           |  11 ++
 .../{ => cec}/platform/cec-gpio/Makefile      |   0
 .../{ => cec}/platform/cec-gpio/cec-gpio.c    |   0
 .../s5p-cec => cec/platform/s5p}/Makefile     |   0
 .../platform/s5p}/exynos_hdmi_cec.h           |   0
 .../platform/s5p}/exynos_hdmi_cecctrl.c       |   0
 .../s5p-cec => cec/platform/s5p}/regs-cec.h   |   0
 .../s5p-cec => cec/platform/s5p}/s5p_cec.c    |   0
 .../s5p-cec => cec/platform/s5p}/s5p_cec.h    |   0
 .../seco-cec => cec/platform/seco}/Makefile   |   0
 .../seco-cec => cec/platform/seco}/seco-cec.c |   0
 .../seco-cec => cec/platform/seco}/seco-cec.h |   0
 .../sti/cec => cec/platform/sti}/Makefile     |   0
 .../sti/cec => cec/platform/sti}/stih-cec.c   |   0
 .../tegra-cec => cec/platform/tegra}/Makefile |   0
 .../platform/tegra}/tegra_cec.c               |   0
 .../platform/tegra}/tegra_cec.h               |   0
 drivers/media/cec/usb/Kconfig                 |   6 +
 drivers/media/cec/usb/Makefile                |   6 +
 .../pulse8-cec => cec/usb/pulse8}/Kconfig     |   3 +-
 .../pulse8-cec => cec/usb/pulse8}/Makefile    |   0
 .../usb/pulse8}/pulse8-cec.c                  |   0
 .../usb/rainshadow}/Kconfig                   |   3 +-
 .../usb/rainshadow}/Makefile                  |   0
 .../usb/rainshadow}/rainshadow-cec.c          |   0
 drivers/media/platform/Kconfig                | 121 ------------------
 drivers/media/platform/Makefile               |   8 --
 drivers/media/usb/Kconfig                     |   6 -
 drivers/media/usb/Makefile                    |   2 -
 42 files changed, 192 insertions(+), 182 deletions(-)
 create mode 100644 drivers/media/cec/core/Makefile
 rename drivers/media/cec/{ => core}/cec-adap.c (100%)
 rename drivers/media/cec/{ => core}/cec-api.c (100%)
 rename drivers/media/cec/{ => core}/cec-core.c (100%)
 rename drivers/media/cec/{ => core}/cec-notifier.c (100%)
 rename drivers/media/cec/{ => core}/cec-pin-error-inj.c (100%)
 rename drivers/media/cec/{ => core}/cec-pin-priv.h (100%)
 rename drivers/media/cec/{ => core}/cec-pin.c (100%)
 rename drivers/media/cec/{ => core}/cec-priv.h (100%)
 create mode 100644 drivers/media/cec/platform/Kconfig
 create mode 100644 drivers/media/cec/platform/Makefile
 rename drivers/media/{ => cec}/platform/cec-gpio/Makefile (100%)
 rename drivers/media/{ => cec}/platform/cec-gpio/cec-gpio.c (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/Makefile (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/exynos_hdmi_cec.h (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/exynos_hdmi_cecctrl.c (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/regs-cec.h (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/s5p_cec.c (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/s5p_cec.h (100%)
 rename drivers/media/{platform/seco-cec => cec/platform/seco}/Makefile (100%)
 rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.c (100%)
 rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.h (100%)
 rename drivers/media/{platform/sti/cec => cec/platform/sti}/Makefile (100%)
 rename drivers/media/{platform/sti/cec => cec/platform/sti}/stih-cec.c (100%)
 rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/Makefile (100%)
 rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/tegra_cec.c (100%)
 rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/tegra_cec.h (100%)
 create mode 100644 drivers/media/cec/usb/Kconfig
 create mode 100644 drivers/media/cec/usb/Makefile
 rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Kconfig (91%)
 rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Makefile (100%)
 rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/pulse8-cec.c (100%)
 rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Kconfig (92%)
 rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Makefile (100%)
 rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/rainshadow-cec.c (100%)
Signature · 1 line
2.25.2
author
#1 lore raw

PATCH 1/4 media: cec: move the core to a separate directory

In preparation for moving CEC drivers to the CEC directory, move the core to a separate place.

Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 drivers/media/cec/Makefile                       | 16 +---------------
 drivers/media/cec/core/Makefile                  | 16 ++++++++++++++++
 drivers/media/cec/{ => core}/cec-adap.c          |  0
 drivers/media/cec/{ => core}/cec-api.c           |  0
 drivers/media/cec/{ => core}/cec-core.c          |  0
 drivers/media/cec/{ => core}/cec-notifier.c      |  0
 drivers/media/cec/{ => core}/cec-pin-error-inj.c |  0
 drivers/media/cec/{ => core}/cec-pin-priv.h      |  0
 drivers/media/cec/{ => core}/cec-pin.c           |  0
 drivers/media/cec/{ => core}/cec-priv.h          |  0
 10 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 drivers/media/cec/core/Makefile
 rename drivers/media/cec/{ => core}/cec-adap.c (100%)
 rename drivers/media/cec/{ => core}/cec-api.c (100%)
 rename drivers/media/cec/{ => core}/cec-core.c (100%)
 rename drivers/media/cec/{ => core}/cec-notifier.c (100%)
 rename drivers/media/cec/{ => core}/cec-pin-error-inj.c (100%)
 rename drivers/media/cec/{ => core}/cec-pin-priv.h (100%)
 rename drivers/media/cec/{ => core}/cec-pin.c (100%)
 rename drivers/media/cec/{ => core}/cec-priv.h (100%)
drivers/media/cec/Makefile +1 -15
index ad8677d8c896..3fdbc22b1530 100644
@@ -1,16 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0
-cec-objs := cec-core.o cec-adap.o cec-api.o
-
-ifeq ($(CONFIG_CEC_NOTIFIER),y)
-  cec-objs += cec-notifier.o
-endif
-
-ifeq ($(CONFIG_CEC_PIN),y)
-  cec-objs += cec-pin.o
-endif
-
-ifeq ($(CONFIG_CEC_PIN_ERROR_INJ),y)
-  cec-objs += cec-pin-error-inj.o
-endif
-
-obj-$(CONFIG_CEC_CORE) += cec.o
+obj-y += core/
drivers/media/cec/core/Makefile new file +16 -0
new file mode 100644
index 000000000000..ad8677d8c896
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0
+cec-objs := cec-core.o cec-adap.o cec-api.o
+
+ifeq ($(CONFIG_CEC_NOTIFIER),y)
+  cec-objs += cec-notifier.o
+endif
+
+ifeq ($(CONFIG_CEC_PIN),y)
+  cec-objs += cec-pin.o
+endif
+
+ifeq ($(CONFIG_CEC_PIN_ERROR_INJ),y)
+  cec-objs += cec-pin-error-inj.o
+endif
+
+obj-$(CONFIG_CEC_CORE) += cec.o
drivers/media/cec/core/cec-adap.c renamed from drivers/media/cec/cec-adap.c +0 -0
similarity index 100%
rename from drivers/media/cec/cec-adap.c
rename to drivers/media/cec/core/cec-adap.c
drivers/media/cec/core/cec-api.c renamed from drivers/media/cec/cec-api.c +0 -0
similarity index 100%
rename from drivers/media/cec/cec-api.c
rename to drivers/media/cec/core/cec-api.c
drivers/media/cec/core/cec-core.c renamed from drivers/media/cec/cec-core.c +0 -0
similarity index 100%
rename from drivers/media/cec/cec-core.c
rename to drivers/media/cec/core/cec-core.c
drivers/media/cec/core/cec-notifier.c renamed from drivers/media/cec/cec-notifier.c +0 -0
similarity index 100%
rename from drivers/media/cec/cec-notifier.c
rename to drivers/media/cec/core/cec-notifier.c
drivers/media/cec/core/cec-pin-error-inj.c renamed from drivers/media/cec/cec-pin-error-inj.c +0 -0
similarity index 100%
rename from drivers/media/cec/cec-pin-error-inj.c
rename to drivers/media/cec/core/cec-pin-error-inj.c
drivers/media/cec/core/cec-pin-priv.h renamed from drivers/media/cec/cec-pin-priv.h +0 -0
similarity index 100%
rename from drivers/media/cec/cec-pin-priv.h
rename to drivers/media/cec/core/cec-pin-priv.h
drivers/media/cec/core/cec-pin.c renamed from drivers/media/cec/cec-pin.c +0 -0
similarity index 100%
rename from drivers/media/cec/cec-pin.c
rename to drivers/media/cec/core/cec-pin.c
drivers/media/cec/core/cec-priv.h renamed from drivers/media/cec/cec-priv.h +0 -0
similarity index 100%
rename from drivers/media/cec/cec-priv.h
rename to drivers/media/cec/core/cec-priv.h
Signature · 1 line
2.25.2
author
#2 lore raw

PATCH 2/4 media: place CEC menu before MEDIA_SUPPORT

In reply to Mauro Carvalho Chehab

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  --->
Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 drivers/media/Kconfig     | 30 ++----------------------------
 drivers/media/cec/Kconfig | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 28 deletions(-)
drivers/media/Kconfig +2 -28
index e8bd354a0f75..8694e3c6d183 100644
@@ -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'"
drivers/media/cec/Kconfig +20 -0
index c01919713ab9..1586dd899302 100644
@@ -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.
Signature · 1 line
2.25.2
#3 lore raw

Re: [PATCH 2/4] media: place CEC menu before MEDIA_SUPPORT

Hi Mauro,

Quoted 7 lines · Mauro Carvalho Chehab

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:

Quoted 6 lines
	<*> Remote Controller support  --->
	[ ] HDMI CEC RC integration (NEW)
	< > HDMI CEC drivers
	<M> Multimedia support  --->
Signed-off-by Mauro Carvalho Chehab <[email protected]>

Thanks for your patch, which is now commit 46d2a3b964ddbe63 ("media:
place CEC menu before MEDIA_SUPPORT") in media/master.

drivers/media/cec/Kconfig config CEC_PIN_ERROR_INJ · line 26

Quoted 10 lines
drivers/media/cec/Kconfig +4 -0
@@ -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"

This is now visible in a media-less and head-less kernel...

drivers/media/cec/Kconfig config CEC_PIN_ERROR_INJ · line 27

Quoted 1 line
drivers/media/cec/Kconfig +1 -0
+	default y if !MEDIA_SUPPORT_FILTER

... and in that case even defaults to y:

    $ grep MEDIA .config
    CONFIG_MEDIA_CEC_SUPPORT=y
    # CONFIG_MEDIA_SUPPORT is not set

Is that intentional?

drivers/media/cec/Kconfig config CEC_PIN_ERROR_INJ

Quoted 7 lines
drivers/media/cec/Kconfig +6 -1
+	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.
--

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

author
#4 lore raw

PATCH 3/4 media: move CEC platform drivers to a separate directory

In reply to Mauro Carvalho Chehab

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 PCI, seco driver can select it (and DMI).

Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 drivers/media/cec/Kconfig                     |   6 +-
 drivers/media/cec/Makefile                    |   2 +-
 drivers/media/cec/platform/Kconfig            | 121 ++++++++++++++++++
 drivers/media/cec/platform/Makefile           |  11 ++
 .../{ => cec}/platform/cec-gpio/Makefile      |   0
 .../{ => cec}/platform/cec-gpio/cec-gpio.c    |   0
 .../s5p-cec => cec/platform/s5p}/Makefile     |   0
 .../platform/s5p}/exynos_hdmi_cec.h           |   0
 .../platform/s5p}/exynos_hdmi_cecctrl.c       |   0
 .../s5p-cec => cec/platform/s5p}/regs-cec.h   |   0
 .../s5p-cec => cec/platform/s5p}/s5p_cec.c    |   0
 .../s5p-cec => cec/platform/s5p}/s5p_cec.h    |   0
 .../seco-cec => cec/platform/seco}/Makefile   |   0
 .../seco-cec => cec/platform/seco}/seco-cec.c |   0
 .../seco-cec => cec/platform/seco}/seco-cec.h |   0
 .../sti/cec => cec/platform/sti}/Makefile     |   0
 .../sti/cec => cec/platform/sti}/stih-cec.c   |   0
 .../tegra-cec => cec/platform/tegra}/Makefile |   0
 .../platform/tegra}/tegra_cec.c               |   0
 .../platform/tegra}/tegra_cec.h               |   0
 drivers/media/platform/Kconfig                | 121 ------------------
 drivers/media/platform/Makefile               |   8 --
 22 files changed, 138 insertions(+), 131 deletions(-)
 create mode 100644 drivers/media/cec/platform/Kconfig
 create mode 100644 drivers/media/cec/platform/Makefile
 rename drivers/media/{ => cec}/platform/cec-gpio/Makefile (100%)
 rename drivers/media/{ => cec}/platform/cec-gpio/cec-gpio.c (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/Makefile (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/exynos_hdmi_cec.h (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/exynos_hdmi_cecctrl.c (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/regs-cec.h (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/s5p_cec.c (100%)
 rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/s5p_cec.h (100%)
 rename drivers/media/{platform/seco-cec => cec/platform/seco}/Makefile (100%)
 rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.c (100%)
 rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.h (100%)
 rename drivers/media/{platform/sti/cec => cec/platform/sti}/Makefile (100%)
 rename drivers/media/{platform/sti/cec => cec/platform/sti}/stih-cec.c (100%)
 rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/Makefile (100%)
 rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/tegra_cec.c (100%)
 rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/tegra_cec.h (100%)
drivers/media/cec/Kconfig +5 -1
index 1586dd899302..7b1fb70066bd 100644
@@ -21,7 +21,7 @@ config CEC_PIN_ERROR_INJ
 	help
 	  This option enables CEC error injection using debugfs.
 
-config MEDIA_CEC_SUPPORT
+menuconfig MEDIA_CEC_SUPPORT
 	bool
 	prompt "HDMI CEC drivers"
 	default y if !MEDIA_SUPPORT_FILTER

@@ -31,3 +31,7 @@ config MEDIA_CEC_SUPPORT
 
 	  Say Y when you have an HDMI receiver, transmitter or a USB CEC
 	  adapter that supports HDMI CEC.
+
+if MEDIA_CEC_SUPPORT
+source "drivers/media/cec/platform/Kconfig"
+endif
drivers/media/cec/Makefile +1 -1
index 3fdbc22b1530..8c6448bee386 100644
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y += core/
+obj-y += core/ platform/
drivers/media/cec/platform/Kconfig new file +121 -0

121 lines not on this page · raw message

drivers/media/cec/platform/Makefile new file +11 -0
new file mode 100644
index 000000000000..3c103fb364ba
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for the CEC platform device drivers.
+#
+
+obj-$(CONFIG_CEC_GPIO)			+= cec-gpio/
+obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC)	+= s5p/
+obj-$(CONFIG_VIDEO_STI_HDMI_CEC)	+= sti/
+obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC)	+= tegra/
+obj-$(CONFIG_VIDEO_SECO_CEC)		+= seco/
+
drivers/media/cec/platform/cec-gpio/Makefile renamed from drivers/media/platform/cec-gpio/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/cec-gpio/Makefile
rename to drivers/media/cec/platform/cec-gpio/Makefile
drivers/media/cec/platform/cec-gpio/cec-gpio.c renamed from drivers/media/platform/cec-gpio/cec-gpio.c +0 -0
similarity index 100%
rename from drivers/media/platform/cec-gpio/cec-gpio.c
rename to drivers/media/cec/platform/cec-gpio/cec-gpio.c
drivers/media/cec/platform/s5p/Makefile renamed from drivers/media/platform/s5p-cec/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/s5p-cec/Makefile
rename to drivers/media/cec/platform/s5p/Makefile
drivers/media/cec/platform/s5p/exynos_hdmi_cec.h renamed from drivers/media/platform/s5p-cec/exynos_hdmi_cec.h +0 -0
similarity index 100%
rename from drivers/media/platform/s5p-cec/exynos_hdmi_cec.h
rename to drivers/media/cec/platform/s5p/exynos_hdmi_cec.h
drivers/media/cec/platform/s5p/exynos_hdmi_cecctrl.c renamed from drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c +0 -0
similarity index 100%
rename from drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c
rename to drivers/media/cec/platform/s5p/exynos_hdmi_cecctrl.c
drivers/media/cec/platform/s5p/regs-cec.h renamed from drivers/media/platform/s5p-cec/regs-cec.h +0 -0
similarity index 100%
rename from drivers/media/platform/s5p-cec/regs-cec.h
rename to drivers/media/cec/platform/s5p/regs-cec.h
drivers/media/cec/platform/s5p/s5p_cec.c renamed from drivers/media/platform/s5p-cec/s5p_cec.c +0 -0
similarity index 100%
rename from drivers/media/platform/s5p-cec/s5p_cec.c
rename to drivers/media/cec/platform/s5p/s5p_cec.c
drivers/media/cec/platform/s5p/s5p_cec.h renamed from drivers/media/platform/s5p-cec/s5p_cec.h +0 -0
similarity index 100%
rename from drivers/media/platform/s5p-cec/s5p_cec.h
rename to drivers/media/cec/platform/s5p/s5p_cec.h
drivers/media/cec/platform/seco/Makefile renamed from drivers/media/platform/seco-cec/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/seco-cec/Makefile
rename to drivers/media/cec/platform/seco/Makefile
drivers/media/cec/platform/seco/seco-cec.c renamed from drivers/media/platform/seco-cec/seco-cec.c +0 -0
similarity index 100%
rename from drivers/media/platform/seco-cec/seco-cec.c
rename to drivers/media/cec/platform/seco/seco-cec.c
drivers/media/cec/platform/seco/seco-cec.h renamed from drivers/media/platform/seco-cec/seco-cec.h +0 -0
similarity index 100%
rename from drivers/media/platform/seco-cec/seco-cec.h
rename to drivers/media/cec/platform/seco/seco-cec.h
drivers/media/cec/platform/sti/Makefile renamed from drivers/media/platform/sti/cec/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/sti/cec/Makefile
rename to drivers/media/cec/platform/sti/Makefile
drivers/media/cec/platform/sti/stih-cec.c renamed from drivers/media/platform/sti/cec/stih-cec.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/cec/stih-cec.c
rename to drivers/media/cec/platform/sti/stih-cec.c
drivers/media/cec/platform/tegra/Makefile renamed from drivers/media/platform/tegra-cec/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/tegra-cec/Makefile
rename to drivers/media/cec/platform/tegra/Makefile
drivers/media/cec/platform/tegra/tegra_cec.c renamed from drivers/media/platform/tegra-cec/tegra_cec.c +0 -0
similarity index 100%
rename from drivers/media/platform/tegra-cec/tegra_cec.c
rename to drivers/media/cec/platform/tegra/tegra_cec.c
drivers/media/cec/platform/tegra/tegra_cec.h renamed from drivers/media/platform/tegra-cec/tegra_cec.h +0 -0
similarity index 100%
rename from drivers/media/platform/tegra-cec/tegra_cec.h
rename to drivers/media/cec/platform/tegra/tegra_cec.h
drivers/media/platform/Kconfig +0 -121

127 lines not on this page · raw message

drivers/media/platform/Makefile +0 -8
index a0194ef1211f..512dcc6e710a 100644
@@ -23,8 +23,6 @@ obj-$(CONFIG_VIDEO_IMX_PXP)		+= imx-pxp.o
 
 obj-$(CONFIG_VIDEO_SH_VEU)		+= sh_veu.o
 
-obj-$(CONFIG_CEC_GPIO)			+= cec-gpio/
-
 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)	+= m2m-deinterlace.o
 
 obj-$(CONFIG_VIDEO_MUX)			+= video-mux.o

@@ -35,22 +33,16 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)	+= s5p-jpeg/
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC)	+= s5p-mfc/
 
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)	+= s5p-g2d/
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC)	+= s5p-cec/
 obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC)	+= exynos-gsc/
 
 obj-$(CONFIG_VIDEO_STI_BDISP)		+= sti/bdisp/
 obj-$(CONFIG_VIDEO_STI_HVA)		+= sti/hva/
 obj-$(CONFIG_DVB_C8SECTPFE)		+= sti/c8sectpfe/
-obj-$(CONFIG_VIDEO_STI_HDMI_CEC)	+= sti/cec/
 
 obj-$(CONFIG_VIDEO_STI_DELTA)		+= sti/delta/
 
-obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC)	+= tegra-cec/
-
 obj-y					+= stm32/
 
-obj-$(CONFIG_VIDEO_SECO_CEC)		+= seco-cec/
-
 obj-y					+= davinci/
 
 obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
Signature · 1 line
2.25.2
author
#5 lore raw

PATCH 4/4 media: move CEC USB drivers to a separate directory

In reply to Mauro Carvalho Chehab

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.

Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 drivers/media/cec/Kconfig                                   | 1 +
 drivers/media/cec/Makefile                                  | 2 +-
 drivers/media/cec/usb/Kconfig                               | 6 ++++++
 drivers/media/cec/usb/Makefile                              | 6 ++++++
 drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Kconfig    | 3 ++-
 drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Makefile   | 0
 .../media/{usb/pulse8-cec => cec/usb/pulse8}/pulse8-cec.c   | 0
 .../{usb/rainshadow-cec => cec/usb/rainshadow}/Kconfig      | 3 ++-
 .../{usb/rainshadow-cec => cec/usb/rainshadow}/Makefile     | 0
 .../rainshadow-cec => cec/usb/rainshadow}/rainshadow-cec.c  | 0
 drivers/media/usb/Kconfig                                   | 6 ------
 drivers/media/usb/Makefile                                  | 2 --
 12 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 drivers/media/cec/usb/Kconfig
 create mode 100644 drivers/media/cec/usb/Makefile
 rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Kconfig (91%)
 rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Makefile (100%)
 rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/pulse8-cec.c (100%)
 rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Kconfig (92%)
 rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Makefile (100%)
 rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/rainshadow-cec.c (100%)
drivers/media/cec/Kconfig +1 -0
index 7b1fb70066bd..eea74b7cfa8c 100644
@@ -34,4 +34,5 @@ menuconfig MEDIA_CEC_SUPPORT
 
 if MEDIA_CEC_SUPPORT
 source "drivers/media/cec/platform/Kconfig"
+source "drivers/media/cec/usb/Kconfig"
 endif
drivers/media/cec/Makefile +1 -1
index 8c6448bee386..74e80e1b3571 100644
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y += core/ platform/
+obj-y += core/ platform/ usb/
drivers/media/cec/usb/Kconfig new file +6 -0
new file mode 100644
index 000000000000..d3bbef464bdb
@@ -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"
drivers/media/cec/usb/Makefile new file +6 -0
new file mode 100644
index 000000000000..e4183d1bfa9a
@@ -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/
drivers/media/cec/usb/pulse8/Kconfig renamed from drivers/media/usb/pulse8-cec/Kconfig +2 -1
similarity index 91%
rename from drivers/media/usb/pulse8-cec/Kconfig
rename to drivers/media/cec/usb/pulse8/Kconfig
index e802d30dbbee..a0224ef80e6c 100644
@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config USB_PULSE8_CEC
 	tristate "Pulse Eight HDMI CEC"
-	depends on USB_ACM
 	select CEC_CORE
+	select USB
+	select USB_ACM
 	select SERIO
 	select SERIO_SERPORT
 	help
drivers/media/cec/usb/pulse8/Makefile renamed from drivers/media/usb/pulse8-cec/Makefile +0 -0
similarity index 100%
rename from drivers/media/usb/pulse8-cec/Makefile
rename to drivers/media/cec/usb/pulse8/Makefile
drivers/media/cec/usb/pulse8/pulse8-cec.c renamed from drivers/media/usb/pulse8-cec/pulse8-cec.c +0 -0
similarity index 100%
rename from drivers/media/usb/pulse8-cec/pulse8-cec.c
rename to drivers/media/cec/usb/pulse8/pulse8-cec.c
drivers/media/cec/usb/rainshadow/Kconfig renamed from drivers/media/usb/rainshadow-cec/Kconfig +2 -1
similarity index 92%
rename from drivers/media/usb/rainshadow-cec/Kconfig
rename to drivers/media/cec/usb/rainshadow/Kconfig
index b481c5157d7e..c9ef2c192b17 100644
@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config USB_RAINSHADOW_CEC
 	tristate "RainShadow Tech HDMI CEC"
-	depends on USB_ACM
 	select CEC_CORE
+	select USB
+	select USB_ACM
 	select SERIO
 	select SERIO_SERPORT
 	help
drivers/media/cec/usb/rainshadow/Makefile renamed from drivers/media/usb/rainshadow-cec/Makefile +0 -0
similarity index 100%
rename from drivers/media/usb/rainshadow-cec/Makefile
rename to drivers/media/cec/usb/rainshadow/Makefile
drivers/media/cec/usb/rainshadow/rainshadow-cec.c renamed from drivers/media/usb/rainshadow-cec/rainshadow-cec.c +0 -0
similarity index 100%
rename from drivers/media/usb/rainshadow-cec/rainshadow-cec.c
rename to drivers/media/cec/usb/rainshadow/rainshadow-cec.c
drivers/media/usb/Kconfig +0 -6
index bf08393e38d1..00feadb217d8 100644
@@ -66,11 +66,5 @@ source "drivers/media/usb/hackrf/Kconfig"
 source "drivers/media/usb/msi2500/Kconfig"
 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 #USB
drivers/media/usb/Makefile +0 -2
index 169aa07c97bd..3eaff3149ef4 100644
@@ -24,5 +24,3 @@ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
 obj-$(CONFIG_VIDEO_USBTV) += usbtv/
 obj-$(CONFIG_VIDEO_GO7007) += go7007/
 obj-$(CONFIG_DVB_AS102) += as102/
-obj-$(CONFIG_USB_PULSE8_CEC) += pulse8-cec/
-obj-$(CONFIG_USB_RAINSHADOW_CEC) += rainshadow-cec/
Signature · 1 line
2.25.2