From patchwork Mon Mar 14 07:54:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779803 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2698C433F5 for ; Mon, 14 Mar 2022 07:56:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236936AbiCNH5i (ORCPT ); Mon, 14 Mar 2022 03:57:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236829AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AC1B41313; Mon, 14 Mar 2022 00:56:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3A59361182; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7E47C340F8; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=VIGbCrZ8+zN5ch8SWnpLAP7B/f7EQGdFY8sPD60Bz/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZsMfkCaFkjOKRlnrUYqStaZ5J973X3CDROBEAs1/CtqGf15OjHEtpbFArm/MTyCfv hqNX+xjR3N9IdiOiq/LllOYazzsFHCoBjK4lm0xaez2+zRJafW8Szq4cOdEMswxOfr kp8NyTUbysrN8RsruJLVezVaaKNT/ffohE4FQEkNs2GmC4feoPYetBy1/A4zXSR0ru neZxlec5iw2iIpTgUKDQy1jUk9wlWXLWgy4z32TUakN9icmLh3sD5Yzs/oTCRxE/+4 wFHKBANcwIzTB5ukVaUn7V/Cou7z4SI30zjpCD1brekzb6CjP0I0OeSnNNLdYnanMy 7cwXIfsqKhHrw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUV-HI; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Alexandre Belloni , Chen-Yu Tsai , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Geert Uytterhoeven , Hans Verkuil , Hyun Kwon , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Ludovic Desroches , Maxime Ripard , Michal Simek , Ming Qian , Mirela Rabulea , NXP Linux Team , Nicolas Ferre , Patrice Chotard , Pengutronix Kernel Team , Rui Miguel Silva , Sakari Ailus , Sascha Hauer , Shawn Guo , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 05/64] media: platform: move platform menu dependencies to drivers Date: Mon, 14 Mar 2022 08:54:57 +0100 Message-Id: <0bbd7df4b52f17246a6afe9c81e77b03b3313728.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Right now, platform dependencies are organized by the type of the platform driver. Yet, things tend to become very messy with time. The better seems to organize the drivers per manufacturer, as other Kernel subsystems are doing. As a preparation for such purpose, get rid of menuconfigs, moving the per-menu dependencies to be at the driver-specifig config entires. This shoud give flexibility to reorganize the platform drivers per manufacturer and re-sort them. This patch removes all "if..endif" options from the platform Kconfig, converting them into depends on. Acked-by: Jernej Skrabec Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 119 +++++++++++------- drivers/media/platform/am437x/Kconfig | 1 + drivers/media/platform/atmel/Kconfig | 4 + drivers/media/platform/cadence/Kconfig | 1 + drivers/media/platform/davinci/Kconfig | 6 + drivers/media/platform/exynos4-is/Kconfig | 1 + drivers/media/platform/imx-jpeg/Kconfig | 1 + drivers/media/platform/imx/Kconfig | 1 + drivers/media/platform/marvell-ccic/Kconfig | 2 + drivers/media/platform/omap/Kconfig | 1 + drivers/media/platform/rcar-vin/Kconfig | 2 + drivers/media/platform/sti/c8sectpfe/Kconfig | 1 + .../media/platform/sunxi/sun4i-csi/Kconfig | 1 + .../media/platform/sunxi/sun6i-csi/Kconfig | 1 + drivers/media/platform/xilinx/Kconfig | 1 + 15 files changed, 98 insertions(+), 45 deletions(-) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 4843fabb8bb2..1446a99159c5 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -3,17 +3,39 @@ # Platform drivers # Most drivers here are currently for webcam support -menuconfig V4L_PLATFORM_DRIVERS +config V4L_PLATFORM_DRIVERS bool "V4L platform devices" help Say Y here to enable support for platform-specific V4L drivers. -if V4L_PLATFORM_DRIVERS +config SDR_PLATFORM_DRIVERS + bool "SDR platform devices" + depends on MEDIA_SDR_SUPPORT + help + Say Y here to enable support for platform-specific SDR Drivers. + +config DVB_PLATFORM_DRIVERS + bool "DVB platform devices" + depends on MEDIA_DIGITAL_TV_SUPPORT + help + Say Y here to enable support for platform-specific Digital TV drivers. + +config V4L_MEM2MEM_DRIVERS + bool "Memory-to-memory multimedia devices" + depends on VIDEO_V4L2 + help + Say Y here to enable selecting drivers for V4L devices that + use system memory for both source and destination buffers, as opposed + to capture and output drivers, which use memory buffers for just + one of those. + +# V4L platform drivers source "drivers/media/platform/marvell-ccic/Kconfig" config VIDEO_VIA_CAMERA tristate "VIAFB camera controller support" + depends on V4L_PLATFORM_DRIVERS depends on FB_VIA && VIDEO_V4L2 select VIDEOBUF2_DMA_SG select VIDEO_OV7670 @@ -22,9 +44,6 @@ config VIDEO_VIA_CAMERA Chrome9 chipsets. Currently only tested on OLPC xo-1.5 systems with ov7670 sensors. -# -# Platform multimedia device configuration -# source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/davinci/Kconfig" @@ -33,6 +52,7 @@ source "drivers/media/platform/omap/Kconfig" config VIDEO_ASPEED tristate "Aspeed AST2400 and AST2500 Video Engine driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 select VIDEOBUF2_DMA_CONTIG help @@ -42,6 +62,7 @@ config VIDEO_ASPEED config VIDEO_SH_VOU tristate "SuperH VOU video output driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && I2C depends on ARCH_SHMOBILE || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -50,6 +71,7 @@ config VIDEO_SH_VOU config VIDEO_VIU tristate "Freescale VIU Video Driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C select VIDEOBUF_DMA_CONTIG default y @@ -62,6 +84,7 @@ config VIDEO_VIU config VIDEO_MUX tristate "Video Multiplexer" + depends on V4L_PLATFORM_DRIVERS select MULTIPLEXER depends on VIDEO_V4L2 && OF select MEDIA_CONTROLLER @@ -73,6 +96,7 @@ config VIDEO_MUX config VIDEO_OMAP3 tristate "OMAP 3 Camera support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && I2C depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST depends on COMMON_CLK && OF @@ -93,6 +117,7 @@ config VIDEO_OMAP3_DEBUG config VIDEO_PXA27x tristate "PXA27x Quick Capture Interface driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on PXA27x || COMPILE_TEST select VIDEOBUF2_DMA_SG @@ -103,6 +128,7 @@ config VIDEO_PXA27x config VIDEO_QCOM_CAMSS tristate "Qualcomm V4L2 Camera Subsystem driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST select MEDIA_CONTROLLER @@ -112,6 +138,7 @@ config VIDEO_QCOM_CAMSS config VIDEO_S3C_CAMIF tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && I2C && PM depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST select MEDIA_CONTROLLER @@ -126,6 +153,7 @@ config VIDEO_S3C_CAMIF config VIDEO_STM32_DCMI tristate "STM32 Digital Camera Memory Interface (DCMI) support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_STM32 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -140,6 +168,7 @@ config VIDEO_STM32_DCMI config VIDEO_RENESAS_CEU tristate "Renesas Capture Engine Unit (CEU) driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -149,6 +178,7 @@ config VIDEO_RENESAS_CEU config VIDEO_ROCKCHIP_ISP1 tristate "Rockchip Image Signal Processing v1 Unit driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_ROCKCHIP || COMPILE_TEST select MEDIA_CONTROLLER @@ -175,6 +205,7 @@ source "drivers/media/platform/imx/Kconfig" config VIDEO_TI_CAL tristate "TI CAL (Camera Adaptation Layer) driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -187,10 +218,9 @@ config VIDEO_TI_CAL In TI Technical Reference Manual this module is referred as Camera Interface Subsystem (CAMSS). -if VIDEO_TI_CAL - config VIDEO_TI_CAL_MC bool "Media Controller centric mode by default" + depends on VIDEO_TI_CAL default n help Enables Media Controller centric mode by default. @@ -199,10 +229,9 @@ config VIDEO_TI_CAL_MC default. Note that this behavior can be overridden via module parameter 'mc_api'. -endif # VIDEO_TI_CAL - config VIDEO_RCAR_ISP tristate "R-Car Image Signal Processor (ISP)" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_RENESAS || COMPILE_TEST select MEDIA_CONTROLLER @@ -217,21 +246,11 @@ config VIDEO_RCAR_ISP To compile this driver as a module, choose M here: the module will be called rcar-isp. -endif # V4L_PLATFORM_DRIVERS - -menuconfig V4L_MEM2MEM_DRIVERS - bool "Memory-to-memory multimedia devices" - depends on VIDEO_V4L2 - help - Say Y here to enable selecting drivers for V4L devices that - use system memory for both source and destination buffers, as opposed - to capture and output drivers, which use memory buffers for just - one of those. - -if V4L_MEM2MEM_DRIVERS +# Mem2mem drivers config VIDEO_ALLEGRO_DVT tristate "Allegro DVT Video IP Core" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_ZYNQMP || COMPILE_TEST select V4L2_MEM2MEM_DEV @@ -247,6 +266,7 @@ config VIDEO_ALLEGRO_DVT config VIDEO_CODA tristate "Chips&Media Coda multi-standard codec IP" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST) select SRAM select VIDEOBUF2_DMA_CONTIG @@ -263,6 +283,7 @@ config VIDEO_IMX_VDOA config VIDEO_IMX_PXP tristate "i.MX Pixel Pipeline (PXP)" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST) select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV @@ -274,6 +295,7 @@ source "drivers/media/platform/imx-jpeg/Kconfig" config VIDEO_MEDIATEK_JPEG tristate "Mediatek JPEG Codec driver" + depends on V4L_MEM2MEM_DRIVERS depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST @@ -289,6 +311,7 @@ config VIDEO_MEDIATEK_JPEG config VIDEO_MEDIATEK_VPU tristate "Mediatek Video Processor Unit" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST help @@ -302,6 +325,7 @@ config VIDEO_MEDIATEK_VPU config VIDEO_MEDIATEK_MDP tristate "Mediatek MDP driver" + depends on V4L_MEM2MEM_DRIVERS depends on MTK_IOMMU || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST @@ -318,6 +342,7 @@ config VIDEO_MEDIATEK_MDP config VIDEO_MEDIATEK_VCODEC tristate "Mediatek Video Codec driver" + depends on V4L_MEM2MEM_DRIVERS depends on MTK_IOMMU || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST @@ -353,6 +378,7 @@ config VIDEO_MEDIATEK_VCODEC_SCP config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on HAS_DMA select VIDEOBUF2_DMA_CONTIG @@ -362,6 +388,7 @@ config VIDEO_MEM2MEM_DEINTERLACE config VIDEO_MESON_GE2D tristate "Amlogic 2D Graphic Acceleration Unit" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MESON || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -375,6 +402,7 @@ config VIDEO_MESON_GE2D config VIDEO_SAMSUNG_S5P_G2D tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -385,6 +413,7 @@ config VIDEO_SAMSUNG_S5P_G2D config VIDEO_SAMSUNG_S5P_JPEG tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -395,6 +424,7 @@ config VIDEO_SAMSUNG_S5P_JPEG config VIDEO_SAMSUNG_S5P_MFC tristate "Samsung S5P MFC Video Codec" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -403,6 +433,7 @@ config VIDEO_SAMSUNG_S5P_MFC config VIDEO_MX2_EMMAPRP tristate "MX2 eMMa-PrP support" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on SOC_IMX27 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -414,6 +445,7 @@ config VIDEO_MX2_EMMAPRP config VIDEO_SAMSUNG_EXYNOS_GSC tristate "Samsung Exynos G-Scaler driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -423,6 +455,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC config VIDEO_STI_BDISP tristate "STMicroelectronics BDISP 2D blitter driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_STI || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -432,6 +465,7 @@ config VIDEO_STI_BDISP config VIDEO_STI_HVA tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_STI || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -446,6 +480,7 @@ config VIDEO_STI_HVA config VIDEO_STI_HVA_DEBUGFS bool "Export STMicroelectronics HVA internals in debugfs" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_STI_HVA depends on DEBUG_FS help @@ -457,6 +492,7 @@ config VIDEO_STI_HVA_DEBUGFS config VIDEO_STI_DELTA tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_STI || COMPILE_TEST help @@ -471,11 +507,10 @@ config VIDEO_STI_DELTA Please notice that the driver will only be built if at least one of the DELTA decoder below is selected. -if VIDEO_STI_DELTA - config VIDEO_STI_DELTA_MJPEG bool "STMicroelectronics DELTA MJPEG support" default y + depends on VIDEO_STI_DELTA help Enables DELTA MJPEG hardware support. @@ -491,10 +526,9 @@ config VIDEO_STI_DELTA_DRIVER select V4L2_MEM2MEM_DEV select RPMSG -endif # VIDEO_STI_DELTA - config VIDEO_STM32_DMA2D tristate "STM32 Chrom-Art Accelerator (DMA2D)" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_STM32 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -507,6 +541,7 @@ config VIDEO_STM32_DMA2D config VIDEO_RENESAS_FDP1 tristate "Renesas Fine Display Processor" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_RENESAS || COMPILE_TEST depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP @@ -521,6 +556,7 @@ config VIDEO_RENESAS_FDP1 config VIDEO_RENESAS_JPU tristate "Renesas JPEG Processing Unit" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_RENESAS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -533,6 +569,7 @@ config VIDEO_RENESAS_JPU config VIDEO_RENESAS_FCP tristate "Renesas Frame Compression Processor" + depends on V4L_MEM2MEM_DRIVERS depends on ARCH_RENESAS || COMPILE_TEST depends on OF help @@ -546,6 +583,7 @@ config VIDEO_RENESAS_FCP config VIDEO_RENESAS_VSP1 tristate "Renesas VSP1 Video Processing Engine" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_RENESAS || COMPILE_TEST depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP @@ -561,6 +599,7 @@ config VIDEO_RENESAS_VSP1 config VIDEO_ROCKCHIP_RGA tristate "Rockchip Raster 2d Graphic Acceleration Unit" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_ROCKCHIP || COMPILE_TEST select VIDEOBUF2_DMA_SG @@ -575,6 +614,7 @@ config VIDEO_ROCKCHIP_RGA config VIDEO_TI_VPE tristate "TI VPE (Video Processing Engine) driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on SOC_DRA7XX || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -588,12 +628,14 @@ config VIDEO_TI_VPE config VIDEO_TI_VPE_DEBUG bool "VPE debug messages" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_TI_VPE help Enable debug messages on VPE driver. config VIDEO_QCOM_VENUS tristate "Qualcomm Venus V4L2 encoder/decoder driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST select QCOM_MDT_LOADER if ARCH_QCOM @@ -608,6 +650,7 @@ config VIDEO_QCOM_VENUS config VIDEO_SUN8I_DEINTERLACE tristate "Allwinner Deinterlace driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_SUNXI || COMPILE_TEST depends on COMMON_CLK && OF @@ -621,6 +664,7 @@ config VIDEO_SUN8I_DEINTERLACE config VIDEO_SUN8I_ROTATE tristate "Allwinner DE2 rotation driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_SUNXI || COMPILE_TEST depends on COMMON_CLK && OF @@ -633,6 +677,7 @@ config VIDEO_SUN8I_ROTATE config VIDEO_TEGRA_VDE tristate "NVIDIA Tegra Video Decoder Engine driver" + depends on V4L_MEM2MEM_DRIVERS depends on ARCH_TEGRA || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 select DMA_SHARED_BUFFER @@ -650,6 +695,7 @@ config VIDEO_TEGRA_VDE config VIDEO_AMPHION_VPU tristate "Amphion VPU (Video Processing Unit) Codec IP" + depends on V4L_MEM2MEM_DRIVERS depends on ARCH_MXC || COMPILE_TEST depends on MEDIA_SUPPORT depends on VIDEO_DEV @@ -667,8 +713,6 @@ config VIDEO_AMPHION_VPU various NXP SoCs. To compile this driver as a module choose m here. -endif # V4L_MEM2MEM_DRIVERS - # TI VIDEO PORT Helper Modules # These will be selected by VPE and VIP config VIDEO_TI_VPDMA @@ -680,26 +724,13 @@ config VIDEO_TI_SC config VIDEO_TI_CSC tristate -menuconfig DVB_PLATFORM_DRIVERS - bool "DVB platform devices" - depends on MEDIA_DIGITAL_TV_SUPPORT - help - Say Y here to enable support for platform-specific Digital TV drivers. - -if DVB_PLATFORM_DRIVERS +# DVB platform drivers source "drivers/media/platform/sti/c8sectpfe/Kconfig" -endif #DVB_PLATFORM_DRIVERS - -menuconfig SDR_PLATFORM_DRIVERS - bool "SDR platform devices" - depends on MEDIA_SDR_SUPPORT - help - Say Y here to enable support for platform-specific SDR Drivers. - -if SDR_PLATFORM_DRIVERS +# SDR platform drivers config VIDEO_RCAR_DRIF tristate "Renesas Digital Radio Interface (DRIF)" + depends on SDR_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_RENESAS || COMPILE_TEST select VIDEOBUF2_VMALLOC @@ -712,5 +743,3 @@ config VIDEO_RCAR_DRIF To compile this driver as a module, choose M here; the module will be called rcar_drif. - -endif # SDR_PLATFORM_DRIVERS diff --git a/drivers/media/platform/am437x/Kconfig b/drivers/media/platform/am437x/Kconfig index 9ef898f512de..619cefca7590 100644 --- a/drivers/media/platform/am437x/Kconfig +++ b/drivers/media/platform/am437x/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_AM437X_VPFE tristate "TI AM437x VPFE video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on SOC_AM43XX || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig index f83bee373d82..5122290729ae 100644 --- a/drivers/media/platform/atmel/Kconfig +++ b/drivers/media/platform/atmel/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_ATMEL_ISC tristate "ATMEL Image Sensor Controller (ISC) support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK depends on ARCH_AT91 || COMPILE_TEST select MEDIA_CONTROLLER @@ -15,6 +16,7 @@ config VIDEO_ATMEL_ISC config VIDEO_ATMEL_XISC tristate "ATMEL eXtended Image Sensor Controller (XISC) support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API depends on ARCH_AT91 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -33,6 +35,7 @@ config VIDEO_ATMEL_ISC_BASE config VIDEO_ATMEL_ISI tristate "ATMEL Image Sensor Interface (ISI) support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_AT91 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -43,6 +46,7 @@ config VIDEO_ATMEL_ISI config VIDEO_MICROCHIP_CSI2DC tristate "Microchip CSI2 Demux Controller" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK && OF depends on ARCH_AT91 || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/cadence/Kconfig index 80cf601323ce..79a7e9fb2575 100644 --- a/drivers/media/platform/cadence/Kconfig +++ b/drivers/media/platform/cadence/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_CADENCE bool "Cadence Video Devices" + depends on V4L_PLATFORM_DRIVERS help If you have a media device designed by Cadence, say Y. diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig index 9d2a9eeb3499..7e5f92b0082a 100644 --- a/drivers/media/platform/davinci/Kconfig +++ b/drivers/media/platform/davinci/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_DAVINCI_VPIF_DISPLAY tristate "TI DaVinci VPIF V4L2-Display driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -17,6 +18,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY config VIDEO_DAVINCI_VPIF_CAPTURE tristate "TI DaVinci VPIF video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -32,6 +34,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE config VIDEO_DM6446_CCDC tristate "TI DM6446 CCDC video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -48,6 +51,7 @@ config VIDEO_DM6446_CCDC config VIDEO_DM355_CCDC tristate "TI DM355 CCDC video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -64,6 +68,7 @@ config VIDEO_DM355_CCDC config VIDEO_DM365_ISIF tristate "TI DM365 ISIF video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -78,6 +83,7 @@ config VIDEO_DM365_ISIF config VIDEO_DAVINCI_VPBE_DISPLAY tristate "TI DaVinci VPBE V4L2-Display driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig index 136d3b2a0fbb..868bb86c7699 100644 --- a/drivers/media/platform/exynos4-is/Kconfig +++ b/drivers/media/platform/exynos4-is/Kconfig @@ -2,6 +2,7 @@ config VIDEO_SAMSUNG_EXYNOS4_IS tristate "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF && COMMON_CLK depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/imx-jpeg/Kconfig b/drivers/media/platform/imx-jpeg/Kconfig index 2fdd648cda80..cbf6101a8b1d 100644 --- a/drivers/media/platform/imx-jpeg/Kconfig +++ b/drivers/media/platform/imx-jpeg/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config VIDEO_IMX8_JPEG tristate "IMX8 JPEG Encoder/Decoder" + depends on V4L_MEM2MEM_DRIVERS depends on ARCH_MXC || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/platform/imx/Kconfig b/drivers/media/platform/imx/Kconfig index 683863572c20..7cd0617c9b1b 100644 --- a/drivers/media/platform/imx/Kconfig +++ b/drivers/media/platform/imx/Kconfig @@ -2,6 +2,7 @@ menuconfig VIDEO_IMX bool "V4L2 capture drivers for NXP i.MX devices" + depends on V4L_PLATFORM_DRIVERS depends on ARCH_MXC || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 help diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig index 3e3f86264762..bfe655b2cedd 100644 --- a/drivers/media/platform/marvell-ccic/Kconfig +++ b/drivers/media/platform/marvell-ccic/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_CAFE_CCIC tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" + depends on V4L_PLATFORM_DRIVERS depends on PCI && I2C && VIDEO_V4L2 depends on COMMON_CLK select VIDEO_OV7670 @@ -14,6 +15,7 @@ config VIDEO_CAFE_CCIC config VIDEO_MMP_CAMERA tristate "Marvell Armada 610 integrated camera controller support" + depends on V4L_PLATFORM_DRIVERS depends on I2C && VIDEO_V4L2 depends on ARCH_MMP || COMPILE_TEST depends on COMMON_CLK diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig index de16de46c0f4..789d5e5686c7 100644 --- a/drivers/media/platform/omap/Kconfig +++ b/drivers/media/platform/omap/Kconfig @@ -6,6 +6,7 @@ config VIDEO_OMAP2_VOUT_VRFB config VIDEO_OMAP2_VOUT tristate "OMAP2/OMAP3 V4L2-Display driver" + depends on V4L_PLATFORM_DRIVERS depends on MMU depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=n) depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST diff --git a/drivers/media/platform/rcar-vin/Kconfig b/drivers/media/platform/rcar-vin/Kconfig index 030312d862e7..34b7ea6f1246 100644 --- a/drivers/media/platform/rcar-vin/Kconfig +++ b/drivers/media/platform/rcar-vin/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config VIDEO_RCAR_CSI2 tristate "R-Car MIPI CSI-2 Receiver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_RENESAS || COMPILE_TEST select MEDIA_CONTROLLER @@ -16,6 +17,7 @@ config VIDEO_RCAR_CSI2 config VIDEO_RCAR_VIN tristate "R-Car Video Input (VIN) Driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_RENESAS || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/sti/c8sectpfe/Kconfig index 369509e03071..702b910509c9 100644 --- a/drivers/media/platform/sti/c8sectpfe/Kconfig +++ b/drivers/media/platform/sti/c8sectpfe/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DVB_C8SECTPFE tristate "STMicroelectronics C8SECTPFE DVB support" + depends on DVB_PLATFORM_DRIVERS depends on PINCTRL && DVB_CORE && I2C depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST select FW_LOADER diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media/platform/sunxi/sun4i-csi/Kconfig index 903c6152f6e8..43ad2dd7da5d 100644 --- a/drivers/media/platform/sunxi/sun4i-csi/Kconfig +++ b/drivers/media/platform/sunxi/sun4i-csi/Kconfig @@ -2,6 +2,7 @@ config VIDEO_SUN4I_CSI tristate "Allwinner A10 CMOS Sensor Interface Support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/sunxi/sun6i-csi/Kconfig index 586e3fb3a80d..6d9cf1963c41 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/Kconfig +++ b/drivers/media/platform/sunxi/sun6i-csi/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_SUN6I_CSI tristate "Allwinner V3s Camera Sensor Interface driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig index 44587dccacf1..a9531d5efd50 100644 --- a/drivers/media/platform/xilinx/Kconfig +++ b/drivers/media/platform/xilinx/Kconfig @@ -2,6 +2,7 @@ config VIDEO_XILINX tristate "Xilinx Video IP (EXPERIMENTAL)" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF && HAS_DMA select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API From patchwork Mon Mar 14 07:55:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779802 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E27BC433FE for ; Mon, 14 Mar 2022 07:56:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236931AbiCNH5h (ORCPT ); Mon, 14 Mar 2022 03:57:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236891AbiCNH5d (ORCPT ); Mon, 14 Mar 2022 03:57:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4062841332; Mon, 14 Mar 2022 00:56:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 74EA56118B; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37D84C3410A; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=hcqGiVMGEQIJn5Zfm3Z7qG75i5R0pCGvpzO7FNRk+eU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZA02ar7X7XIKezfgSma6shYE1pnDu79d9iWt0NjnZTqCO7TJXjEx88lvZTnXlCIZH asVqWAxZIXSV9ixD5RqbesRnMkMvafAb9z455NYnELgf6TOypLCE18UYHe8OygjIeX fb9MV+UzXOVRQEKfez9QeC6Fxgb5y93lwfkd+SUQHqW8s9tDcfk9q1pjPv/e9YnTnH dG+o6g/rUu2fjfOCLO7hcAQCOBG0HEcN34QYZRjqoG6ZYhCbbI6urAWfxruTQ6L0pL yVbWQr2bqbzgUqqMjL8rdQmDErhpDU0FhGxnJjZ0/R+2rB7NdKdYFqYyt4FwOCjqfC MTZZJBPokE8yg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kV5-UT; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 14/64] media: platform: exynos-gsc: move config to its own file Date: Mon, 14 Mar 2022 08:55:06 +0100 Message-Id: <03342e1f211a7062cc435797a19d7cfa7aa145d5.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org In order to better organize the platform/Kconfig, place exynos-gsc-specific config stuff on a separate Kconfig file. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 11 +---------- drivers/media/platform/exynos-gsc/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 drivers/media/platform/exynos-gsc/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 0bf9dd5da845..57ca2426a83b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -46,6 +46,7 @@ source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/coda/Kconfig" source "drivers/media/platform/davinci/Kconfig" +source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/aspeed/Kconfig" @@ -317,16 +318,6 @@ config VIDEO_SAMSUNG_S5P_MFC help MFC 5.1 and 6.x driver for V4L2 -config VIDEO_SAMSUNG_EXYNOS_GSC - tristate "Samsung Exynos G-Scaler driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_EXYNOS || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler. - config VIDEO_STI_BDISP tristate "STMicroelectronics BDISP 2D blitter driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/exynos-gsc/Kconfig b/drivers/media/platform/exynos-gsc/Kconfig new file mode 100644 index 000000000000..f9bdffe915b4 --- /dev/null +++ b/drivers/media/platform/exynos-gsc/Kconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_SAMSUNG_EXYNOS_GSC + tristate "Samsung Exynos G-Scaler driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_EXYNOS || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler. From patchwork Mon Mar 14 07:55:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779806 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E17DEC4167B for ; Mon, 14 Mar 2022 07:56:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237111AbiCNH56 (ORCPT ); Mon, 14 Mar 2022 03:57:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237017AbiCNH5v (ORCPT ); Mon, 14 Mar 2022 03:57:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0600841997; Mon, 14 Mar 2022 00:56:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 185B2611FD; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F43FC341E3; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=Mm+qCsHSu8Dp1CpN98CSeM8jWa7KHMho9OOVupv4bwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ihX3qxY/RaPxjoslofATvI6eE2r8Wxji3JRZkmFDJU+NHOPHNURtgsiJOKPM+lbDy inwXKJyzSBz3UTMNdyL41+11FyCkN6Jo8z/4NtsDq7xLqoUWgHY4HIoEYGZwRY5+Yc rHkFMfRd2pvLhZx093PnvylkhfVApYIAL6tr103Ej49mJCAE2E8GwJUGzpc8y0ZL4H pA1BCyNBZgauFIpVQqC+sLau8+J86CZ6cN7KBXcBC4fjcqmIlCgbbqMHHCIsJJUZ+R lmkUZ4qYtwGBHrT5UGlPnNX2FAUMwxc8E+MgU6+IvKjsc20og1gGrntYmb6phd16VT yXUtnVM1FkndQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXP-Dm; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Greg Kroah-Hartman , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Lad Prabhakar , Laurent Pinchart , Lee Jones , Lv Yunlong , Ming Qian , Sakari Ailus , Shawn Guo , Sylwester Nawrocki , Tomi Valkeinen , Yang Li , Zhen Lei , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 50/64] media: platform: rename exynos4-is/ to samsung/exynos4-is/ Date: Mon, 14 Mar 2022 08:55:42 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename exynos4-is/ to samsung/exynos4-is/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mchehab@kernel.org/ Documentation/admin-guide/media/fimc.rst | 2 +- .../driver-api/media/drivers/fimc-devel.rst | 14 +++++++------- MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- .../platform/{ => samsung}/exynos4-is/Kconfig | 0 .../platform/{ => samsung}/exynos4-is/Makefile | 0 .../platform/{ => samsung}/exynos4-is/common.c | 0 .../platform/{ => samsung}/exynos4-is/common.h | 0 .../{ => samsung}/exynos4-is/fimc-capture.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-core.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-core.h | 0 .../{ => samsung}/exynos4-is/fimc-is-command.h | 0 .../{ => samsung}/exynos4-is/fimc-is-errno.c | 0 .../{ => samsung}/exynos4-is/fimc-is-errno.h | 0 .../{ => samsung}/exynos4-is/fimc-is-i2c.c | 0 .../{ => samsung}/exynos4-is/fimc-is-i2c.h | 0 .../{ => samsung}/exynos4-is/fimc-is-param.c | 0 .../{ => samsung}/exynos4-is/fimc-is-param.h | 0 .../{ => samsung}/exynos4-is/fimc-is-regs.c | 0 .../{ => samsung}/exynos4-is/fimc-is-regs.h | 0 .../{ => samsung}/exynos4-is/fimc-is-sensor.c | 0 .../{ => samsung}/exynos4-is/fimc-is-sensor.h | 0 .../platform/{ => samsung}/exynos4-is/fimc-is.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-is.h | 0 .../{ => samsung}/exynos4-is/fimc-isp-video.c | 0 .../{ => samsung}/exynos4-is/fimc-isp-video.h | 0 .../platform/{ => samsung}/exynos4-is/fimc-isp.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-isp.h | 0 .../{ => samsung}/exynos4-is/fimc-lite-reg.c | 0 .../{ => samsung}/exynos4-is/fimc-lite-reg.h | 0 .../platform/{ => samsung}/exynos4-is/fimc-lite.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-lite.h | 0 .../platform/{ => samsung}/exynos4-is/fimc-m2m.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-reg.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-reg.h | 0 .../platform/{ => samsung}/exynos4-is/media-dev.c | 0 .../platform/{ => samsung}/exynos4-is/media-dev.h | 0 .../platform/{ => samsung}/exynos4-is/mipi-csis.c | 0 .../platform/{ => samsung}/exynos4-is/mipi-csis.h | 0 40 files changed, 11 insertions(+), 11 deletions(-) rename drivers/media/platform/{ => samsung}/exynos4-is/Kconfig (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/Makefile (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/common.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/common.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-capture.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-core.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-core.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-command.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-errno.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-errno.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-i2c.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-i2c.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-param.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-param.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-regs.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-regs.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-sensor.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-sensor.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp-video.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp-video.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite-reg.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite-reg.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-m2m.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-reg.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-reg.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/media-dev.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/media-dev.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/mipi-csis.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/mipi-csis.h (100%) diff --git a/Documentation/admin-guide/media/fimc.rst b/Documentation/admin-guide/media/fimc.rst index 56b149d9a527..267ef52fe387 100644 --- a/Documentation/admin-guide/media/fimc.rst +++ b/Documentation/admin-guide/media/fimc.rst @@ -14,7 +14,7 @@ data from LCD controller (FIMD) through the SoC internal writeback data path. There are multiple FIMC instances in the SoCs (up to 4), having slightly different capabilities, like pixel alignment constraints, rotator availability, LCD writeback support, etc. The driver is located at -drivers/media/platform/exynos4-is directory. +drivers/media/platform/samsung/exynos4-is directory. Supported SoCs -------------- diff --git a/Documentation/driver-api/media/drivers/fimc-devel.rst b/Documentation/driver-api/media/drivers/fimc-devel.rst index 956e3a9901f8..4c6b7c8be19f 100644 --- a/Documentation/driver-api/media/drivers/fimc-devel.rst +++ b/Documentation/driver-api/media/drivers/fimc-devel.rst @@ -12,22 +12,22 @@ Files partitioning - media device driver - drivers/media/platform/exynos4-is/media-dev.[ch] + drivers/media/platform/samsung/exynos4-is/media-dev.[ch] - camera capture video device driver - drivers/media/platform/exynos4-is/fimc-capture.c + drivers/media/platform/samsung/exynos4-is/fimc-capture.c - MIPI-CSI2 receiver subdev - drivers/media/platform/exynos4-is/mipi-csis.[ch] + drivers/media/platform/samsung/exynos4-is/mipi-csis.[ch] - video post-processor (mem-to-mem) - drivers/media/platform/exynos4-is/fimc-core.c + drivers/media/platform/samsung/exynos4-is/fimc-core.c - common files - drivers/media/platform/exynos4-is/fimc-core.h - drivers/media/platform/exynos4-is/fimc-reg.h - drivers/media/platform/exynos4-is/regs-fimc.h + drivers/media/platform/samsung/exynos4-is/fimc-core.h + drivers/media/platform/samsung/exynos4-is/fimc-reg.h + drivers/media/platform/samsung/exynos4-is/regs-fimc.h diff --git a/MAINTAINERS b/MAINTAINERS index 74901acf8f06..b1418853d56f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17103,7 +17103,7 @@ M: Sylwester Nawrocki L: linux-media@vger.kernel.org S: Supported Q: https://patchwork.linuxtv.org/project/linux-media/list/ -F: drivers/media/platform/exynos4-is/ +F: drivers/media/platform/samsung/exynos4-is/ SAMSUNG SOC CLOCK DRIVERS M: Sylwester Nawrocki diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 7b88ef15f8c8..6d2221a9c6ee 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -75,7 +75,6 @@ source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/exynos-gsc/Kconfig" -source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" @@ -94,6 +93,7 @@ source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" +source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 7a28b60dbbe6..613ca6a3efa7 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -15,7 +15,6 @@ obj-y += cadence/ obj-y += chips-media/ obj-y += davinci/ obj-y += exynos-gsc/ -obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ @@ -36,6 +35,7 @@ obj-y += s3c-camif/ obj-y += s5p-g2d/ obj-y += s5p-jpeg/ obj-y += s5p-mfc/ +obj-y += samsung/exynos4-is/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/samsung/exynos4-is/Kconfig similarity index 100% rename from drivers/media/platform/exynos4-is/Kconfig rename to drivers/media/platform/samsung/exynos4-is/Kconfig diff --git a/drivers/media/platform/exynos4-is/Makefile b/drivers/media/platform/samsung/exynos4-is/Makefile similarity index 100% rename from drivers/media/platform/exynos4-is/Makefile rename to drivers/media/platform/samsung/exynos4-is/Makefile diff --git a/drivers/media/platform/exynos4-is/common.c b/drivers/media/platform/samsung/exynos4-is/common.c similarity index 100% rename from drivers/media/platform/exynos4-is/common.c rename to drivers/media/platform/samsung/exynos4-is/common.c diff --git a/drivers/media/platform/exynos4-is/common.h b/drivers/media/platform/samsung/exynos4-is/common.h similarity index 100% rename from drivers/media/platform/exynos4-is/common.h rename to drivers/media/platform/samsung/exynos4-is/common.h diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/samsung/exynos4-is/fimc-capture.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-capture.c rename to drivers/media/platform/samsung/exynos4-is/fimc-capture.c diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/samsung/exynos4-is/fimc-core.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-core.c rename to drivers/media/platform/samsung/exynos4-is/fimc-core.c diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/samsung/exynos4-is/fimc-core.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-core.h rename to drivers/media/platform/samsung/exynos4-is/fimc-core.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-command.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-command.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-command.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-command.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-errno.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-errno.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-i2c.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-i2c.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-param.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-param.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-param.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-param.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-regs.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-regs.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-sensor.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-sensor.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/samsung/exynos4-is/fimc-is.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is.c diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/samsung/exynos4-is/fimc-is.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is.h diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp-video.c rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.h b/drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp-video.h rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/samsung/exynos4-is/fimc-isp.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp.c rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.c diff --git a/drivers/media/platform/exynos4-is/fimc-isp.h b/drivers/media/platform/samsung/exynos4-is/fimc-isp.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp.h rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.h diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite-reg.c rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.h b/drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite-reg.h rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite.c rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.c diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/platform/samsung/exynos4-is/fimc-lite.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite.h rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.h diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/samsung/exynos4-is/fimc-m2m.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-m2m.c rename to drivers/media/platform/samsung/exynos4-is/fimc-m2m.c diff --git a/drivers/media/platform/exynos4-is/fimc-reg.c b/drivers/media/platform/samsung/exynos4-is/fimc-reg.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-reg.c rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.c diff --git a/drivers/media/platform/exynos4-is/fimc-reg.h b/drivers/media/platform/samsung/exynos4-is/fimc-reg.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-reg.h rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.h diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/samsung/exynos4-is/media-dev.c similarity index 100% rename from drivers/media/platform/exynos4-is/media-dev.c rename to drivers/media/platform/samsung/exynos4-is/media-dev.c diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/samsung/exynos4-is/media-dev.h similarity index 100% rename from drivers/media/platform/exynos4-is/media-dev.h rename to drivers/media/platform/samsung/exynos4-is/media-dev.h diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c similarity index 100% rename from drivers/media/platform/exynos4-is/mipi-csis.c rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.c diff --git a/drivers/media/platform/exynos4-is/mipi-csis.h b/drivers/media/platform/samsung/exynos4-is/mipi-csis.h similarity index 100% rename from drivers/media/platform/exynos4-is/mipi-csis.h rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.h From patchwork Mon Mar 14 07:55:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779808 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31080C433F5 for ; Mon, 14 Mar 2022 07:57:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237004AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236923AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1678F4132D; Mon, 14 Mar 2022 00:56:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0CBB6B80D52; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FB02C341E4; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=NUWZ3FrsjEU1KQK0UFRKOIlNOBV2tg90c49kOIeAcx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SRS/v5RdHkMQIvcur+1IsoQ3k3FsVxkNsIf1SOB5+gztEp2R5k1qPVBI9AvUTnYm1 asVTnNL+D1aeKa8L6g+uEXv3FHO8mKNW0b8ro+U6J89dc4FKuxYbH4VyNCi+58p+yL uCKVmo9Wzt+ALMFP7APKHPnG1JjY302EkpxYsuA2s9XThz+Un7CFFg1Mdl69Hy6ysx XgxQud5dkBkaHnv7oAndCYyY+PR5saXZj+I2Q4pz5p2NptxAayA7VZk6xZ4ga/bhId 4LtIA1UHZwixLEaQQ9NVrCu+DIRcufgA/ruossIPGSLP7ci52w7YkHUOomaHvBDkys mg/WEU8BrFyVQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXT-FS; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jonathan Cameron , Krzysztof Kozlowski , Lad Prabhakar , Laurent Pinchart , Ming Qian , Sakari Ailus , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 51/64] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/ Date: Mon, 14 Mar 2022 08:55:43 +0100 Message-Id: <079d0d718c65424edd82e5b094211f1433094c93.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename exynos-gsc/ to samsung/exynos-gsc/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => samsung}/exynos-gsc/Kconfig | 0 drivers/media/platform/{ => samsung}/exynos-gsc/Makefile | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.c | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.h | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-m2m.c | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.c | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.h | 0 9 files changed, 2 insertions(+), 2 deletions(-) rename drivers/media/platform/{ => samsung}/exynos-gsc/Kconfig (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/Makefile (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.c (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.h (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-m2m.c (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.c (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.h (100%) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 6d2221a9c6ee..dca53f6a1b33 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -74,7 +74,6 @@ source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/davinci/Kconfig" -source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" @@ -93,6 +92,7 @@ source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" +source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 613ca6a3efa7..848cbd6147ae 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -14,7 +14,6 @@ obj-y += atmel/ obj-y += cadence/ obj-y += chips-media/ obj-y += davinci/ -obj-y += exynos-gsc/ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ @@ -35,6 +34,7 @@ obj-y += s3c-camif/ obj-y += s5p-g2d/ obj-y += s5p-jpeg/ obj-y += s5p-mfc/ +obj-y += samsung/exynos-gsc/ obj-y += samsung/exynos4-is/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ diff --git a/drivers/media/platform/exynos-gsc/Kconfig b/drivers/media/platform/samsung/exynos-gsc/Kconfig similarity index 100% rename from drivers/media/platform/exynos-gsc/Kconfig rename to drivers/media/platform/samsung/exynos-gsc/Kconfig diff --git a/drivers/media/platform/exynos-gsc/Makefile b/drivers/media/platform/samsung/exynos-gsc/Makefile similarity index 100% rename from drivers/media/platform/exynos-gsc/Makefile rename to drivers/media/platform/samsung/exynos-gsc/Makefile diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/samsung/exynos-gsc/gsc-core.c similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-core.c rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.c diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/samsung/exynos-gsc/gsc-core.h similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-core.h rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.h diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-m2m.c rename to drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.c b/drivers/media/platform/samsung/exynos-gsc/gsc-regs.c similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-regs.c rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.c diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.h b/drivers/media/platform/samsung/exynos-gsc/gsc-regs.h similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-regs.h rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.h From patchwork Mon Mar 14 07:55:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779804 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 559ADC4167B for ; Mon, 14 Mar 2022 07:56:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236519AbiCNH5y (ORCPT ); Mon, 14 Mar 2022 03:57:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237001AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CD754163E; Mon, 14 Mar 2022 00:56:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DDC94611E4; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C32EC341E6; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=f0gLLvVNLq+QdnIAJ7MjXom3256f3cZ5lDOYgZlUuog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fXDIn4JYtgKVAK0wu3HY06PJovgNXt65MRLLxOe+9MkNtugC/XM5bKAkcalzlGt4n x2W1dgUkVFw1wIuqiR8+bKy+xkIIvEXRpsUMcz5dTB/fAkQSWl/SjylVBHYnPZFfao gadeuuddQ1YofZCpg/ZPZcktApgHGYJSXC7zKhTmWUXMPeAFVq7QPI7qLmrMLqYSBl VThh2ijcUpevKWjMPoQM1etAN87jqnEkFw51Ye0OqYva30qkSnz7ADYDw40CPyuNO9 nYC6CirQEzo9jscV3HEihZgUxKTqAIrJLkknBf2qmRD6dTbCZ3xJvP9bEWSphzwNCK JfyvJyQ5NS28A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXX-Go; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Dmitry Osipenko , Dongliang Mu , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Ming Qian , Randy Dunlap , Sakari Ailus , Sylwester Nawrocki , Tomi Valkeinen , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 52/64] media: platform: rename s3c-camif/ to samsung/s3c-camif/ Date: Mon, 14 Mar 2022 08:55:44 +0100 Message-Id: <3f964b49f49400603f871b73e25762e63142b732.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename s3c-camif/ to samsung/s3c-camif/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => samsung}/s3c-camif/Kconfig | 0 drivers/media/platform/{ => samsung}/s3c-camif/Makefile | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-capture.c | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-core.c | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-core.h | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.c | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.h | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => samsung}/s3c-camif/Kconfig (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/Makefile (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-capture.c (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-core.c (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-core.h (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.c (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b1418853d56f..8ce4894699cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17063,7 +17063,7 @@ M: Sylwester Nawrocki L: linux-media@vger.kernel.org L: linux-samsung-soc@vger.kernel.org S: Maintained -F: drivers/media/platform/s3c-camif/ +F: drivers/media/platform/samsung/s3c-camif/ F: include/media/drv-intf/s3c_camif.h SAMSUNG S3FWRN5 NFC DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index dca53f6a1b33..b371c0b258d1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" +source "drivers/media/platform/samsung/s3c-camif/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 848cbd6147ae..c3dfe40b2def 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y += qcom/venus/ obj-y += renesas/ obj-y += rockchip/rga/ obj-y += rockchip/rkisp1/ -obj-y += s3c-camif/ obj-y += s5p-g2d/ obj-y += s5p-jpeg/ obj-y += s5p-mfc/ obj-y += samsung/exynos-gsc/ obj-y += samsung/exynos4-is/ +obj-y += samsung/s3c-camif/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/s3c-camif/Kconfig b/drivers/media/platform/samsung/s3c-camif/Kconfig similarity index 100% rename from drivers/media/platform/s3c-camif/Kconfig rename to drivers/media/platform/samsung/s3c-camif/Kconfig diff --git a/drivers/media/platform/s3c-camif/Makefile b/drivers/media/platform/samsung/s3c-camif/Makefile similarity index 100% rename from drivers/media/platform/s3c-camif/Makefile rename to drivers/media/platform/samsung/s3c-camif/Makefile diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/samsung/s3c-camif/camif-capture.c similarity index 100% rename from drivers/media/platform/s3c-camif/camif-capture.c rename to drivers/media/platform/samsung/s3c-camif/camif-capture.c diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/samsung/s3c-camif/camif-core.c similarity index 100% rename from drivers/media/platform/s3c-camif/camif-core.c rename to drivers/media/platform/samsung/s3c-camif/camif-core.c diff --git a/drivers/media/platform/s3c-camif/camif-core.h b/drivers/media/platform/samsung/s3c-camif/camif-core.h similarity index 100% rename from drivers/media/platform/s3c-camif/camif-core.h rename to drivers/media/platform/samsung/s3c-camif/camif-core.h diff --git a/drivers/media/platform/s3c-camif/camif-regs.c b/drivers/media/platform/samsung/s3c-camif/camif-regs.c similarity index 100% rename from drivers/media/platform/s3c-camif/camif-regs.c rename to drivers/media/platform/samsung/s3c-camif/camif-regs.c diff --git a/drivers/media/platform/s3c-camif/camif-regs.h b/drivers/media/platform/samsung/s3c-camif/camif-regs.h similarity index 100% rename from drivers/media/platform/s3c-camif/camif-regs.h rename to drivers/media/platform/samsung/s3c-camif/camif-regs.h From patchwork Mon Mar 14 07:55:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779807 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3068EC4332F for ; Mon, 14 Mar 2022 07:56:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236994AbiCNH6C (ORCPT ); Mon, 14 Mar 2022 03:58:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235763AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F2B04162D; Mon, 14 Mar 2022 00:56:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C161C611DC; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C606CC36B14; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=GjqwKpHS8hMTGTpYhpZJCdxNXJ56txdSA8jqmhpXO+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tNdIaBAjDf+RMZCwntx+lYD5yAJemi4tLws3hPtEBkngbm9OcAS2n4LTjY6PhYYD2 5HX6r8OIkW1NO3R9/u/n2EFJTuPMBuUFOvKlYOm4aw1oVVSOfpO6DsWhzRmVrq7lxr t26hwtcu+ZGnz8vQBxtZi/lsQbbh8tGfAkBbGLGBG1+L6kwPFrBEoEu91IgFxM+i1u YscOBLklL0AVthLogOpz1B5wfaycFe9SxJbPLqwlnZ22bnJY6YHQ7qDsZ/WuQi2l5Z v0zbDvwkDSwvOmqOq7A4upQc3yzEmW0wpSI8pHdIfh1TGD7mSWauYbVvGql27N+J80 mAV1knGhUB/8Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXf-Ja; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andrzej Pietrasiewicz , Cai Huoqing , Colin Ian King , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Hans Verkuil , Jacek Anaszewski , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Laurentiu Palcu , Mikhail Ulyanov , Ming Qian , Mirela Rabulea , NXP Linux Team , Pengutronix Kernel Team , Randy Dunlap , Rikard Falkeborn , Sakari Ailus , Sascha Hauer , Shawn Guo , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 54/64] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/ Date: Mon, 14 Mar 2022 08:55:46 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename s5p-jpeg/ to samsung/s5p-jpeg/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 2 +- drivers/media/platform/renesas/rcar_jpu.c | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig | 0 drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile | 0 drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h | 2 +- .../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c | 0 .../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c | 0 drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h | 0 drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h | 2 +- 16 files changed, 11 insertions(+), 11 deletions(-) rename drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c (99%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h (99%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h (97%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c (99%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h (97%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 4c4be0d7ec14..dfd490369d48 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2633,7 +2633,7 @@ M: Sylwester Nawrocki L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-jpeg/ +F: drivers/media/platform/samsung/s5p-jpeg/ ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT M: Marek Szyprowski diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index aef7c35b2215..1b71ce772586 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/samsung/s3c-camif/Kconfig" source "drivers/media/platform/samsung/s5p-g2d/Kconfig" +source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index a5a068e18492..94bdd5d94bb2 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y += qcom/venus/ obj-y += renesas/ obj-y += rockchip/rga/ obj-y += rockchip/rkisp1/ -obj-y += s5p-jpeg/ obj-y += s5p-mfc/ obj-y += samsung/exynos-gsc/ obj-y += samsung/exynos4-is/ obj-y += samsung/s3c-camif/ obj-y += samsung/s5p-g2d/ +obj-y += samsung/s5p-jpeg/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c index 3b892c5792b4..d1ec1f4b506b 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -35,7 +35,7 @@ * it, enable dynamic debug for this module and: * echo 1 > /sys/module/mxc_jpeg_encdec/parameters/jpeg_tracing * - * This is inspired by the drivers/media/platform/s5p-jpeg driver + * This is inspired by the drivers/media/platform/samsung/s5p-jpeg driver * * Copyright 2018-2019 NXP */ diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c index 56bb464629ed..293beba131e2 100644 --- a/drivers/media/platform/renesas/rcar_jpu.c +++ b/drivers/media/platform/renesas/rcar_jpu.c @@ -4,7 +4,7 @@ * Copyright (C) 2014-2015 Cogent Embedded, Inc. * Copyright (C) 2014-2015 Renesas Electronics Corporation * - * This is based on the drivers/media/platform/s5p-jpeg driver by + * This is based on the drivers/media/platform/samsung/s5p-jpeg driver by * Andrzej Pietrasiewicz and Jacek Anaszewski. * Some portions of code inspired by VSP1 driver by Laurent Pinchart. * diff --git a/drivers/media/platform/s5p-jpeg/Kconfig b/drivers/media/platform/samsung/s5p-jpeg/Kconfig similarity index 100% rename from drivers/media/platform/s5p-jpeg/Kconfig rename to drivers/media/platform/samsung/s5p-jpeg/Kconfig diff --git a/drivers/media/platform/s5p-jpeg/Makefile b/drivers/media/platform/samsung/s5p-jpeg/Makefile similarity index 100% rename from drivers/media/platform/s5p-jpeg/Makefile rename to drivers/media/platform/samsung/s5p-jpeg/Makefile diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-core.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c index a8d9159d5ed8..5479bc8d474d 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.c +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c * * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-core.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h index 4a5fb1b15455..5570c79f122f 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h * * Copyright (c) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c similarity index 100% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h similarity index 97% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h index 68160befce39..15af928fad76 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h * * Copyright (c) 2014 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c similarity index 100% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h similarity index 100% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c index 491e9248286c..01b47b3df1e7 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h * * Copyright (c) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h similarity index 97% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h index 98ddf7097562..f068d52c66b7 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h * * Copyright (c) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-regs.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-regs.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h index 86f376b50581..c2298b680022 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-regs.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-regs.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h * * Register definition file for Samsung JPEG codec driver *