microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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>
This commit is contained in:
Mauro Carvalho Chehab 2020-04-15 12:12:29 +02:00
Родитель a81068181a
Коммит df823a8208
12 изменённых файлов: 30 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
arch/arm/configs/exynos_defconfig
Просмотреть файл

@ -207,7 +207,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
CONFIG_V4L_TEST_DRIVERS=y CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VIDEO_VIVID=m CONFIG_VIDEO_VIVID=m
CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEC_PLATFORM_DRIVERS=y
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m CONFIG_CEC_SAMSUNG_S5P=m
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_S5K6A3=m CONFIG_VIDEO_S5K6A3=m
CONFIG_VIDEO_S5C73M3=m CONFIG_VIDEO_S5C73M3=m

2
arch/arm/configs/multi_v7_defconfig
Просмотреть файл

@ -638,7 +638,7 @@ CONFIG_VIDEO_RENESAS_VSP1=m
CONFIG_V4L_TEST_DRIVERS=y CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VIDEO_VIVID=m CONFIG_VIDEO_VIVID=m
CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEC_PLATFORM_DRIVERS=y
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m CONFIG_CEC_SAMSUNG_S5P=m
CONFIG_VIDEO_ADV7180=m CONFIG_VIDEO_ADV7180=m
CONFIG_VIDEO_ML86V7667=m CONFIG_VIDEO_ML86V7667=m
CONFIG_IMX_IPUV3_CORE=m CONFIG_IMX_IPUV3_CORE=m

22
drivers/media/cec/platform/Kconfig
Просмотреть файл

@ -2,7 +2,7 @@
# #
# Platform drivers # Platform drivers
config VIDEO_CROS_EC_CEC config CEC_CROS_EC
tristate "ChromeOS EC CEC driver" tristate "ChromeOS EC CEC driver"
depends on CROS_EC depends on CROS_EC
select CEC_CORE select CEC_CORE
@ -14,7 +14,7 @@ config VIDEO_CROS_EC_CEC
The CEC bus is present in the HDMI connector and enables communication The CEC bus is present in the HDMI connector and enables communication
between compatible devices. between compatible devices.
config VIDEO_MESON_AO_CEC config CEC_MESON_AO
tristate "Amlogic Meson AO CEC driver" tristate "Amlogic Meson AO CEC driver"
depends on ARCH_MESON || COMPILE_TEST depends on ARCH_MESON || COMPILE_TEST
select CEC_CORE select CEC_CORE
@ -24,7 +24,7 @@ config VIDEO_MESON_AO_CEC
generic CEC framework interface. generic CEC framework interface.
CEC bus is present in the HDMI connector and enables communication 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" tristate "Amlogic Meson G12A AO CEC driver"
depends on ARCH_MESON || COMPILE_TEST depends on ARCH_MESON || COMPILE_TEST
depends on COMMON_CLK && OF depends on COMMON_CLK && OF
@ -52,7 +52,7 @@ config CEC_GPIO
The CEC bus is present in the HDMI connector and enables communication The CEC bus is present in the HDMI connector and enables communication
between compatible devices. between compatible devices.
config VIDEO_SAMSUNG_S5P_CEC config CEC_SAMSUNG_S5P
tristate "Samsung S5P CEC driver" tristate "Samsung S5P CEC driver"
depends on ARCH_EXYNOS || COMPILE_TEST depends on ARCH_EXYNOS || COMPILE_TEST
select CEC_CORE select CEC_CORE
@ -63,7 +63,7 @@ config VIDEO_SAMSUNG_S5P_CEC
CEC bus is present in the HDMI connector and enables communication CEC bus is present in the HDMI connector and enables communication
between compatible devices. between compatible devices.
config VIDEO_STI_HDMI_CEC config CEC_STI
tristate "STMicroelectronics STiH4xx HDMI CEC driver" tristate "STMicroelectronics STiH4xx HDMI CEC driver"
depends on ARCH_STI || COMPILE_TEST depends on ARCH_STI || COMPILE_TEST
select CEC_CORE select CEC_CORE
@ -74,7 +74,7 @@ config VIDEO_STI_HDMI_CEC
CEC bus is present in the HDMI connector and enables communication CEC bus is present in the HDMI connector and enables communication
between compatible devices. between compatible devices.
config VIDEO_STM32_HDMI_CEC config CEC_STM32
tristate "STMicroelectronics STM32 HDMI CEC driver" tristate "STMicroelectronics STM32 HDMI CEC driver"
depends on ARCH_STM32 || COMPILE_TEST depends on ARCH_STM32 || COMPILE_TEST
select REGMAP select REGMAP
@ -86,7 +86,7 @@ config VIDEO_STM32_HDMI_CEC
CEC bus is present in the HDMI connector and enables communication CEC bus is present in the HDMI connector and enables communication
between compatible devices. between compatible devices.
config VIDEO_TEGRA_HDMI_CEC config CEC_TEGRA
tristate "Tegra HDMI CEC driver" tristate "Tegra HDMI CEC driver"
depends on ARCH_TEGRA || COMPILE_TEST depends on ARCH_TEGRA || COMPILE_TEST
select CEC_CORE select CEC_CORE
@ -97,7 +97,7 @@ config VIDEO_TEGRA_HDMI_CEC
The CEC bus is present in the HDMI connector and enables communication The CEC bus is present in the HDMI connector and enables communication
between compatible devices. between compatible devices.
config VIDEO_SECO_CEC config CEC_SECO
tristate "SECO Boards HDMI CEC driver" tristate "SECO Boards HDMI CEC driver"
depends on (X86 || IA64) || COMPILE_TEST depends on (X86 || IA64) || COMPILE_TEST
select PCI select PCI
@ -110,10 +110,10 @@ config VIDEO_SECO_CEC
CEC bus is present in the HDMI connector and enables communication CEC bus is present in the HDMI connector and enables communication
between compatible devices. between compatible devices.
config VIDEO_SECO_RC config CEC_SECO_RC
bool "SECO Boards IR RC5 support" bool "SECO Boards IR RC5 support"
depends on VIDEO_SECO_CEC depends on CEC_SECO
depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC depends on RC_CORE=y || RC_CORE = CEC_SECO
help help
If you say yes here you will get support for the If you say yes here you will get support for the
SECO Boards Consumer-IR in seco-cec driver. SECO Boards Consumer-IR in seco-cec driver.

