media: cec: rename CEC platform drivers config options

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

Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 3c3a00fc71f60db96f5cc4a7768daa1d31591e2a..2c779ac13270a9a7dc00ee07c074ef0dea01eda5 100644 (file)
--- 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 f8e45351c3f9fe314419c27a585aad3a866d7c2c..9c86b1ab2f1d114120e29310a055d0ecdfa5f9a9 100644 (file)
--- 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 6a8bb8b68344ad1445db6fd17b813f45cd925aca..2c4dd7401dd8be34050295004ca5930afa96b6e9 100644 (file)
--- 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 e5fb5d383e5c530966a0daadbd52568ca549b190..3a947159b25ac95e2804c8a6d890408840a48427 100644 (file)
--- 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 2615cdc6e2273b6ba3f8029bbbde2621d9614844..d7e3511078ef3fe6f52340eb44ae8afa5b7019d9 100644 (file)
--- 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 6bf728addbf8a314d7911a747dcd77dee147b8a2..34fc5d444d0e01f31bb43a2935d64714fec9b1c1 100644 (file)
--- 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 bd0103b91bee072729f339964105f20e7c7fde91..92bf7b8557c5a55ec4da7d9f1e0ae0899da7da85 100644 (file)
--- 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 79fde6947ff2f5bcd37a108fd5ec35aa27b85335..aa1ca8ccdb8bae9b974a9a76614725575273ba64 100644 (file)
--- 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 2ff62a488b277d8d4d15cdbf07c8ae1b4b72acb8..075dd79beb6f272cc10d28f25641ea03df3dff95 100644 (file)
--- 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 d0c6b4ae94d63631fb6f6b13f21bafb54c8f87e1..26ec5ba1c6331fca21d0fc5eba36b572531ae992 100644 (file)
--- 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 5c89dbce0f678ef8527ec9ebb057f6efb810cd68..b7597a00befa39ce856bbe3e8fd16383e1800639 100644 (file)
--- 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 97e57c7493c0f494a17fe48315c0cb8199ac46c8..275d1c019d49336c566f2877b054512fbc4024e3 100644 (file)
--- 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