* [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT
@ 2020-04-15 10:31 Mauro Carvalho Chehab
2020-04-15 10:31 ` [PATCH v2 3/6] media: move CEC platform drivers to a separate directory Mauro Carvalho Chehab
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 10:31 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Neil Armstrong, Ettore Chimenti, Thierry Reding,
Benjamin Gaignard, Guenter Roeck, linux-stm32, Marek Szyprowski,
linux-samsung-soc, Mauro Carvalho Chehab, Kevin Hilman,
Russell King, Krzysztof Kozlowski, Jonathan Hunter, Kukjin Kim,
Alexandre Torgue, Hans Verkuil, linux-tegra, linux-amlogic,
Benson Leung, linux-arm-kernel, Maxime Coquelin,
Enric Balletbo i Serra
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.
- v2:
- move more CEC drivers from platform/
- rename kconfig options to be more coherent
Mauro Carvalho Chehab (6):
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
media: cec: rename CEC platform drivers config options
media: cec: rename USB config options
arch/arm/configs/exynos_defconfig | 2 +-
arch/arm/configs/multi_v7_defconfig | 2 +-
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 | 14 ++
.../{ => cec}/platform/cec-gpio/Makefile | 0
.../{ => cec}/platform/cec-gpio/cec-gpio.c | 0
drivers/media/cec/platform/cros-ec/Makefile | 2 +
.../platform/cros-ec}/cros-ec-cec.c | 0
drivers/media/cec/platform/meson/Makefile | 3 +
.../{ => cec}/platform/meson/ao-cec-g12a.c | 0
.../media/{ => cec}/platform/meson/ao-cec.c | 0
.../s5p-cec => cec/platform/s5p}/Makefile | 2 +-
.../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
drivers/media/cec/platform/seco/Makefile | 2 +
.../seco-cec => cec/platform/seco}/seco-cec.c | 2 +-
.../seco-cec => cec/platform/seco}/seco-cec.h | 0
drivers/media/cec/platform/sti/Makefile | 2 +
.../sti/cec => cec/platform/sti}/stih-cec.c | 0
drivers/media/cec/platform/stm32/Makefile | 2 +
.../{ => cec}/platform/stm32/stm32-cec.c | 0
drivers/media/cec/platform/tegra/Makefile | 2 +
.../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 | 5 +-
drivers/media/cec/usb/pulse8/Makefile | 2 +
.../usb/pulse8}/pulse8-cec.c | 0
.../usb/rainshadow}/Kconfig | 5 +-
drivers/media/cec/usb/rainshadow/Makefile | 2 +
.../usb/rainshadow}/rainshadow-cec.c | 0
drivers/media/platform/Kconfig | 125 ------------------
drivers/media/platform/Makefile | 12 --
drivers/media/platform/cros-ec-cec/Makefile | 2 -
drivers/media/platform/meson/Makefile | 3 -
drivers/media/platform/seco-cec/Makefile | 2 -
drivers/media/platform/sti/cec/Makefile | 2 -
drivers/media/platform/stm32/Makefile | 1 -
drivers/media/platform/tegra-cec/Makefile | 2 -
drivers/media/usb/Kconfig | 6 -
drivers/media/usb/Makefile | 2 -
drivers/media/usb/pulse8-cec/Makefile | 2 -
drivers/media/usb/rainshadow-cec/Makefile | 2 -
59 files changed, 218 insertions(+), 212 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%)
create mode 100644 drivers/media/cec/platform/cros-ec/Makefile
rename drivers/media/{platform/cros-ec-cec => cec/platform/cros-ec}/cros-ec-cec.c (100%)
create mode 100644 drivers/media/cec/platform/meson/Makefile
rename drivers/media/{ => cec}/platform/meson/ao-cec-g12a.c (100%)
rename drivers/media/{ => cec}/platform/meson/ao-cec.c (100%)
rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/Makefile (63%)
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%)
create mode 100644 drivers/media/cec/platform/seco/Makefile
rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.c (99%)
rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.h (100%)
create mode 100644 drivers/media/cec/platform/sti/Makefile
rename drivers/media/{platform/sti/cec => cec/platform/sti}/stih-cec.c (100%)
create mode 100644 drivers/media/cec/platform/stm32/Makefile
rename drivers/media/{ => cec}/platform/stm32/stm32-cec.c (100%)
create mode 100644 drivers/media/cec/platform/tegra/Makefile
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 (86%)
create mode 100644 drivers/media/cec/usb/pulse8/Makefile
rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/pulse8-cec.c (100%)
rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Kconfig (85%)
create mode 100644 drivers/media/cec/usb/rainshadow/Makefile
rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/rainshadow-cec.c (100%)
delete mode 100644 drivers/media/platform/cros-ec-cec/Makefile
delete mode 100644 drivers/media/platform/meson/Makefile
delete mode 100644 drivers/media/platform/seco-cec/Makefile
delete mode 100644 drivers/media/platform/sti/cec/Makefile
delete mode 100644 drivers/media/platform/tegra-cec/Makefile
delete mode 100644 drivers/media/usb/pulse8-cec/Makefile
delete mode 100644 drivers/media/usb/rainshadow-cec/Makefile
--
2.25.2
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 3/6] media: move CEC platform drivers to a separate directory
2020-04-15 10:31 [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT Mauro Carvalho Chehab
@ 2020-04-15 10:31 ` Mauro Carvalho Chehab
2020-04-15 21:11 ` Ettore Chimenti
2020-04-16 9:46 ` Geert Uytterhoeven
2020-04-15 10:31 ` [PATCH v2 5/6] media: cec: rename CEC platform drivers config options Mauro Carvalho Chehab
` (3 subsequent siblings)
4 siblings, 2 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 10:31 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Enric Balletbo i Serra, Benjamin Gaignard, linux-samsung-soc,
linux-tegra, Alexandre Torgue, Neil Armstrong,
Mauro Carvalho Chehab, Kevin Hilman, Krzysztof Kozlowski,
Jonathan Hunter, Guenter Roeck, Kukjin Kim, Thierry Reding,
Maxime Coquelin, Hans Verkuil, linux-amlogic, Ettore Chimenti,
Benson Leung, linux-stm32, 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 | 14 ++
.../{ => cec}/platform/cec-gpio/Makefile | 0
.../{ => cec}/platform/cec-gpio/cec-gpio.c | 0
.../platform/cros-ec}/Makefile | 0
.../platform/cros-ec}/cros-ec-cec.c | 0
.../media/{ => cec}/platform/meson/Makefile | 0
.../{ => cec}/platform/meson/ao-cec-g12a.c | 0
.../media/{ => cec}/platform/meson/ao-cec.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
drivers/media/cec/platform/stm32/Makefile | 2 +
.../{ => cec}/platform/stm32/stm32-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 | 125 ------------------
drivers/media/platform/Makefile | 12 --
drivers/media/platform/stm32/Makefile | 1 -
30 files changed, 143 insertions(+), 140 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/cros-ec-cec => cec/platform/cros-ec}/Makefile (100%)
rename drivers/media/{platform/cros-ec-cec => cec/platform/cros-ec}/cros-ec-cec.c (100%)
rename drivers/media/{ => cec}/platform/meson/Makefile (100%)
rename drivers/media/{ => cec}/platform/meson/ao-cec-g12a.c (100%)
rename drivers/media/{ => cec}/platform/meson/ao-cec.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%)
create mode 100644 drivers/media/cec/platform/stm32/Makefile
rename drivers/media/{ => cec}/platform/stm32/stm32-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..e5fb5d383e5c
--- /dev/null
+++ b/drivers/media/cec/platform/Makefile
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for the CEC platform device drivers.
+#
+
+obj-$(CONFIG_CEC_GPIO) += cec-gpio/
+
+obj-$(CONFIG_VIDEO_CROS_EC_CEC) += cros-ec/
+obj-$(CONFIG_VIDEO_MESON_AO_CEC) += meson/
+obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p/
+obj-$(CONFIG_VIDEO_SECO_CEC) += seco/
+obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += sti/
+obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra/
+
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/cros-ec-cec/Makefile b/drivers/media/cec/platform/cros-ec/Makefile
similarity index 100%
rename from drivers/media/platform/cros-ec-cec/Makefile
rename to drivers/media/cec/platform/cros-ec/Makefile
diff --git a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
similarity index 100%
rename from drivers/media/platform/cros-ec-cec/cros-ec-cec.c
rename to drivers/media/cec/platform/cros-ec/cros-ec-cec.c
diff --git a/drivers/media/platform/meson/Makefile b/drivers/media/cec/platform/meson/Makefile
similarity index 100%
rename from drivers/media/platform/meson/Makefile
rename to drivers/media/cec/platform/meson/Makefile
diff --git a/drivers/media/platform/meson/ao-cec-g12a.c b/drivers/media/cec/platform/meson/ao-cec-g12a.c
similarity index 100%
rename from drivers/media/platform/meson/ao-cec-g12a.c
rename to drivers/media/cec/platform/meson/ao-cec-g12a.c
diff --git a/drivers/media/platform/meson/ao-cec.c b/drivers/media/cec/platform/meson/ao-cec.c
similarity index 100%
rename from drivers/media/platform/meson/ao-cec.c
rename to drivers/media/cec/platform/meson/ao-cec.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/cec/platform/stm32/Makefile b/drivers/media/cec/platform/stm32/Makefile
new file mode 100644
index 000000000000..5c89dbce0f67
--- /dev/null
+++ b/drivers/media/cec/platform/stm32/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_VIDEO_STM32_HDMI_CEC) += stm32-cec.o
diff --git a/drivers/media/platform/stm32/stm32-cec.c b/drivers/media/cec/platform/stm32/stm32-cec.c
similarity index 100%
rename from drivers/media/platform/stm32/stm32-cec.c
rename to drivers/media/cec/platform/stm32/stm32-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..b1ac9c6c9cdb 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -552,131 +552,6 @@ if DVB_PLATFORM_DRIVERS
source "drivers/media/platform/sti/c8sectpfe/Kconfig"
endif #DVB_PLATFORM_DRIVERS
-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..ac31d4748869 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
@@ -89,8 +81,4 @@ obj-$(CONFIG_VIDEO_QCOM_CAMSS) += qcom/camss/
obj-$(CONFIG_VIDEO_QCOM_VENUS) += qcom/venus/
-obj-y += meson/
-
-obj-y += cros-ec-cec/
-
obj-y += sunxi/
diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/stm32/Makefile
index 5ed73599ca44..48b36db2c2e2 100644
--- a/drivers/media/platform/stm32/Makefile
+++ b/drivers/media/platform/stm32/Makefile
@@ -1,3 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_VIDEO_STM32_DCMI) += stm32-dcmi.o
-obj-$(CONFIG_VIDEO_STM32_HDMI_CEC) += stm32-cec.o
--
2.25.2
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 5/6] media: cec: rename CEC platform drivers config options
2020-04-15 10:31 [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT Mauro Carvalho Chehab
2020-04-15 10:31 ` [PATCH v2 3/6] media: move CEC platform drivers to a separate directory Mauro Carvalho Chehab
@ 2020-04-15 10:31 ` Mauro Carvalho Chehab
2020-04-15 11:09 ` [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT Hans Verkuil
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2020-04-15 10:31 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: linux-samsung-soc, linux-tegra, Alexandre Torgue,
Mauro Carvalho Chehab, Kevin Hilman, Russell King,
Krzysztof Kozlowski, Jonathan Hunter, Enric Balletbo i Serra,
Kukjin Kim, Thierry Reding, Maxime Coquelin, Hans Verkuil,
linux-amlogic, Guenter Roeck, Benson Leung, linux-stm32,
linux-arm-kernel
Most CEC platform drivers are using VIDEO_*_CEC pattern, some with
an _HDMI extension too.
Well, they're not related to V4L2 support, and we don't really
need those big config names. So drop VIDEO_* from them, remove
_HDMI (if present) and move CEC to the start.
This way, all platform driver options are now CEC_<driver>.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
arch/arm/configs/exynos_defconfig | 2 +-
arch/arm/configs/multi_v7_defconfig | 2 +-
drivers/media/cec/platform/Kconfig | 22 ++++++++++-----------
drivers/media/cec/platform/Makefile | 16 +++++++--------
drivers/media/cec/platform/cros-ec/Makefile | 2 +-
drivers/media/cec/platform/meson/Makefile | 4 ++--
drivers/media/cec/platform/s5p/Makefile | 2 +-
drivers/media/cec/platform/seco/Makefile | 2 +-
drivers/media/cec/platform/seco/seco-cec.c | 2 +-
drivers/media/cec/platform/sti/Makefile | 2 +-
drivers/media/cec/platform/stm32/Makefile | 2 +-
drivers/media/cec/platform/tegra/Makefile | 2 +-
12 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 3c3a00fc71f6..2c779ac13270 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -207,7 +207,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VIDEO_VIVID=m
CONFIG_CEC_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
+CONFIG_CEC_SAMSUNG_S5P=m
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_S5K6A3=m
CONFIG_VIDEO_S5C73M3=m
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index f8e45351c3f9..9c86b1ab2f1d 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -638,7 +638,7 @@ CONFIG_VIDEO_RENESAS_VSP1=m
CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VIDEO_VIVID=m
CONFIG_CEC_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
+CONFIG_CEC_SAMSUNG_S5P=m
CONFIG_VIDEO_ADV7180=m
CONFIG_VIDEO_ML86V7667=m
CONFIG_IMX_IPUV3_CORE=m
diff --git a/drivers/media/cec/platform/Kconfig b/drivers/media/cec/platform/Kconfig
index 6a8bb8b68344..2c4dd7401dd8 100644
--- a/drivers/media/cec/platform/Kconfig
+++ b/drivers/media/cec/platform/Kconfig
@@ -2,7 +2,7 @@
#
# Platform drivers
-config VIDEO_CROS_EC_CEC
+config CEC_CROS_EC
tristate "ChromeOS EC CEC driver"
depends on CROS_EC
select CEC_CORE
@@ -14,7 +14,7 @@ config VIDEO_CROS_EC_CEC
The CEC bus is present in the HDMI connector and enables communication
between compatible devices.
-config VIDEO_MESON_AO_CEC
+config CEC_MESON_AO
tristate "Amlogic Meson AO CEC driver"
depends on ARCH_MESON || COMPILE_TEST
select CEC_CORE
@@ -24,7 +24,7 @@ config VIDEO_MESON_AO_CEC
generic CEC framework interface.
CEC bus is present in the HDMI connector and enables communication
-config VIDEO_MESON_G12A_AO_CEC
+config CEC_MESON_G12A_AO
tristate "Amlogic Meson G12A AO CEC driver"
depends on ARCH_MESON || COMPILE_TEST
depends on COMMON_CLK && OF
@@ -52,7 +52,7 @@ config CEC_GPIO
The CEC bus is present in the HDMI connector and enables communication
between compatible devices.
-config VIDEO_SAMSUNG_S5P_CEC
+config CEC_SAMSUNG_S5P
tristate "Samsung S5P CEC driver"
depends on ARCH_EXYNOS || COMPILE_TEST
select CEC_CORE
@@ -63,7 +63,7 @@ config VIDEO_SAMSUNG_S5P_CEC
CEC bus is present in the HDMI connector and enables communication
between compatible devices.
-config VIDEO_STI_HDMI_CEC
+config CEC_STI
tristate "STMicroelectronics STiH4xx HDMI CEC driver"
depends on ARCH_STI || COMPILE_TEST
select CEC_CORE
@@ -74,7 +74,7 @@ config VIDEO_STI_HDMI_CEC
CEC bus is present in the HDMI connector and enables communication
between compatible devices.
-config VIDEO_STM32_HDMI_CEC
+config CEC_STM32
tristate "STMicroelectronics STM32 HDMI CEC driver"
depends on ARCH_STM32 || COMPILE_TEST
select REGMAP
@@ -86,7 +86,7 @@ config VIDEO_STM32_HDMI_CEC
CEC bus is present in the HDMI connector and enables communication
between compatible devices.
-config VIDEO_TEGRA_HDMI_CEC
+config CEC_TEGRA
tristate "Tegra HDMI CEC driver"
depends on ARCH_TEGRA || COMPILE_TEST
select CEC_CORE
@@ -97,7 +97,7 @@ config VIDEO_TEGRA_HDMI_CEC
The CEC bus is present in the HDMI connector and enables communication
between compatible devices.
-config VIDEO_SECO_CEC
+config CEC_SECO
tristate "SECO Boards HDMI CEC driver"
depends on (X86 || IA64) || COMPILE_TEST
select PCI
@@ -110,10 +110,10 @@ config VIDEO_SECO_CEC
CEC bus is present in the HDMI connector and enables communication
between compatible devices.
-config VIDEO_SECO_RC
+config CEC_SECO_RC
bool "SECO Boards IR RC5 support"
- depends on VIDEO_SECO_CEC
- depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC
+ depends on CEC_SECO
+ depends on RC_CORE=y || RC_CORE = CEC_SECO
help
If you say yes here you will get support for the
SECO Boards Consumer-IR in seco-cec driver.
diff --git a/drivers/media/cec/platform/Makefile b/drivers/media/cec/platform/Makefile
index e5fb5d383e5c..3a947159b25a 100644
--- a/drivers/media/cec/platform/Makefile
+++ b/drivers/media/cec/platform/Makefile
@@ -3,12 +3,12 @@
# Makefile for the CEC platform device drivers.
#
-obj-$(CONFIG_CEC_GPIO) += cec-gpio/
-
-obj-$(CONFIG_VIDEO_CROS_EC_CEC) += cros-ec/
-obj-$(CONFIG_VIDEO_MESON_AO_CEC) += meson/
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p/
-obj-$(CONFIG_VIDEO_SECO_CEC) += seco/
-obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += sti/
-obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra/
+# Please keep it in alphabetic order
+obj-$(CONFIG_CEC_CROS_EC) += cros-ec/
+obj-$(CONFIG_CEC_GPIO) += cec-gpio/
+obj-$(CONFIG_CEC_MESON_AO) += meson/
+obj-$(CONFIG_CEC_SAMSUNG_S5P) += s5p/
+obj-$(CONFIG_CEC_SECO) += seco/
+obj-$(CONFIG_CEC_STI) += sti/
+obj-$(CONFIG_CEC_TEGRA) += tegra/
diff --git a/drivers/media/cec/platform/cros-ec/Makefile b/drivers/media/cec/platform/cros-ec/Makefile
index 2615cdc6e227..d7e3511078ef 100644
--- a/drivers/media/cec/platform/cros-ec/Makefile
+++ b/drivers/media/cec/platform/cros-ec/Makefile
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_VIDEO_CROS_EC_CEC) += cros-ec-cec.o
+obj-$(CONFIG_CEC_CROS_EC) += cros-ec-cec.o
diff --git a/drivers/media/cec/platform/meson/Makefile b/drivers/media/cec/platform/meson/Makefile
index 6bf728addbf8..34fc5d444d0e 100644
--- a/drivers/media/cec/platform/meson/Makefile
+++ b/drivers/media/cec/platform/meson/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_VIDEO_MESON_AO_CEC) += ao-cec.o
-obj-$(CONFIG_VIDEO_MESON_G12A_AO_CEC) += ao-cec-g12a.o
+obj-$(CONFIG_CEC_MESON_AO) += ao-cec.o
+obj-$(CONFIG_CEC_MESON_G12A_AO) += ao-cec-g12a.o
diff --git a/drivers/media/cec/platform/s5p/Makefile b/drivers/media/cec/platform/s5p/Makefile
index bd0103b91bee..92bf7b8557c5 100644
--- a/drivers/media/cec/platform/s5p/Makefile
+++ b/drivers/media/cec/platform/s5p/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec.o
+obj-$(CONFIG_CEC_SAMSUNG_S5P) += s5p-cec.o
s5p-cec-y += s5p_cec.o exynos_hdmi_cecctrl.o
diff --git a/drivers/media/cec/platform/seco/Makefile b/drivers/media/cec/platform/seco/Makefile
index 79fde6947ff2..aa1ca8ccdb8b 100644
--- a/drivers/media/cec/platform/seco/Makefile
+++ b/drivers/media/cec/platform/seco/Makefile
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_VIDEO_SECO_CEC) += seco-cec.o
+obj-$(CONFIG_CEC_SECO) += seco-cec.o
diff --git a/drivers/media/cec/platform/seco/seco-cec.c b/drivers/media/cec/platform/seco/seco-cec.c
index 2ff62a488b27..075dd79beb6f 100644
--- a/drivers/media/cec/platform/seco/seco-cec.c
+++ b/drivers/media/cec/platform/seco/seco-cec.c
@@ -343,7 +343,7 @@ static const struct cec_adap_ops secocec_cec_adap_ops = {
.adap_transmit = secocec_adap_transmit,
};
-#ifdef CONFIG_VIDEO_SECO_RC
+#ifdef CONFIG_CEC_SECO_RC
static int secocec_ir_probe(void *priv)
{
struct secocec_data *cec = priv;
diff --git a/drivers/media/cec/platform/sti/Makefile b/drivers/media/cec/platform/sti/Makefile
index d0c6b4ae94d6..26ec5ba1c633 100644
--- a/drivers/media/cec/platform/sti/Makefile
+++ b/drivers/media/cec/platform/sti/Makefile
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += stih-cec.o
+obj-$(CONFIG_CEC_STI) += stih-cec.o
diff --git a/drivers/media/cec/platform/stm32/Makefile b/drivers/media/cec/platform/stm32/Makefile
index 5c89dbce0f67..b7597a00befa 100644
--- a/drivers/media/cec/platform/stm32/Makefile
+++ b/drivers/media/cec/platform/stm32/Makefile
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_VIDEO_STM32_HDMI_CEC) += stm32-cec.o
+obj-$(CONFIG_CEC_STM32) += stm32-cec.o
diff --git a/drivers/media/cec/platform/tegra/Makefile b/drivers/media/cec/platform/tegra/Makefile
index 97e57c7493c0..275d1c019d49 100644
--- a/drivers/media/cec/platform/tegra/Makefile
+++ b/drivers/media/cec/platform/tegra/Makefile
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra_cec.o
+obj-$(CONFIG_CEC_TEGRA) += tegra_cec.o
--
2.25.2
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT
2020-04-15 10:31 [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT Mauro Carvalho Chehab
2020-04-15 10:31 ` [PATCH v2 3/6] media: move CEC platform drivers to a separate directory Mauro Carvalho Chehab
2020-04-15 10:31 ` [PATCH v2 5/6] media: cec: rename CEC platform drivers config options Mauro Carvalho Chehab
@ 2020-04-15 11:09 ` Hans Verkuil
2020-04-15 11:42 ` Neil Armstrong
2020-04-15 12:11 ` Benjamin Gaignard
4 siblings, 0 replies; 8+ messages in thread
From: Hans Verkuil @ 2020-04-15 11:09 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Linux Media Mailing List
Cc: Maxime Coquelin, linux-samsung-soc, Alexandre Torgue,
Neil Armstrong, Kevin Hilman, Enric Balletbo i Serra,
Russell King, Krzysztof Kozlowski, Ettore Chimenti, linux-tegra,
Kukjin Kim, Thierry Reding, Benjamin Gaignard, Guenter Roeck,
linux-amlogic, Jonathan Hunter, Benson Leung, linux-stm32,
linux-arm-kernel, Marek Szyprowski
On 15/04/2020 12:31, Mauro Carvalho Chehab wrote:
> 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.
For this series:
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Thanks!
Hans
>
> - v2:
> - move more CEC drivers from platform/
> - rename kconfig options to be more coherent
>
> Mauro Carvalho Chehab (6):
> 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
> media: cec: rename CEC platform drivers config options
> media: cec: rename USB config options
>
> arch/arm/configs/exynos_defconfig | 2 +-
> arch/arm/configs/multi_v7_defconfig | 2 +-
> 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 | 14 ++
> .../{ => cec}/platform/cec-gpio/Makefile | 0
> .../{ => cec}/platform/cec-gpio/cec-gpio.c | 0
> drivers/media/cec/platform/cros-ec/Makefile | 2 +
> .../platform/cros-ec}/cros-ec-cec.c | 0
> drivers/media/cec/platform/meson/Makefile | 3 +
> .../{ => cec}/platform/meson/ao-cec-g12a.c | 0
> .../media/{ => cec}/platform/meson/ao-cec.c | 0
> .../s5p-cec => cec/platform/s5p}/Makefile | 2 +-
> .../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
> drivers/media/cec/platform/seco/Makefile | 2 +
> .../seco-cec => cec/platform/seco}/seco-cec.c | 2 +-
> .../seco-cec => cec/platform/seco}/seco-cec.h | 0
> drivers/media/cec/platform/sti/Makefile | 2 +
> .../sti/cec => cec/platform/sti}/stih-cec.c | 0
> drivers/media/cec/platform/stm32/Makefile | 2 +
> .../{ => cec}/platform/stm32/stm32-cec.c | 0
> drivers/media/cec/platform/tegra/Makefile | 2 +
> .../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 | 5 +-
> drivers/media/cec/usb/pulse8/Makefile | 2 +
> .../usb/pulse8}/pulse8-cec.c | 0
> .../usb/rainshadow}/Kconfig | 5 +-
> drivers/media/cec/usb/rainshadow/Makefile | 2 +
> .../usb/rainshadow}/rainshadow-cec.c | 0
> drivers/media/platform/Kconfig | 125 ------------------
> drivers/media/platform/Makefile | 12 --
> drivers/media/platform/cros-ec-cec/Makefile | 2 -
> drivers/media/platform/meson/Makefile | 3 -
> drivers/media/platform/seco-cec/Makefile | 2 -
> drivers/media/platform/sti/cec/Makefile | 2 -
> drivers/media/platform/stm32/Makefile | 1 -
> drivers/media/platform/tegra-cec/Makefile | 2 -
> drivers/media/usb/Kconfig | 6 -
> drivers/media/usb/Makefile | 2 -
> drivers/media/usb/pulse8-cec/Makefile | 2 -
> drivers/media/usb/rainshadow-cec/Makefile | 2 -
> 59 files changed, 218 insertions(+), 212 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%)
> create mode 100644 drivers/media/cec/platform/cros-ec/Makefile
> rename drivers/media/{platform/cros-ec-cec => cec/platform/cros-ec}/cros-ec-cec.c (100%)
> create mode 100644 drivers/media/cec/platform/meson/Makefile
> rename drivers/media/{ => cec}/platform/meson/ao-cec-g12a.c (100%)
> rename drivers/media/{ => cec}/platform/meson/ao-cec.c (100%)
> rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/Makefile (63%)
> 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%)
> create mode 100644 drivers/media/cec/platform/seco/Makefile
> rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.c (99%)
> rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.h (100%)
> create mode 100644 drivers/media/cec/platform/sti/Makefile
> rename drivers/media/{platform/sti/cec => cec/platform/sti}/stih-cec.c (100%)
> create mode 100644 drivers/media/cec/platform/stm32/Makefile
> rename drivers/media/{ => cec}/platform/stm32/stm32-cec.c (100%)
> create mode 100644 drivers/media/cec/platform/tegra/Makefile
> 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 (86%)
> create mode 100644 drivers/media/cec/usb/pulse8/Makefile
> rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/pulse8-cec.c (100%)
> rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Kconfig (85%)
> create mode 100644 drivers/media/cec/usb/rainshadow/Makefile
> rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/rainshadow-cec.c (100%)
> delete mode 100644 drivers/media/platform/cros-ec-cec/Makefile
> delete mode 100644 drivers/media/platform/meson/Makefile
> delete mode 100644 drivers/media/platform/seco-cec/Makefile
> delete mode 100644 drivers/media/platform/sti/cec/Makefile
> delete mode 100644 drivers/media/platform/tegra-cec/Makefile
> delete mode 100644 drivers/media/usb/pulse8-cec/Makefile
> delete mode 100644 drivers/media/usb/rainshadow-cec/Makefile
>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT
2020-04-15 10:31 [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT Mauro Carvalho Chehab
` (2 preceding siblings ...)
2020-04-15 11:09 ` [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT Hans Verkuil
@ 2020-04-15 11:42 ` Neil Armstrong
2020-04-15 12:11 ` Benjamin Gaignard
4 siblings, 0 replies; 8+ messages in thread
From: Neil Armstrong @ 2020-04-15 11:42 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Linux Media Mailing List
Cc: Maxime Coquelin, linux-samsung-soc, linux-tegra,
Alexandre Torgue, Kevin Hilman, Enric Balletbo i Serra,
Russell King, Krzysztof Kozlowski, Ettore Chimenti,
Guenter Roeck, Kukjin Kim, Thierry Reding, Benjamin Gaignard,
Hans Verkuil, linux-amlogic, Jonathan Hunter, Benson Leung,
linux-stm32, linux-arm-kernel, Marek Szyprowski
On 15/04/2020 12:31, Mauro Carvalho Chehab wrote:
> 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.
>
> - v2:
> - move more CEC drivers from platform/
> - rename kconfig options to be more coherent
>
> Mauro Carvalho Chehab (6):
> 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
> media: cec: rename CEC platform drivers config options
> media: cec: rename USB config options
>
> arch/arm/configs/exynos_defconfig | 2 +-
> arch/arm/configs/multi_v7_defconfig | 2 +-
> 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 | 14 ++
> .../{ => cec}/platform/cec-gpio/Makefile | 0
> .../{ => cec}/platform/cec-gpio/cec-gpio.c | 0
> drivers/media/cec/platform/cros-ec/Makefile | 2 +
> .../platform/cros-ec}/cros-ec-cec.c | 0
> drivers/media/cec/platform/meson/Makefile | 3 +
> .../{ => cec}/platform/meson/ao-cec-g12a.c | 0
> .../media/{ => cec}/platform/meson/ao-cec.c | 0
> .../s5p-cec => cec/platform/s5p}/Makefile | 2 +-
> .../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
> drivers/media/cec/platform/seco/Makefile | 2 +
> .../seco-cec => cec/platform/seco}/seco-cec.c | 2 +-
> .../seco-cec => cec/platform/seco}/seco-cec.h | 0
> drivers/media/cec/platform/sti/Makefile | 2 +
> .../sti/cec => cec/platform/sti}/stih-cec.c | 0
> drivers/media/cec/platform/stm32/Makefile | 2 +
> .../{ => cec}/platform/stm32/stm32-cec.c | 0
> drivers/media/cec/platform/tegra/Makefile | 2 +
> .../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 | 5 +-
> drivers/media/cec/usb/pulse8/Makefile | 2 +
> .../usb/pulse8}/pulse8-cec.c | 0
> .../usb/rainshadow}/Kconfig | 5 +-
> drivers/media/cec/usb/rainshadow/Makefile | 2 +
> .../usb/rainshadow}/rainshadow-cec.c | 0
> drivers/media/platform/Kconfig | 125 ------------------
> drivers/media/platform/Makefile | 12 --
> drivers/media/platform/cros-ec-cec/Makefile | 2 -
> drivers/media/platform/meson/Makefile | 3 -
> drivers/media/platform/seco-cec/Makefile | 2 -
> drivers/media/platform/sti/cec/Makefile | 2 -
> drivers/media/platform/stm32/Makefile | 1 -
> drivers/media/platform/tegra-cec/Makefile | 2 -
> drivers/media/usb/Kconfig | 6 -
> drivers/media/usb/Makefile | 2 -
> drivers/media/usb/pulse8-cec/Makefile | 2 -
> drivers/media/usb/rainshadow-cec/Makefile | 2 -
> 59 files changed, 218 insertions(+), 212 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%)
> create mode 100644 drivers/media/cec/platform/cros-ec/Makefile
> rename drivers/media/{platform/cros-ec-cec => cec/platform/cros-ec}/cros-ec-cec.c (100%)
> create mode 100644 drivers/media/cec/platform/meson/Makefile
> rename drivers/media/{ => cec}/platform/meson/ao-cec-g12a.c (100%)
> rename drivers/media/{ => cec}/platform/meson/ao-cec.c (100%)
> rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/Makefile (63%)
> 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%)
> create mode 100644 drivers/media/cec/platform/seco/Makefile
> rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.c (99%)
> rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.h (100%)
> create mode 100644 drivers/media/cec/platform/sti/Makefile
> rename drivers/media/{platform/sti/cec => cec/platform/sti}/stih-cec.c (100%)
> create mode 100644 drivers/media/cec/platform/stm32/Makefile
> rename drivers/media/{ => cec}/platform/stm32/stm32-cec.c (100%)
> create mode 100644 drivers/media/cec/platform/tegra/Makefile
> 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 (86%)
> create mode 100644 drivers/media/cec/usb/pulse8/Makefile
> rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/pulse8-cec.c (100%)
> rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Kconfig (85%)
> create mode 100644 drivers/media/cec/usb/rainshadow/Makefile
> rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/rainshadow-cec.c (100%)
> delete mode 100644 drivers/media/platform/cros-ec-cec/Makefile
> delete mode 100644 drivers/media/platform/meson/Makefile
> delete mode 100644 drivers/media/platform/seco-cec/Makefile
> delete mode 100644 drivers/media/platform/sti/cec/Makefile
> delete mode 100644 drivers/media/platform/tegra-cec/Makefile
> delete mode 100644 drivers/media/usb/pulse8-cec/Makefile
> delete mode 100644 drivers/media/usb/rainshadow-cec/Makefile
>
For meson CEC drivers and cros-ec-cec:
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Neil
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT
2020-04-15 10:31 [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT Mauro Carvalho Chehab
` (3 preceding siblings ...)
2020-04-15 11:42 ` Neil Armstrong
@ 2020-04-15 12:11 ` Benjamin Gaignard
4 siblings, 0 replies; 8+ messages in thread
From: Benjamin Gaignard @ 2020-04-15 12:11 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Jonathan Hunter, Enric Balletbo i Serra,
moderated list:ARM/S5P EXYNOS AR...,
linux-tegra, Alexandre Torgue, Neil Armstrong, Kevin Hilman,
Russell King, Krzysztof Kozlowski, Ettore Chimenti,
Guenter Roeck, Kukjin Kim, Thierry Reding, Maxime Coquelin,
Hans Verkuil, linux-amlogic, Marek Szyprowski, Benson Leung,
linux-stm32, Linux ARM, Linux Media Mailing List
Le mer. 15 avr. 2020 à 12:31, Mauro Carvalho Chehab
<mchehab+huawei@kernel.org> a écrit :
>
> 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.
>
> - v2:
> - move more CEC drivers from platform/
> - rename kconfig options to be more coherent
>
> Mauro Carvalho Chehab (6):
> 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
> media: cec: rename CEC platform drivers config options
> media: cec: rename USB config options
>
> arch/arm/configs/exynos_defconfig | 2 +-
> arch/arm/configs/multi_v7_defconfig | 2 +-
> 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 | 14 ++
> .../{ => cec}/platform/cec-gpio/Makefile | 0
> .../{ => cec}/platform/cec-gpio/cec-gpio.c | 0
> drivers/media/cec/platform/cros-ec/Makefile | 2 +
> .../platform/cros-ec}/cros-ec-cec.c | 0
> drivers/media/cec/platform/meson/Makefile | 3 +
> .../{ => cec}/platform/meson/ao-cec-g12a.c | 0
> .../media/{ => cec}/platform/meson/ao-cec.c | 0
> .../s5p-cec => cec/platform/s5p}/Makefile | 2 +-
> .../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
> drivers/media/cec/platform/seco/Makefile | 2 +
> .../seco-cec => cec/platform/seco}/seco-cec.c | 2 +-
> .../seco-cec => cec/platform/seco}/seco-cec.h | 0
> drivers/media/cec/platform/sti/Makefile | 2 +
> .../sti/cec => cec/platform/sti}/stih-cec.c | 0
> drivers/media/cec/platform/stm32/Makefile | 2 +
> .../{ => cec}/platform/stm32/stm32-cec.c | 0
> drivers/media/cec/platform/tegra/Makefile | 2 +
> .../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 | 5 +-
> drivers/media/cec/usb/pulse8/Makefile | 2 +
> .../usb/pulse8}/pulse8-cec.c | 0
> .../usb/rainshadow}/Kconfig | 5 +-
> drivers/media/cec/usb/rainshadow/Makefile | 2 +
> .../usb/rainshadow}/rainshadow-cec.c | 0
> drivers/media/platform/Kconfig | 125 ------------------
> drivers/media/platform/Makefile | 12 --
> drivers/media/platform/cros-ec-cec/Makefile | 2 -
> drivers/media/platform/meson/Makefile | 3 -
> drivers/media/platform/seco-cec/Makefile | 2 -
> drivers/media/platform/sti/cec/Makefile | 2 -
> drivers/media/platform/stm32/Makefile | 1 -
> drivers/media/platform/tegra-cec/Makefile | 2 -
> drivers/media/usb/Kconfig | 6 -
> drivers/media/usb/Makefile | 2 -
> drivers/media/usb/pulse8-cec/Makefile | 2 -
> drivers/media/usb/rainshadow-cec/Makefile | 2 -
> 59 files changed, 218 insertions(+), 212 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%)
> create mode 100644 drivers/media/cec/platform/cros-ec/Makefile
> rename drivers/media/{platform/cros-ec-cec => cec/platform/cros-ec}/cros-ec-cec.c (100%)
> create mode 100644 drivers/media/cec/platform/meson/Makefile
> rename drivers/media/{ => cec}/platform/meson/ao-cec-g12a.c (100%)
> rename drivers/media/{ => cec}/platform/meson/ao-cec.c (100%)
> rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/Makefile (63%)
> 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%)
> create mode 100644 drivers/media/cec/platform/seco/Makefile
> rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.c (99%)
> rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.h (100%)
> create mode 100644 drivers/media/cec/platform/sti/Makefile
> rename drivers/media/{platform/sti/cec => cec/platform/sti}/stih-cec.c (100%)
> create mode 100644 drivers/media/cec/platform/stm32/Makefile
> rename drivers/media/{ => cec}/platform/stm32/stm32-cec.c (100%)
> create mode 100644 drivers/media/cec/platform/tegra/Makefile
> 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 (86%)
> create mode 100644 drivers/media/cec/usb/pulse8/Makefile
> rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/pulse8-cec.c (100%)
> rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Kconfig (85%)
> create mode 100644 drivers/media/cec/usb/rainshadow/Makefile
> rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/rainshadow-cec.c (100%)
> delete mode 100644 drivers/media/platform/cros-ec-cec/Makefile
> delete mode 100644 drivers/media/platform/meson/Makefile
> delete mode 100644 drivers/media/platform/seco-cec/Makefile
> delete mode 100644 drivers/media/platform/sti/cec/Makefile
> delete mode 100644 drivers/media/platform/tegra-cec/Makefile
> delete mode 100644 drivers/media/usb/pulse8-cec/Makefile
> delete mode 100644 drivers/media/usb/rainshadow-cec/Makefile
>
For sti and stm32 CEC drivers:
Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> --
> 2.25.2
>
>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/6] media: move CEC platform drivers to a separate directory
2020-04-15 10:31 ` [PATCH v2 3/6] media: move CEC platform drivers to a separate directory Mauro Carvalho Chehab
@ 2020-04-15 21:11 ` Ettore Chimenti
2020-04-16 9:46 ` Geert Uytterhoeven
1 sibling, 0 replies; 8+ messages in thread
From: Ettore Chimenti @ 2020-04-15 21:11 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Benjamin Gaignard, linux-samsung-soc, linux-tegra,
Alexandre Torgue, Neil Armstrong, Kevin Hilman,
Krzysztof Kozlowski, Jonathan Hunter, Enric Balletbo i Serra,
Kukjin Kim, Thierry Reding, Maxime Coquelin, Hans Verkuil,
linux-amlogic, Guenter Roeck, Marek Szyprowski, Benson Leung,
linux-stm32, linux-arm-kernel, Linux Media Mailing List
On Wed, Apr 15, 2020 at 12:31:34PM +0200, Mauro Carvalho Chehab wrote:
> 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 | 14 ++
> .../{ => cec}/platform/cec-gpio/Makefile | 0
> .../{ => cec}/platform/cec-gpio/cec-gpio.c | 0
> .../platform/cros-ec}/Makefile | 0
> .../platform/cros-ec}/cros-ec-cec.c | 0
> .../media/{ => cec}/platform/meson/Makefile | 0
> .../{ => cec}/platform/meson/ao-cec-g12a.c | 0
> .../media/{ => cec}/platform/meson/ao-cec.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
> drivers/media/cec/platform/stm32/Makefile | 2 +
> .../{ => cec}/platform/stm32/stm32-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 | 125 ------------------
> drivers/media/platform/Makefile | 12 --
> drivers/media/platform/stm32/Makefile | 1 -
> 30 files changed, 143 insertions(+), 140 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/cros-ec-cec => cec/platform/cros-ec}/Makefile (100%)
> rename drivers/media/{platform/cros-ec-cec => cec/platform/cros-ec}/cros-ec-cec.c (100%)
> rename drivers/media/{ => cec}/platform/meson/Makefile (100%)
> rename drivers/media/{ => cec}/platform/meson/ao-cec-g12a.c (100%)
> rename drivers/media/{ => cec}/platform/meson/ao-cec.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%)
> create mode 100644 drivers/media/cec/platform/stm32/Makefile
> rename drivers/media/{ => cec}/platform/stm32/stm32-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..e5fb5d383e5c
> --- /dev/null
> +++ b/drivers/media/cec/platform/Makefile
> @@ -0,0 +1,14 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Makefile for the CEC platform device drivers.
> +#
> +
> +obj-$(CONFIG_CEC_GPIO) += cec-gpio/
> +
> +obj-$(CONFIG_VIDEO_CROS_EC_CEC) += cros-ec/
> +obj-$(CONFIG_VIDEO_MESON_AO_CEC) += meson/
> +obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p/
> +obj-$(CONFIG_VIDEO_SECO_CEC) += seco/
> +obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += sti/
> +obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra/
> +
> 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/cros-ec-cec/Makefile b/drivers/media/cec/platform/cros-ec/Makefile
> similarity index 100%
> rename from drivers/media/platform/cros-ec-cec/Makefile
> rename to drivers/media/cec/platform/cros-ec/Makefile
> diff --git a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
> similarity index 100%
> rename from drivers/media/platform/cros-ec-cec/cros-ec-cec.c
> rename to drivers/media/cec/platform/cros-ec/cros-ec-cec.c
> diff --git a/drivers/media/platform/meson/Makefile b/drivers/media/cec/platform/meson/Makefile
> similarity index 100%
> rename from drivers/media/platform/meson/Makefile
> rename to drivers/media/cec/platform/meson/Makefile
> diff --git a/drivers/media/platform/meson/ao-cec-g12a.c b/drivers/media/cec/platform/meson/ao-cec-g12a.c
> similarity index 100%
> rename from drivers/media/platform/meson/ao-cec-g12a.c
> rename to drivers/media/cec/platform/meson/ao-cec-g12a.c
> diff --git a/drivers/media/platform/meson/ao-cec.c b/drivers/media/cec/platform/meson/ao-cec.c
> similarity index 100%
> rename from drivers/media/platform/meson/ao-cec.c
> rename to drivers/media/cec/platform/meson/ao-cec.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/cec/platform/stm32/Makefile b/drivers/media/cec/platform/stm32/Makefile
> new file mode 100644
> index 000000000000..5c89dbce0f67
> --- /dev/null
> +++ b/drivers/media/cec/platform/stm32/Makefile
> @@ -0,0 +1,2 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +obj-$(CONFIG_VIDEO_STM32_HDMI_CEC) += stm32-cec.o
> diff --git a/drivers/media/platform/stm32/stm32-cec.c b/drivers/media/cec/platform/stm32/stm32-cec.c
> similarity index 100%
> rename from drivers/media/platform/stm32/stm32-cec.c
> rename to drivers/media/cec/platform/stm32/stm32-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..b1ac9c6c9cdb 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -552,131 +552,6 @@ if DVB_PLATFORM_DRIVERS
> source "drivers/media/platform/sti/c8sectpfe/Kconfig"
> endif #DVB_PLATFORM_DRIVERS
>
> -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..ac31d4748869 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
> @@ -89,8 +81,4 @@ obj-$(CONFIG_VIDEO_QCOM_CAMSS) += qcom/camss/
>
> obj-$(CONFIG_VIDEO_QCOM_VENUS) += qcom/venus/
>
> -obj-y += meson/
> -
> -obj-y += cros-ec-cec/
> -
> obj-y += sunxi/
> diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/stm32/Makefile
> index 5ed73599ca44..48b36db2c2e2 100644
> --- a/drivers/media/platform/stm32/Makefile
> +++ b/drivers/media/platform/stm32/Makefile
> @@ -1,3 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> obj-$(CONFIG_VIDEO_STM32_DCMI) += stm32-dcmi.o
> -obj-$(CONFIG_VIDEO_STM32_HDMI_CEC) += stm32-cec.o
> --
> 2.25.2
>
For the seco-cec driver:
Acked-by: Ettore Chimenti <ek5.chimenti@gmail.com>
Thanks!
Ettore
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/6] media: move CEC platform drivers to a separate directory
2020-04-15 10:31 ` [PATCH v2 3/6] media: move CEC platform drivers to a separate directory Mauro Carvalho Chehab
2020-04-15 21:11 ` Ettore Chimenti
@ 2020-04-16 9:46 ` Geert Uytterhoeven
1 sibling, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2020-04-16 9:46 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Neil Armstrong, Ettore Chimenti, Thierry Reding,
Benjamin Gaignard, Guenter Roeck, linux-stm32, Marek Szyprowski,
linux-samsung-soc, Kevin Hilman, Krzysztof Kozlowski,
Jonathan Hunter, Kukjin Kim, Linux Media Mailing List,
Alexandre Torgue, Arnd Bergmann, Enric Balletbo i Serra,
linux-tegra, open list:ARM/Amlogic Meson...,
Benson Leung, Linux ARM, Maxime Coquelin, Hans Verkuil
Hi Mauro,
On Wed, Apr 15, 2020 at 12:32 PM Mauro Carvalho Chehab
<mchehab+huawei@kernel.org> wrote:
> As CEC support doesn't depend on MEDIA_SUPPORT, let's
> place the platform drivers outside the media menu.
Thanks for your patch!
> As a side effect, instead of depends on PCI, seco driver
> can select it (and DMI).
I don't think that's a good idea, as it suddenly enables selecting all PCI
drivers on platforms that do not have PCI.
WARNING: unmet direct dependencies detected for PCI
Depends on [n]: HAVE_PCI [=n]
Selected by [m]:
- CEC_SECO [=m] && MEDIA_CEC_SUPPORT [=y] && (X86 || IA64 ||
COMPILE_TEST [=y])
However, it already exposed some bugs that were hidden by PCI=n ;-)
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
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-04-16 9:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-15 10:31 [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT Mauro Carvalho Chehab
2020-04-15 10:31 ` [PATCH v2 3/6] media: move CEC platform drivers to a separate directory Mauro Carvalho Chehab
2020-04-15 21:11 ` Ettore Chimenti
2020-04-16 9:46 ` Geert Uytterhoeven
2020-04-15 10:31 ` [PATCH v2 5/6] media: cec: rename CEC platform drivers config options Mauro Carvalho Chehab
2020-04-15 11:09 ` [PATCH v2 0/6] Move CEC drivers and menu to be out of MEDIA_SUPPORT Hans Verkuil
2020-04-15 11:42 ` Neil Armstrong
2020-04-15 12:11 ` Benjamin Gaignard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).