From patchwork Wed Apr 15 10:31:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11490951 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF33992C for ; Wed, 15 Apr 2020 10:32:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 820E2206D9 for ; Wed, 15 Apr 2020 10:32:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iML0EmnG"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="cHMH+23K" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 820E2206D9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/3AugNa5ExVkUf1mZVE5g71toIUf9Bl5VAycDEe6Lsg=; b=iML0EmnGocGpPk bX5tGeyuAY0PYbU2k0/cMoEk0hD+S41Mx1YIXgIAWZsD4YKNPZxBfY3yGN/o511MdmxXpoQQ+BXE5 kP5P4+0ymyWh5Tlsi8NS8ht0yG4SNLPTjqewhEYDDhuTpbya1vxzwUJYwrx0XM+o4Fpq0bl+7UtCp kNPivvjni9NAHSLHtMiBn6WpXicpQdg2B2VQTHmPhMDgqEjvkigsJ6uoEyA/nTBf04dd35mPWsDkq EvkYEavAsyMOSKghFyr7Qx7s04StFf9IXYGdzS6laIKeRTZiCwMp8QbVTC/4I/P0bhjJAd2d9ATh9 ylbmRiScAh1KKv6cc8cA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOfLD-0002Rp-Op; Wed, 15 Apr 2020 10:32:23 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOfKX-0001oG-N5; Wed, 15 Apr 2020 10:31:45 +0000 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EDFE1214AF; Wed, 15 Apr 2020 10:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586946701; bh=d8rlQ7v3/u8ClPPSrvb3rQ1cfYaUU+9nvj14FfSOM88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cHMH+23KkZa+eaT/ibIvXOpwsyPkZ0se2tBZVhuxwY8/Hytbm1CU2B/R9BbzNgWYO bpsnKpOR24ViRKULFtAQOR/mhZPWGeZoqyMw+HNa2isrUX20MOhMl22+Zan0r470+/ WvWBMO+m1hohaNEYTt+ae3hPLB9TQgSobCvR/uzA= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jOfKV-006gMC-6W; Wed, 15 Apr 2020 12:31:39 +0200 From: Mauro Carvalho Chehab To: Linux Media Mailing List Subject: [PATCH v2 3/6] media: move CEC platform drivers to a separate directory Date: Wed, 15 Apr 2020 12:31:34 +0200 Message-Id: <221ac8f88034bb55c7029c162c0273eccd6b6480.1586946605.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200415_033141_791383_E6E7BE44 X-CRM114-Status: GOOD ( 17.75 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Enric Balletbo i Serra , Benjamin Gaignard , linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org, 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@lists.infradead.org, Ettore Chimenti , Benson Leung , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Marek Szyprowski Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Acked-by: Ettore Chimenti --- 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 From patchwork Wed Apr 15 10:31:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11490943 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 219D16CA for ; Wed, 15 Apr 2020 10:32:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BA88B206D9 for ; Wed, 15 Apr 2020 10:32:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lOYLdk3g"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="yy7qummi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA88B206D9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2g3hwHc+xwmD3TBYMAoYCO5k1IioCx6hhczVSijXdy8=; b=lOYLdk3gJGapQ+ gd6ykekVmVACs70LZ4q75I3SVUdQ1ra2n+J5p8Sdtr9F3yvk0nIwB1hVAREw9wAqpPmNYMzSwQwt4 owGBaB6/RRZk4i8/WrJUUC2gcSqAvOUh7TsShR0a2kDn4R/TjqMByBwX1R0l6ESV5N80SdpZzJnyN VARTYPUlkiez8UWyyoONdTf+hwzRXDmrvQdaLjFJMT2mBb6UBHhxmr9Hn9l0sUJ9Iqk9+aXyHlcuA 0ZeFvAidTikjDYxH6soGGnkm195bPIBC27UmGTwKbOT09cWWTg0rbhZIMmXhgftygp4coJjtnVcGX rsk5pHLV6QfVNl5ZhW9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOfKn-00023p-U6; Wed, 15 Apr 2020 10:31:57 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOfKX-0001o7-JQ; Wed, 15 Apr 2020 10:31:43 +0000 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 08F3F21556; Wed, 15 Apr 2020 10:31:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586946701; bh=aPW4KRSGSSAnFhhCuHdHUZN+HF5qz+C0gR4w9+NHse8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yy7qummi8cpw2FCdAYWjxFJ6hZdfnpswJIXD1oGI1K9cEOMF38I2fmN4zPxcU6Yvz 7qR+MWX/Q8DfiUFJZ+bcc3VsZTtQRBXqsLUT1rPxM+cxElp8JUWSoWNmNUvgpWWxBd Ywa6KJfBvTgo5d7CZKmkUESD3ynNQ6LRnTJg5QXU= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jOfKV-006gMN-8X; Wed, 15 Apr 2020 12:31:39 +0200 From: Mauro Carvalho Chehab To: Linux Media Mailing List Subject: [PATCH v2 5/6] media: cec: rename CEC platform drivers config options Date: Wed, 15 Apr 2020 12:31:36 +0200 Message-Id: X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200415_033141_677059_89B0CC3A X-CRM114-Status: GOOD ( 14.62 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org, 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@lists.infradead.org, Guenter Roeck , Benson Leung , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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_. Signed-off-by: Mauro Carvalho Chehab --- 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