14
drivers/media/cec/platform/Makefile
Просмотреть файл

@ -3,12 +3,12 @@
# Makefile for the CEC platform device drivers. # Makefile for the CEC platform device drivers.
# #
# Please keep it in alphabetic order
obj-$(CONFIG_CEC_CROS_EC) += cros-ec/
obj-$(CONFIG_CEC_GPIO) += cec-gpio/ obj-$(CONFIG_CEC_GPIO) += cec-gpio/
obj-$(CONFIG_CEC_MESON_AO) += meson/
obj-$(CONFIG_VIDEO_CROS_EC_CEC) += cros-ec/ obj-$(CONFIG_CEC_SAMSUNG_S5P) += s5p/
obj-$(CONFIG_VIDEO_MESON_AO_CEC) += meson/ obj-$(CONFIG_CEC_SECO) += seco/
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p/ obj-$(CONFIG_CEC_STI) += sti/
obj-$(CONFIG_VIDEO_SECO_CEC) += seco/ obj-$(CONFIG_CEC_TEGRA) += tegra/
obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += sti/
obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra/

2
drivers/media/cec/platform/cros-ec/Makefile
Просмотреть файл

@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only # 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

4
drivers/media/cec/platform/meson/Makefile
Просмотреть файл

@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_VIDEO_MESON_AO_CEC) += ao-cec.o obj-$(CONFIG_CEC_MESON_AO) += ao-cec.o
obj-$(CONFIG_VIDEO_MESON_G12A_AO_CEC) += ao-cec-g12a.o obj-$(CONFIG_CEC_MESON_G12A_AO) += ao-cec-g12a.o

2
drivers/media/cec/platform/s5p/Makefile
Просмотреть файл

@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only # 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 s5p-cec-y += s5p_cec.o exynos_hdmi_cecctrl.o

2
drivers/media/cec/platform/seco/Makefile
Просмотреть файл

@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_VIDEO_SECO_CEC) += seco-cec.o obj-$(CONFIG_CEC_SECO) += seco-cec.o

2
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, .adap_transmit = secocec_adap_transmit,
}; };
#ifdef CONFIG_VIDEO_SECO_RC #ifdef CONFIG_CEC_SECO_RC
static int secocec_ir_probe(void *priv) static int secocec_ir_probe(void *priv)
{ {
struct secocec_data *cec = priv; struct secocec_data *cec = priv;

2
drivers/media/cec/platform/sti/Makefile
Просмотреть файл

@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += stih-cec.o obj-$(CONFIG_CEC_STI) += stih-cec.o

2
drivers/media/cec/platform/stm32/Makefile
Просмотреть файл

@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_VIDEO_STM32_HDMI_CEC) += stm32-cec.o obj-$(CONFIG_CEC_STM32) += stm32-cec.o

2
drivers/media/cec/platform/tegra/Makefile
Просмотреть файл

@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra_cec.o obj-$(CONFIG_CEC_TEGRA) += tegra_cec.o