Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+30 -30
+1 -1
arch/arm/configs/exynos_defconfig
··· 207 207 CONFIG_V4L_TEST_DRIVERS=y 208 208 CONFIG_VIDEO_VIVID=m 209 209 CONFIG_CEC_PLATFORM_DRIVERS=y 210 - CONFIG_VIDEO_SAMSUNG_S5P_CEC=m 210 + CONFIG_CEC_SAMSUNG_S5P=m 211 211 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set 212 212 CONFIG_VIDEO_S5K6A3=m 213 213 CONFIG_VIDEO_S5C73M3=m
+1 -1
arch/arm/configs/multi_v7_defconfig
··· 638 638 CONFIG_V4L_TEST_DRIVERS=y 639 639 CONFIG_VIDEO_VIVID=m 640 640 CONFIG_CEC_PLATFORM_DRIVERS=y 641 - CONFIG_VIDEO_SAMSUNG_S5P_CEC=m 641 + CONFIG_CEC_SAMSUNG_S5P=m 642 642 CONFIG_VIDEO_ADV7180=m 643 643 CONFIG_VIDEO_ML86V7667=m 644 644 CONFIG_IMX_IPUV3_CORE=m
+11 -11
drivers/media/cec/platform/Kconfig
··· 2 2 # 3 3 # Platform drivers 4 4 5 - config VIDEO_CROS_EC_CEC 5 + config CEC_CROS_EC 6 6 tristate "ChromeOS EC CEC driver" 7 7 depends on CROS_EC 8 8 select CEC_CORE ··· 14 14 The CEC bus is present in the HDMI connector and enables communication 15 15 between compatible devices. 16 16 17 - config VIDEO_MESON_AO_CEC 17 + config CEC_MESON_AO 18 18 tristate "Amlogic Meson AO CEC driver" 19 19 depends on ARCH_MESON || COMPILE_TEST 20 20 select CEC_CORE ··· 24 24 generic CEC framework interface. 25 25 CEC bus is present in the HDMI connector and enables communication 26 26 27 - config VIDEO_MESON_G12A_AO_CEC 27 + config CEC_MESON_G12A_AO 28 28 tristate "Amlogic Meson G12A AO CEC driver" 29 29 depends on ARCH_MESON || COMPILE_TEST 30 30 depends on COMMON_CLK && OF ··· 52 52 The CEC bus is present in the HDMI connector and enables communication 53 53 between compatible devices. 54 54 55 - config VIDEO_SAMSUNG_S5P_CEC 55 + config CEC_SAMSUNG_S5P 56 56 tristate "Samsung S5P CEC driver" 57 57 depends on ARCH_EXYNOS || COMPILE_TEST 58 58 select CEC_CORE ··· 63 63 CEC bus is present in the HDMI connector and enables communication 64 64 between compatible devices. 65 65 66 - config VIDEO_STI_HDMI_CEC 66 + config CEC_STI 67 67 tristate "STMicroelectronics STiH4xx HDMI CEC driver" 68 68 depends on ARCH_STI || COMPILE_TEST 69 69 select CEC_CORE ··· 74 74 CEC bus is present in the HDMI connector and enables communication 75 75 between compatible devices. 76 76 77 - config VIDEO_STM32_HDMI_CEC 77 + config CEC_STM32 78 78 tristate "STMicroelectronics STM32 HDMI CEC driver" 79 79 depends on ARCH_STM32 || COMPILE_TEST 80 80 select REGMAP ··· 86 86 CEC bus is present in the HDMI connector and enables communication 87 87 between compatible devices. 88 88 89 - config VIDEO_TEGRA_HDMI_CEC 89 + config CEC_TEGRA 90 90 tristate "Tegra HDMI CEC driver" 91 91 depends on ARCH_TEGRA || COMPILE_TEST 92 92 select CEC_CORE ··· 97 97 The CEC bus is present in the HDMI connector and enables communication 98 98 between compatible devices. 99 99 100 - config VIDEO_SECO_CEC 100 + config CEC_SECO 101 101 tristate "SECO Boards HDMI CEC driver" 102 102 depends on (X86 || IA64) || COMPILE_TEST 103 103 select PCI ··· 110 110 CEC bus is present in the HDMI connector and enables communication 111 111 between compatible devices. 112 112 113 - config VIDEO_SECO_RC 113 + config CEC_SECO_RC 114 114 bool "SECO Boards IR RC5 support" 115 - depends on VIDEO_SECO_CEC 116 - depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC 115 + depends on CEC_SECO 116 + depends on RC_CORE=y || RC_CORE = CEC_SECO 117 117 help 118 118 If you say yes here you will get support for the 119 119 SECO Boards Consumer-IR in seco-cec driver.
+8 -8
drivers/media/cec/platform/Makefile
··· 3 3 # Makefile for the CEC platform device drivers. 4 4 # 5 5 6 - obj-$(CONFIG_CEC_GPIO) += cec-gpio/ 7 - 8 - obj-$(CONFIG_VIDEO_CROS_EC_CEC) += cros-ec/ 9 - obj-$(CONFIG_VIDEO_MESON_AO_CEC) += meson/ 10 - obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p/ 11 - obj-$(CONFIG_VIDEO_SECO_CEC) += seco/ 12 - obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += sti/ 13 - obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra/ 6 + # Please keep it in alphabetic order 7 + obj-$(CONFIG_CEC_CROS_EC) += cros-ec/ 8 + obj-$(CONFIG_CEC_GPIO) += cec-gpio/ 9 + obj-$(CONFIG_CEC_MESON_AO) += meson/ 10 + obj-$(CONFIG_CEC_SAMSUNG_S5P) += s5p/ 11 + obj-$(CONFIG_CEC_SECO) += seco/ 12 + obj-$(CONFIG_CEC_STI) += sti/ 13 + obj-$(CONFIG_CEC_TEGRA) += tegra/ 14 14
+1 -1
drivers/media/cec/platform/cros-ec/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_VIDEO_CROS_EC_CEC) += cros-ec-cec.o 2 + obj-$(CONFIG_CEC_CROS_EC) += cros-ec-cec.o
+2 -2
drivers/media/cec/platform/meson/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_VIDEO_MESON_AO_CEC) += ao-cec.o 3 - obj-$(CONFIG_VIDEO_MESON_G12A_AO_CEC) += ao-cec-g12a.o 2 + obj-$(CONFIG_CEC_MESON_AO) += ao-cec.o 3 + obj-$(CONFIG_CEC_MESON_G12A_AO) += ao-cec-g12a.o
+1 -1
drivers/media/cec/platform/s5p/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec.o 2 + obj-$(CONFIG_CEC_SAMSUNG_S5P) += s5p-cec.o 3 3 s5p-cec-y += s5p_cec.o exynos_hdmi_cecctrl.o
+1 -1
drivers/media/cec/platform/seco/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_VIDEO_SECO_CEC) += seco-cec.o 2 + obj-$(CONFIG_CEC_SECO) += seco-cec.o
+1 -1
drivers/media/cec/platform/seco/seco-cec.c
··· 343 343 .adap_transmit = secocec_adap_transmit, 344 344 }; 345 345 346 - #ifdef CONFIG_VIDEO_SECO_RC 346 + #ifdef CONFIG_CEC_SECO_RC 347 347 static int secocec_ir_probe(void *priv) 348 348 { 349 349 struct secocec_data *cec = priv;
+1 -1
drivers/media/cec/platform/sti/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += stih-cec.o 2 + obj-$(CONFIG_CEC_STI) += stih-cec.o
+1 -1
drivers/media/cec/platform/stm32/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_VIDEO_STM32_HDMI_CEC) += stm32-cec.o 2 + obj-$(CONFIG_CEC_STM32) += stm32-cec.o
+1 -1
drivers/media/cec/platform/tegra/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra_cec.o 2 + obj-$(CONFIG_CEC_TEGRA) += tegra_cec.o