* [PATCH 0/4] Move CEC drivers and menu to be out of MEDIA_SUPPORT
@ 2020-04-15 9:49 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 9:49 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Hans Verkuil, linux-samsung-soc,
linux-tegra, Benjamin Gaignard, Thierry Reding, Marek Szyprowski,
Ettore Chimenti, Krzysztof Kozlowski, Kukjin Kim,
linux-arm-kernel, Jonathan Hunter
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%)
--
2.25.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/4] Move CEC drivers and menu to be out of MEDIA_SUPPORT
@ 2020-04-15 9:49 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 9:49 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: linux-samsung-soc, Mauro Carvalho Chehab, Krzysztof Kozlowski,
Ettore Chimenti, linux-tegra, Thierry Reding, Kukjin Kim,
Benjamin Gaignard, Hans Verkuil, Jonathan Hunter,
linux-arm-kernel, Marek Szyprowski
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%)
--
2.25.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/4] Move CEC drivers and menu to be out of MEDIA_SUPPORT
@ 2020-04-15 9:49 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 9:49 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: linux-samsung-soc, Mauro Carvalho Chehab, Krzysztof Kozlowski,
Ettore Chimenti, linux-tegra, Thierry Reding, Kukjin Kim,
Benjamin Gaignard, Hans Verkuil, Jonathan Hunter,
linux-arm-kernel, Marek Szyprowski
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%)
--
2.25.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] media: cec: move the core to a separate directory
2020-04-15 9:49 ` Mauro Carvalho Chehab
(?)
(?)
@ 2020-04-15 9:49 ` Mauro Carvalho Chehab
-1 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 9:49 UTC (permalink / raw)
To: Linux Media Mailing List; +Cc: Mauro Carvalho Chehab, Hans Verkuil
In preparation for moving CEC drivers to the CEC directory,
move the core to a separate place.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
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%)
diff --git a/drivers/media/cec/Makefile b/drivers/media/cec/Makefile
index ad8677d8c896..3fdbc22b1530 100644
--- a/drivers/media/cec/Makefile
+++ b/drivers/media/cec/Makefile
@@ -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/
diff --git a/drivers/media/cec/core/Makefile b/drivers/media/cec/core/Makefile
new file mode 100644
index 000000000000..ad8677d8c896
--- /dev/null
+++ b/drivers/media/cec/core/Makefile
@@ -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
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/core/cec-adap.c
similarity index 100%
rename from drivers/media/cec/cec-adap.c
rename to drivers/media/cec/core/cec-adap.c
diff --git a/drivers/media/cec/cec-api.c b/drivers/media/cec/core/cec-api.c
similarity index 100%
rename from drivers/media/cec/cec-api.c
rename to drivers/media/cec/core/cec-api.c
diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/core/cec-core.c
similarity index 100%
rename from drivers/media/cec/cec-core.c
rename to drivers/media/cec/core/cec-core.c
diff --git a/drivers/media/cec/cec-notifier.c b/drivers/media/cec/core/cec-notifier.c
similarity index 100%
rename from drivers/media/cec/cec-notifier.c
rename to drivers/media/cec/core/cec-notifier.c
diff --git a/drivers/media/cec/cec-pin-error-inj.c b/drivers/media/cec/core/cec-pin-error-inj.c
similarity index 100%
rename from drivers/media/cec/cec-pin-error-inj.c
rename to drivers/media/cec/core/cec-pin-error-inj.c
diff --git a/drivers/media/cec/cec-pin-priv.h b/drivers/media/cec/core/cec-pin-priv.h
similarity index 100%
rename from drivers/media/cec/cec-pin-priv.h
rename to drivers/media/cec/core/cec-pin-priv.h
diff --git a/drivers/media/cec/cec-pin.c b/drivers/media/cec/core/cec-pin.c
similarity index 100%
rename from drivers/media/cec/cec-pin.c
rename to drivers/media/cec/core/cec-pin.c
diff --git a/drivers/media/cec/cec-priv.h b/drivers/media/cec/core/cec-priv.h
similarity index 100%
rename from drivers/media/cec/cec-priv.h
rename to drivers/media/cec/core/cec-priv.h
--
2.25.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] media: place CEC menu before MEDIA_SUPPORT
2020-04-15 9:49 ` Mauro Carvalho Chehab
` (2 preceding siblings ...)
(?)
@ 2020-04-15 9:49 ` Mauro Carvalho Chehab
2020-04-28 14:06 ` Geert Uytterhoeven
-1 siblings, 1 reply; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 9:49 UTC (permalink / raw)
To: Linux Media Mailing List; +Cc: Mauro Carvalho Chehab, Hans Verkuil
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 <mchehab+huawei@kernel.org>
---
drivers/media/Kconfig | 30 ++----------------------------
drivers/media/cec/Kconfig | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index e8bd354a0f75..8694e3c6d183 100644
--- 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 c01919713ab9..1586dd899302 100644
--- 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.
--
2.25.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] media: move CEC platform drivers to a separate directory
2020-04-15 9:49 ` Mauro Carvalho Chehab
@ 2020-04-15 9:49 ` Mauro Carvalho Chehab
-1 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 9:49 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Hans Verkuil, Kukjin Kim,
Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter,
Marek Szyprowski, Ettore Chimenti, Benjamin Gaignard,
linux-arm-kernel, linux-samsung-soc, linux-tegra
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 <mchehab+huawei@kernel.org>
---
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%)
diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig
index 1586dd899302..7b1fb70066bd 100644
--- a/drivers/media/cec/Kconfig
+++ b/drivers/media/cec/Kconfig
@@ -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
diff --git a/drivers/media/cec/Makefile b/drivers/media/cec/Makefile
index 3fdbc22b1530..8c6448bee386 100644
--- a/drivers/media/cec/Makefile
+++ b/drivers/media/cec/Makefile
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
-obj-y += core/
+obj-y += core/ platform/
diff --git a/drivers/media/cec/platform/Kconfig b/drivers/media/cec/platform/Kconfig
new file mode 100644
index 000000000000..6a8bb8b68344
--- /dev/null
+++ b/drivers/media/cec/platform/Kconfig
@@ -0,0 +1,121 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Platform drivers
+
+config VIDEO_CROS_EC_CEC
+ tristate "ChromeOS EC CEC driver"
+ depends on CROS_EC
+ select CEC_CORE
+ select CEC_NOTIFIER
+ select CROS_EC_PROTO
+ help
+ If you say yes here you will get support for the
+ ChromeOS Embedded Controller's CEC.
+ The CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_MESON_AO_CEC
+ tristate "Amlogic Meson AO CEC driver"
+ depends on ARCH_MESON || COMPILE_TEST
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for Amlogic Meson SoCs AO CEC interface. It uses the
+ generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+
+config VIDEO_MESON_G12A_AO_CEC
+ tristate "Amlogic Meson G12A AO CEC driver"
+ depends on ARCH_MESON || COMPILE_TEST
+ depends on COMMON_CLK && OF
+ select REGMAP
+ select REGMAP_MMIO
+ select CEC_CORE
+ select CEC_NOTIFIER
+ ---help---
+ This is a driver for Amlogic Meson G12A SoCs AO CEC interface.
+ This driver if for the new AO-CEC module found in G12A SoCs,
+ usually named AO_CEC_B in documentation.
+ It uses the generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config CEC_GPIO
+ tristate "Generic GPIO-based CEC driver"
+ depends on PREEMPTION || COMPILE_TEST
+ select CEC_CORE
+ select CEC_PIN
+ select CEC_NOTIFIER
+ select GPIOLIB
+ help
+ This is a generic GPIO-based CEC driver.
+ The CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_SAMSUNG_S5P_CEC
+ tristate "Samsung S5P CEC driver"
+ depends on ARCH_EXYNOS || COMPILE_TEST
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for Samsung S5P HDMI CEC interface. It uses the
+ generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_STI_HDMI_CEC
+ tristate "STMicroelectronics STiH4xx HDMI CEC driver"
+ depends on ARCH_STI || COMPILE_TEST
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for STIH4xx HDMI CEC interface. It uses the
+ generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_STM32_HDMI_CEC
+ tristate "STMicroelectronics STM32 HDMI CEC driver"
+ depends on ARCH_STM32 || COMPILE_TEST
+ select REGMAP
+ select REGMAP_MMIO
+ select CEC_CORE
+ help
+ This is a driver for STM32 interface. It uses the
+ generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_TEGRA_HDMI_CEC
+ tristate "Tegra HDMI CEC driver"
+ depends on ARCH_TEGRA || COMPILE_TEST
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for the Tegra HDMI CEC interface. It uses the
+ generic CEC framework interface.
+ The CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_SECO_CEC
+ tristate "SECO Boards HDMI CEC driver"
+ depends on (X86 || IA64) || COMPILE_TEST
+ select PCI
+ select DMI
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for SECO Boards integrated CEC interface.
+ Selecting it will enable support for this device.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_SECO_RC
+ bool "SECO Boards IR RC5 support"
+ depends on VIDEO_SECO_CEC
+ depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC
+ help
+ If you say yes here you will get support for the
+ SECO Boards Consumer-IR in seco-cec driver.
+ The embedded controller supports RC5 protocol only, default mapping
+ is set to rc-hauppauge.
diff --git a/drivers/media/cec/platform/Makefile b/drivers/media/cec/platform/Makefile
new file mode 100644
index 000000000000..3c103fb364ba
--- /dev/null
+++ b/drivers/media/cec/platform/Makefile
@@ -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/
+
diff --git a/drivers/media/platform/cec-gpio/Makefile b/drivers/media/cec/platform/cec-gpio/Makefile
similarity index 100%
rename from drivers/media/platform/cec-gpio/Makefile
rename to drivers/media/cec/platform/cec-gpio/Makefile
diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/cec/platform/cec-gpio/cec-gpio.c
similarity index 100%
rename from drivers/media/platform/cec-gpio/cec-gpio.c
rename to drivers/media/cec/platform/cec-gpio/cec-gpio.c
diff --git a/drivers/media/platform/s5p-cec/Makefile b/drivers/media/cec/platform/s5p/Makefile
similarity index 100%
rename from drivers/media/platform/s5p-cec/Makefile
rename to drivers/media/cec/platform/s5p/Makefile
diff --git a/drivers/media/platform/s5p-cec/exynos_hdmi_cec.h b/drivers/media/cec/platform/s5p/exynos_hdmi_cec.h
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
diff --git a/drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c b/drivers/media/cec/platform/s5p/exynos_hdmi_cecctrl.c
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
diff --git a/drivers/media/platform/s5p-cec/regs-cec.h b/drivers/media/cec/platform/s5p/regs-cec.h
similarity index 100%
rename from drivers/media/platform/s5p-cec/regs-cec.h
rename to drivers/media/cec/platform/s5p/regs-cec.h
diff --git a/drivers/media/platform/s5p-cec/s5p_cec.c b/drivers/media/cec/platform/s5p/s5p_cec.c
similarity index 100%
rename from drivers/media/platform/s5p-cec/s5p_cec.c
rename to drivers/media/cec/platform/s5p/s5p_cec.c
diff --git a/drivers/media/platform/s5p-cec/s5p_cec.h b/drivers/media/cec/platform/s5p/s5p_cec.h
similarity index 100%
rename from drivers/media/platform/s5p-cec/s5p_cec.h
rename to drivers/media/cec/platform/s5p/s5p_cec.h
diff --git a/drivers/media/platform/seco-cec/Makefile b/drivers/media/cec/platform/seco/Makefile
similarity index 100%
rename from drivers/media/platform/seco-cec/Makefile
rename to drivers/media/cec/platform/seco/Makefile
diff --git a/drivers/media/platform/seco-cec/seco-cec.c b/drivers/media/cec/platform/seco/seco-cec.c
similarity index 100%
rename from drivers/media/platform/seco-cec/seco-cec.c
rename to drivers/media/cec/platform/seco/seco-cec.c
diff --git a/drivers/media/platform/seco-cec/seco-cec.h b/drivers/media/cec/platform/seco/seco-cec.h
similarity index 100%
rename from drivers/media/platform/seco-cec/seco-cec.h
rename to drivers/media/cec/platform/seco/seco-cec.h
diff --git a/drivers/media/platform/sti/cec/Makefile b/drivers/media/cec/platform/sti/Makefile
similarity index 100%
rename from drivers/media/platform/sti/cec/Makefile
rename to drivers/media/cec/platform/sti/Makefile
diff --git a/drivers/media/platform/sti/cec/stih-cec.c b/drivers/media/cec/platform/sti/stih-cec.c
similarity index 100%
rename from drivers/media/platform/sti/cec/stih-cec.c
rename to drivers/media/cec/platform/sti/stih-cec.c
diff --git a/drivers/media/platform/tegra-cec/Makefile b/drivers/media/cec/platform/tegra/Makefile
similarity index 100%
rename from drivers/media/platform/tegra-cec/Makefile
rename to drivers/media/cec/platform/tegra/Makefile
diff --git a/drivers/media/platform/tegra-cec/tegra_cec.c b/drivers/media/cec/platform/tegra/tegra_cec.c
similarity index 100%
rename from drivers/media/platform/tegra-cec/tegra_cec.c
rename to drivers/media/cec/platform/tegra/tegra_cec.c
diff --git a/drivers/media/platform/tegra-cec/tegra_cec.h b/drivers/media/cec/platform/tegra/tegra_cec.h
similarity index 100%
rename from drivers/media/platform/tegra-cec/tegra_cec.h
rename to drivers/media/cec/platform/tegra/tegra_cec.h
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 3df0d789d452..19282b8343e2 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -556,127 +556,6 @@ menuconfig CEC_PLATFORM_DRIVERS
bool "CEC platform devices"
depends on MEDIA_CEC_SUPPORT
-if CEC_PLATFORM_DRIVERS
-
-config VIDEO_CROS_EC_CEC
- tristate "ChromeOS EC CEC driver"
- depends on CROS_EC
- select CEC_CORE
- select CEC_NOTIFIER
- select CROS_EC_PROTO
- help
- If you say yes here you will get support for the
- ChromeOS Embedded Controller's CEC.
- The CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_MESON_AO_CEC
- tristate "Amlogic Meson AO CEC driver"
- depends on ARCH_MESON || COMPILE_TEST
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for Amlogic Meson SoCs AO CEC interface. It uses the
- generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
-
-config VIDEO_MESON_G12A_AO_CEC
- tristate "Amlogic Meson G12A AO CEC driver"
- depends on ARCH_MESON || COMPILE_TEST
- depends on COMMON_CLK && OF
- select REGMAP
- select REGMAP_MMIO
- select CEC_CORE
- select CEC_NOTIFIER
- ---help---
- This is a driver for Amlogic Meson G12A SoCs AO CEC interface.
- This driver if for the new AO-CEC module found in G12A SoCs,
- usually named AO_CEC_B in documentation.
- It uses the generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config CEC_GPIO
- tristate "Generic GPIO-based CEC driver"
- depends on PREEMPTION || COMPILE_TEST
- select CEC_CORE
- select CEC_PIN
- select CEC_NOTIFIER
- select GPIOLIB
- help
- This is a generic GPIO-based CEC driver.
- The CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_SAMSUNG_S5P_CEC
- tristate "Samsung S5P CEC driver"
- depends on ARCH_EXYNOS || COMPILE_TEST
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for Samsung S5P HDMI CEC interface. It uses the
- generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_STI_HDMI_CEC
- tristate "STMicroelectronics STiH4xx HDMI CEC driver"
- depends on ARCH_STI || COMPILE_TEST
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for STIH4xx HDMI CEC interface. It uses the
- generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_STM32_HDMI_CEC
- tristate "STMicroelectronics STM32 HDMI CEC driver"
- depends on ARCH_STM32 || COMPILE_TEST
- select REGMAP
- select REGMAP_MMIO
- select CEC_CORE
- help
- This is a driver for STM32 interface. It uses the
- generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_TEGRA_HDMI_CEC
- tristate "Tegra HDMI CEC driver"
- depends on ARCH_TEGRA || COMPILE_TEST
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for the Tegra HDMI CEC interface. It uses the
- generic CEC framework interface.
- The CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_SECO_CEC
- tristate "SECO Boards HDMI CEC driver"
- depends on (X86 || IA64) || COMPILE_TEST
- depends on PCI && DMI
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for SECO Boards integrated CEC interface.
- Selecting it will enable support for this device.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_SECO_RC
- bool "SECO Boards IR RC5 support"
- depends on VIDEO_SECO_CEC
- depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC
- help
- If you say yes here you will get support for the
- SECO Boards Consumer-IR in seco-cec driver.
- The embedded controller supports RC5 protocol only, default mapping
- is set to rc-hauppauge.
-
-endif #CEC_PLATFORM_DRIVERS
-
menuconfig SDR_PLATFORM_DRIVERS
bool "SDR platform devices"
depends on MEDIA_SDR_SUPPORT
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index a0194ef1211f..512dcc6e710a 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -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
--
2.25.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] media: move CEC platform drivers to a separate directory
@ 2020-04-15 9:49 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 9:49 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: linux-samsung-soc, Mauro Carvalho Chehab, Krzysztof Kozlowski,
Jonathan Hunter, linux-tegra, Kukjin Kim, Thierry Reding,
Benjamin Gaignard, Hans Verkuil, Ettore Chimenti,
linux-arm-kernel, Marek Szyprowski
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 <mchehab+huawei@kernel.org>
---
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%)
diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig
index 1586dd899302..7b1fb70066bd 100644
--- a/drivers/media/cec/Kconfig
+++ b/drivers/media/cec/Kconfig
@@ -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
diff --git a/drivers/media/cec/Makefile b/drivers/media/cec/Makefile
index 3fdbc22b1530..8c6448bee386 100644
--- a/drivers/media/cec/Makefile
+++ b/drivers/media/cec/Makefile
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
-obj-y += core/
+obj-y += core/ platform/
diff --git a/drivers/media/cec/platform/Kconfig b/drivers/media/cec/platform/Kconfig
new file mode 100644
index 000000000000..6a8bb8b68344
--- /dev/null
+++ b/drivers/media/cec/platform/Kconfig
@@ -0,0 +1,121 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Platform drivers
+
+config VIDEO_CROS_EC_CEC
+ tristate "ChromeOS EC CEC driver"
+ depends on CROS_EC
+ select CEC_CORE
+ select CEC_NOTIFIER
+ select CROS_EC_PROTO
+ help
+ If you say yes here you will get support for the
+ ChromeOS Embedded Controller's CEC.
+ The CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_MESON_AO_CEC
+ tristate "Amlogic Meson AO CEC driver"
+ depends on ARCH_MESON || COMPILE_TEST
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for Amlogic Meson SoCs AO CEC interface. It uses the
+ generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+
+config VIDEO_MESON_G12A_AO_CEC
+ tristate "Amlogic Meson G12A AO CEC driver"
+ depends on ARCH_MESON || COMPILE_TEST
+ depends on COMMON_CLK && OF
+ select REGMAP
+ select REGMAP_MMIO
+ select CEC_CORE
+ select CEC_NOTIFIER
+ ---help---
+ This is a driver for Amlogic Meson G12A SoCs AO CEC interface.
+ This driver if for the new AO-CEC module found in G12A SoCs,
+ usually named AO_CEC_B in documentation.
+ It uses the generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config CEC_GPIO
+ tristate "Generic GPIO-based CEC driver"
+ depends on PREEMPTION || COMPILE_TEST
+ select CEC_CORE
+ select CEC_PIN
+ select CEC_NOTIFIER
+ select GPIOLIB
+ help
+ This is a generic GPIO-based CEC driver.
+ The CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_SAMSUNG_S5P_CEC
+ tristate "Samsung S5P CEC driver"
+ depends on ARCH_EXYNOS || COMPILE_TEST
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for Samsung S5P HDMI CEC interface. It uses the
+ generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_STI_HDMI_CEC
+ tristate "STMicroelectronics STiH4xx HDMI CEC driver"
+ depends on ARCH_STI || COMPILE_TEST
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for STIH4xx HDMI CEC interface. It uses the
+ generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_STM32_HDMI_CEC
+ tristate "STMicroelectronics STM32 HDMI CEC driver"
+ depends on ARCH_STM32 || COMPILE_TEST
+ select REGMAP
+ select REGMAP_MMIO
+ select CEC_CORE
+ help
+ This is a driver for STM32 interface. It uses the
+ generic CEC framework interface.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_TEGRA_HDMI_CEC
+ tristate "Tegra HDMI CEC driver"
+ depends on ARCH_TEGRA || COMPILE_TEST
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for the Tegra HDMI CEC interface. It uses the
+ generic CEC framework interface.
+ The CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_SECO_CEC
+ tristate "SECO Boards HDMI CEC driver"
+ depends on (X86 || IA64) || COMPILE_TEST
+ select PCI
+ select DMI
+ select CEC_CORE
+ select CEC_NOTIFIER
+ help
+ This is a driver for SECO Boards integrated CEC interface.
+ Selecting it will enable support for this device.
+ CEC bus is present in the HDMI connector and enables communication
+ between compatible devices.
+
+config VIDEO_SECO_RC
+ bool "SECO Boards IR RC5 support"
+ depends on VIDEO_SECO_CEC
+ depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC
+ help
+ If you say yes here you will get support for the
+ SECO Boards Consumer-IR in seco-cec driver.
+ The embedded controller supports RC5 protocol only, default mapping
+ is set to rc-hauppauge.
diff --git a/drivers/media/cec/platform/Makefile b/drivers/media/cec/platform/Makefile
new file mode 100644
index 000000000000..3c103fb364ba
--- /dev/null
+++ b/drivers/media/cec/platform/Makefile
@@ -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/
+
diff --git a/drivers/media/platform/cec-gpio/Makefile b/drivers/media/cec/platform/cec-gpio/Makefile
similarity index 100%
rename from drivers/media/platform/cec-gpio/Makefile
rename to drivers/media/cec/platform/cec-gpio/Makefile
diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/cec/platform/cec-gpio/cec-gpio.c
similarity index 100%
rename from drivers/media/platform/cec-gpio/cec-gpio.c
rename to drivers/media/cec/platform/cec-gpio/cec-gpio.c
diff --git a/drivers/media/platform/s5p-cec/Makefile b/drivers/media/cec/platform/s5p/Makefile
similarity index 100%
rename from drivers/media/platform/s5p-cec/Makefile
rename to drivers/media/cec/platform/s5p/Makefile
diff --git a/drivers/media/platform/s5p-cec/exynos_hdmi_cec.h b/drivers/media/cec/platform/s5p/exynos_hdmi_cec.h
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
diff --git a/drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c b/drivers/media/cec/platform/s5p/exynos_hdmi_cecctrl.c
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
diff --git a/drivers/media/platform/s5p-cec/regs-cec.h b/drivers/media/cec/platform/s5p/regs-cec.h
similarity index 100%
rename from drivers/media/platform/s5p-cec/regs-cec.h
rename to drivers/media/cec/platform/s5p/regs-cec.h
diff --git a/drivers/media/platform/s5p-cec/s5p_cec.c b/drivers/media/cec/platform/s5p/s5p_cec.c
similarity index 100%
rename from drivers/media/platform/s5p-cec/s5p_cec.c
rename to drivers/media/cec/platform/s5p/s5p_cec.c
diff --git a/drivers/media/platform/s5p-cec/s5p_cec.h b/drivers/media/cec/platform/s5p/s5p_cec.h
similarity index 100%
rename from drivers/media/platform/s5p-cec/s5p_cec.h
rename to drivers/media/cec/platform/s5p/s5p_cec.h
diff --git a/drivers/media/platform/seco-cec/Makefile b/drivers/media/cec/platform/seco/Makefile
similarity index 100%
rename from drivers/media/platform/seco-cec/Makefile
rename to drivers/media/cec/platform/seco/Makefile
diff --git a/drivers/media/platform/seco-cec/seco-cec.c b/drivers/media/cec/platform/seco/seco-cec.c
similarity index 100%
rename from drivers/media/platform/seco-cec/seco-cec.c
rename to drivers/media/cec/platform/seco/seco-cec.c
diff --git a/drivers/media/platform/seco-cec/seco-cec.h b/drivers/media/cec/platform/seco/seco-cec.h
similarity index 100%
rename from drivers/media/platform/seco-cec/seco-cec.h
rename to drivers/media/cec/platform/seco/seco-cec.h
diff --git a/drivers/media/platform/sti/cec/Makefile b/drivers/media/cec/platform/sti/Makefile
similarity index 100%
rename from drivers/media/platform/sti/cec/Makefile
rename to drivers/media/cec/platform/sti/Makefile
diff --git a/drivers/media/platform/sti/cec/stih-cec.c b/drivers/media/cec/platform/sti/stih-cec.c
similarity index 100%
rename from drivers/media/platform/sti/cec/stih-cec.c
rename to drivers/media/cec/platform/sti/stih-cec.c
diff --git a/drivers/media/platform/tegra-cec/Makefile b/drivers/media/cec/platform/tegra/Makefile
similarity index 100%
rename from drivers/media/platform/tegra-cec/Makefile
rename to drivers/media/cec/platform/tegra/Makefile
diff --git a/drivers/media/platform/tegra-cec/tegra_cec.c b/drivers/media/cec/platform/tegra/tegra_cec.c
similarity index 100%
rename from drivers/media/platform/tegra-cec/tegra_cec.c
rename to drivers/media/cec/platform/tegra/tegra_cec.c
diff --git a/drivers/media/platform/tegra-cec/tegra_cec.h b/drivers/media/cec/platform/tegra/tegra_cec.h
similarity index 100%
rename from drivers/media/platform/tegra-cec/tegra_cec.h
rename to drivers/media/cec/platform/tegra/tegra_cec.h
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 3df0d789d452..19282b8343e2 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -556,127 +556,6 @@ menuconfig CEC_PLATFORM_DRIVERS
bool "CEC platform devices"
depends on MEDIA_CEC_SUPPORT
-if CEC_PLATFORM_DRIVERS
-
-config VIDEO_CROS_EC_CEC
- tristate "ChromeOS EC CEC driver"
- depends on CROS_EC
- select CEC_CORE
- select CEC_NOTIFIER
- select CROS_EC_PROTO
- help
- If you say yes here you will get support for the
- ChromeOS Embedded Controller's CEC.
- The CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_MESON_AO_CEC
- tristate "Amlogic Meson AO CEC driver"
- depends on ARCH_MESON || COMPILE_TEST
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for Amlogic Meson SoCs AO CEC interface. It uses the
- generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
-
-config VIDEO_MESON_G12A_AO_CEC
- tristate "Amlogic Meson G12A AO CEC driver"
- depends on ARCH_MESON || COMPILE_TEST
- depends on COMMON_CLK && OF
- select REGMAP
- select REGMAP_MMIO
- select CEC_CORE
- select CEC_NOTIFIER
- ---help---
- This is a driver for Amlogic Meson G12A SoCs AO CEC interface.
- This driver if for the new AO-CEC module found in G12A SoCs,
- usually named AO_CEC_B in documentation.
- It uses the generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config CEC_GPIO
- tristate "Generic GPIO-based CEC driver"
- depends on PREEMPTION || COMPILE_TEST
- select CEC_CORE
- select CEC_PIN
- select CEC_NOTIFIER
- select GPIOLIB
- help
- This is a generic GPIO-based CEC driver.
- The CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_SAMSUNG_S5P_CEC
- tristate "Samsung S5P CEC driver"
- depends on ARCH_EXYNOS || COMPILE_TEST
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for Samsung S5P HDMI CEC interface. It uses the
- generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_STI_HDMI_CEC
- tristate "STMicroelectronics STiH4xx HDMI CEC driver"
- depends on ARCH_STI || COMPILE_TEST
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for STIH4xx HDMI CEC interface. It uses the
- generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_STM32_HDMI_CEC
- tristate "STMicroelectronics STM32 HDMI CEC driver"
- depends on ARCH_STM32 || COMPILE_TEST
- select REGMAP
- select REGMAP_MMIO
- select CEC_CORE
- help
- This is a driver for STM32 interface. It uses the
- generic CEC framework interface.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_TEGRA_HDMI_CEC
- tristate "Tegra HDMI CEC driver"
- depends on ARCH_TEGRA || COMPILE_TEST
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for the Tegra HDMI CEC interface. It uses the
- generic CEC framework interface.
- The CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_SECO_CEC
- tristate "SECO Boards HDMI CEC driver"
- depends on (X86 || IA64) || COMPILE_TEST
- depends on PCI && DMI
- select CEC_CORE
- select CEC_NOTIFIER
- help
- This is a driver for SECO Boards integrated CEC interface.
- Selecting it will enable support for this device.
- CEC bus is present in the HDMI connector and enables communication
- between compatible devices.
-
-config VIDEO_SECO_RC
- bool "SECO Boards IR RC5 support"
- depends on VIDEO_SECO_CEC
- depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC
- help
- If you say yes here you will get support for the
- SECO Boards Consumer-IR in seco-cec driver.
- The embedded controller supports RC5 protocol only, default mapping
- is set to rc-hauppauge.
-
-endif #CEC_PLATFORM_DRIVERS
-
menuconfig SDR_PLATFORM_DRIVERS
bool "SDR platform devices"
depends on MEDIA_SDR_SUPPORT
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index a0194ef1211f..512dcc6e710a 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -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
--
2.25.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] media: move CEC USB drivers to a separate directory
2020-04-15 9:49 ` Mauro Carvalho Chehab
` (4 preceding siblings ...)
(?)
@ 2020-04-15 9:49 ` Mauro Carvalho Chehab
-1 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 9:49 UTC (permalink / raw)
To: Linux Media Mailing List; +Cc: Mauro Carvalho Chehab, Hans Verkuil
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 <mchehab+huawei@kernel.org>
---
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%)
diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig
index 7b1fb70066bd..eea74b7cfa8c 100644
--- a/drivers/media/cec/Kconfig
+++ b/drivers/media/cec/Kconfig
@@ -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
diff --git a/drivers/media/cec/Makefile b/drivers/media/cec/Makefile
index 8c6448bee386..74e80e1b3571 100644
--- a/drivers/media/cec/Makefile
+++ b/drivers/media/cec/Makefile
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
-obj-y += core/ platform/
+obj-y += core/ platform/ usb/
diff --git a/drivers/media/cec/usb/Kconfig b/drivers/media/cec/usb/Kconfig
new file mode 100644
index 000000000000..d3bbef464bdb
--- /dev/null
+++ b/drivers/media/cec/usb/Kconfig
@@ -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"
diff --git a/drivers/media/cec/usb/Makefile b/drivers/media/cec/usb/Makefile
new file mode 100644
index 000000000000..e4183d1bfa9a
--- /dev/null
+++ b/drivers/media/cec/usb/Makefile
@@ -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/
diff --git a/drivers/media/usb/pulse8-cec/Kconfig b/drivers/media/cec/usb/pulse8/Kconfig
similarity index 91%
rename from drivers/media/usb/pulse8-cec/Kconfig
rename to drivers/media/cec/usb/pulse8/Kconfig
index e802d30dbbee..a0224ef80e6c 100644
--- a/drivers/media/usb/pulse8-cec/Kconfig
+++ b/drivers/media/cec/usb/pulse8/Kconfig
@@ -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
diff --git a/drivers/media/usb/pulse8-cec/Makefile b/drivers/media/cec/usb/pulse8/Makefile
similarity index 100%
rename from drivers/media/usb/pulse8-cec/Makefile
rename to drivers/media/cec/usb/pulse8/Makefile
diff --git a/drivers/media/usb/pulse8-cec/pulse8-cec.c b/drivers/media/cec/usb/pulse8/pulse8-cec.c
similarity index 100%
rename from drivers/media/usb/pulse8-cec/pulse8-cec.c
rename to drivers/media/cec/usb/pulse8/pulse8-cec.c
diff --git a/drivers/media/usb/rainshadow-cec/Kconfig b/drivers/media/cec/usb/rainshadow/Kconfig
similarity index 92%
rename from drivers/media/usb/rainshadow-cec/Kconfig
rename to drivers/media/cec/usb/rainshadow/Kconfig
index b481c5157d7e..c9ef2c192b17 100644
--- a/drivers/media/usb/rainshadow-cec/Kconfig
+++ b/drivers/media/cec/usb/rainshadow/Kconfig
@@ -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
diff --git a/drivers/media/usb/rainshadow-cec/Makefile b/drivers/media/cec/usb/rainshadow/Makefile
similarity index 100%
rename from drivers/media/usb/rainshadow-cec/Makefile
rename to drivers/media/cec/usb/rainshadow/Makefile
diff --git a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c b/drivers/media/cec/usb/rainshadow/rainshadow-cec.c
similarity index 100%
rename from drivers/media/usb/rainshadow-cec/rainshadow-cec.c
rename to drivers/media/cec/usb/rainshadow/rainshadow-cec.c
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index bf08393e38d1..00feadb217d8 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -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
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 169aa07c97bd..3eaff3149ef4 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -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/
--
2.25.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/4] media: place CEC menu before MEDIA_SUPPORT
2020-04-15 9:49 ` [PATCH 2/4] media: place CEC menu before MEDIA_SUPPORT Mauro Carvalho Chehab
@ 2020-04-28 14:06 ` Geert Uytterhoeven
0 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2020-04-28 14:06 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Linux Media Mailing List, Hans Verkuil, linux-kernel
Hi Mauro,
On Wed, 15 Apr 2020, Mauro Carvalho Chehab wrote:
> 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 <mchehab+huawei@kernel.org>
Thanks for your patch, which is now commit 46d2a3b964ddbe63 ("media:
place CEC menu before MEDIA_SUPPORT") in media/master.
> --- a/drivers/media/cec/Kconfig
> +++ b/drivers/media/cec/Kconfig
> @@ -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...
> + 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?
> + 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 -- geert@linux-m68k.org
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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-04-28 14:11 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-15 9:49 [PATCH 0/4] Move CEC drivers and menu to be out of MEDIA_SUPPORT Mauro Carvalho Chehab
2020-04-15 9:49 ` Mauro Carvalho Chehab
2020-04-15 9:49 ` Mauro Carvalho Chehab
2020-04-15 9:49 ` [PATCH 1/4] media: cec: move the core to a separate directory Mauro Carvalho Chehab
2020-04-15 9:49 ` [PATCH 2/4] media: place CEC menu before MEDIA_SUPPORT Mauro Carvalho Chehab
2020-04-28 14:06 ` Geert Uytterhoeven
2020-04-15 9:49 ` [PATCH 3/4] media: move CEC platform drivers to a separate directory Mauro Carvalho Chehab
2020-04-15 9:49 ` Mauro Carvalho Chehab
2020-04-15 9:49 ` [PATCH 4/4] media: move CEC USB " Mauro Carvalho Chehab
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.