From patchwork Mon Mar 14 16:34:00 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: 12780558 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2AF68C433EF for ; Mon, 14 Mar 2022 17:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=R0a6pxcJBoV1INHpA0KbVq8O4wc//HzFMr8kXkDAYEM=; b=h68OPRQ6IrcUma JDyWFyYt4WGglAJlb+CcP5Tn52WRr8HYhwUFr0e0gUHLsDlBHghfN/s2DWyEBQLpLwE+r2S8ra4yx CoQgTfyAbPEmsK/2gCrhfqYiJS9Ad/LdEtTn71RqnYawXyng6rmMO7ulPdMmMosJcnJX8JqDMDVhb wjqdHFuRAWBvReLCEYCyY1tFZj/vWH4CLlFwcLR+7PhbwxKs42p9J0uOEA+xrt5MbJiIKb4wG5dko z70ZxY3d72AQS86spXFJuP+SKUsui3qDZ8ENNhJhs14Fa++HT0AEvz+7NcsH4tapPoTuuI3Y8zk8I 5nEhXapb/HTEG4nlzIsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToJy-006Jvn-2e; Mon, 14 Mar 2022 17:17:27 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToD8-006HQe-NA for linux-arm-kernel@bombadil.infradead.org; Mon, 14 Mar 2022 17:10:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=86Dayv03k1vpb2PtvkTT7D7xtay6bHDp0nnOva4H6DQ=; b=i0C3jQ8ORvKKsTnw2lK+mqK7iT ZLOOK8H557nZDYciwaLhrq3P/G51LExL9+G7AmpnFQQbkbYYB8h1dAgwWJRfh9cFkto45rThOy/t+ j8pKtdVkcSIKnpy9fXqoHu+6OugcfRxHDAbcM46S/7DoOl+kj87YOTo0INn0iSoZ3Dj32KVZEjN43 rTSGuFRjOKDJ+HiSI0XfV54I7QobtPWUT7PeDwjAO3pWqMsKZEiYr6uB9QwCIKt0eamn+8dHiy5cT XmmnG1+kWf8gddUN8/7K66O2Qo05zrC4SoBg9Z3hv2AACb2GPT7XWlgDi+lwEVANF5tB+4G/v1Huw IN7k0C+A==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf6-000uEt-1c for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:19 +0000 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 8BB256141C; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7A60C36AE9; Mon, 14 Mar 2022 16:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=cEp+KzrPMm0xOlErYUJrQmDHeRQLbE8Vm9QH8u24Ka4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VQjaqsgB/dOrHRgKyxVoysXBEWzkWdgIEWRqgIdfMYCEOawVGf3glEvWdgncdzLju cJXaWnZRp5ub8guvCRpO3E/QQp5lP5Zr8AzqVPExBVe8OIJKSyOHr/yhlod1cS68yu gr1COzc8Ltr+nuFpa3Hxqm/AEyfWqGXV1J0Oboc7GWCd40JIHnOL+kWi1eFWirWBXP LCi43pBp+IzcEJdUimco7I0gGXoaCHFORVa2bHFfeouVKxlqhQAT5ua6Tkyde36yGy N9LhYdUGA3I7Yo/rpfENb+UluYM8/STerg6cRHUjk57cYhcv/qwAw4w4wjmgOUKY2e vPcO0msVQG77w== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTney-001wwR-EI; Mon, 14 Mar 2022 17:35:04 +0100 From: Mauro Carvalho Chehab To: Subject: [PATCH v2 05/67] media: platform: move platform menu dependencies to drivers Date: Mon, 14 Mar 2022 17:34:00 +0100 Message-Id: <256bf685691d86462a62e1d7041385baf0dfe595.1647274406.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163512_401232_EC722F59 X-CRM114-Status: GOOD ( 20.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Geert Uytterhoeven , linux-kernel@vger.kernel.org, Mirela Rabulea , Ludovic Desroches , Laurent Pinchart , Dmitry Osipenko , Fabio Estevam , linux-samsung-soc@vger.kernel.org, Krzysztof Kozlowski , Michal Simek , Jernej Skrabec , Chen-Yu Tsai , NXP Linux Team , linux-sunxi@lists.linux.dev, linux-media@vger.kernel.org, Jacopo Mondi , Sascha Hauer , Maxime Ripard , Rui Miguel Silva , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, =?utf-8?q?Niklas_S=C3=B6derlund?= , Hyun Kwon , Pengutronix Kernel Team , Hans Verkuil , Eugen Hristev , Shawn Guo , Ming Qian Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.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 16:34:01 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: 12780467 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3D162C433F5 for ; Mon, 14 Mar 2022 16:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/1DIYZ3sIxoVpcbGzBL1iF2wRBWz9GE6Hcs5aeThHFs=; b=WnawIMtTfhkMYG n27dJBHUhzA6d7qBsyW6vnDUJ2I9Nw7vI7zU1KjhYvI4vqh+/OFbb81zX/chZ/rMpv8xuGM0Z1UVP W1bZgKS83wUqFuhOu+edjd11gCQ+vKOKriwhvHBF2X2/HrkuMfEbXhkEq7etwSqmvGwEBeiYpiua7 +kOzcW4BiV8pXVOxNdPsXAKjktdvb0d4e5udma8yt1Bh7hoKTV62YhEuACsexg8VT91Z0f2pZOQp7 4+ZoFC+sX5OC+XFnWNpX10Xe5I6Fs7sxvYaRLyF0Hw4B1TPB9EIEmEFjdpyS7H7uqQTnHhyJD0J00 aFeXsBpEB9fL04KG0exQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnhN-0064JQ-Nk; Mon, 14 Mar 2022 16:37:34 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf2-0063Cl-LR for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:14 +0000 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 61F336135C; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6711C340F7; Mon, 14 Mar 2022 16:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275706; bh=pGdMVo81L21nG9yhzpJ4FAUxkhj+Km9odTkR6fwp/F4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C7VEwuHpUixh3uASPaVRn5XFgd9qBRGXm2InpJIZ6XfvvsjPjR+9ZrW6HcrrFjoOg MV3gZsgIY1iiIDA5KNGwjl/6OtPcVtZhV8n7KMSgpImb3Q1nJJzEUhO2fOg+T5Qw59 MggUQx1UmhRUcfSbtBKHnphRcKDJrItHbd3D11ntzxNW7DL8rfrI1Te4rP3GJF9CqU T44iUq2ojBID43uO+t+LXsmiRdh/N4r4LjuFgVNPFiAcBZ2owDvLKMlxheRYSTkrI+ V30v3Gr9KM8I+COGWzXZrhVgIqnP7IRQEmQOyzaSKC9uBk9czJLczK4gZW3o4Krtwo hhFow68/jywhw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTney-001wwU-Gb; Mon, 14 Mar 2022 17:35:04 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andrew Jeffery , Dmitry Osipenko , Eddie James , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jammy Huang , Jernej Skrabec , Joel Stanley , Laurent Pinchart , Ming Qian , Paul Menzel , Yang Li , Zev Weiss , linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, openbmc@lists.ozlabs.org Subject: [PATCH v2 06/67] media: platform: place Aspeed driver on a separate dir Date: Mon, 14 Mar 2022 17:34:01 +0100 Message-Id: <69c5ee8aae03bb9f9a8a825175a1cd0644eaf20c.1647274406.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_093508_919000_179B7053 X-CRM114-Status: GOOD ( 17.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to cleanup the main platform media directory, move Aspeed driver to its own directory. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 10 +--------- drivers/media/platform/Makefile | 2 +- drivers/media/platform/aspeed/Kconfig | 10 ++++++++++ drivers/media/platform/aspeed/Makefile | 2 ++ drivers/media/platform/{ => aspeed}/aspeed-video.c | 0 6 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 drivers/media/platform/aspeed/Kconfig create mode 100644 drivers/media/platform/aspeed/Makefile rename drivers/media/platform/{ => aspeed}/aspeed-video.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1a9fb0615925..1b6f48a660de 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3026,7 +3026,7 @@ L: linux-media@vger.kernel.org L: openbmc@lists.ozlabs.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/media/aspeed-video.txt -F: drivers/media/platform/aspeed-video.c +F: drivers/media/platform/aspeed/ ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS M: Corentin Chary diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 1446a99159c5..10f453ff2717 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -50,15 +50,7 @@ source "drivers/media/platform/davinci/Kconfig" 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 - Support for the Aspeed Video Engine (VE) embedded in the Aspeed - AST2400 and AST2500 SOCs. The VE can capture and compress video data - from digital or analog sources. +source "drivers/media/platform/aspeed/Kconfig" config VIDEO_SH_VOU tristate "SuperH VOU video output driver" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index e319044c57e9..18ec3d208483 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,6 +6,7 @@ # Place here, alphabetically sorted by directory # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ +obj-y += aspeed/ obj-y += am437x/ obj-y += amphion/ obj-y += atmel/ @@ -47,7 +48,6 @@ obj-y += xilinx/ # Please place here only ancillary drivers that aren't SoC-specific # Please keep it alphabetically sorted by Kconfig name # (e. g. LC_ALL=C sort Makefile) -obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o obj-$(CONFIG_VIDEO_MUX) += video-mux.o diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig new file mode 100644 index 000000000000..5025e892844c --- /dev/null +++ b/drivers/media/platform/aspeed/Kconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-only +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 + Support for the Aspeed Video Engine (VE) embedded in the Aspeed + AST2400 and AST2500 SOCs. The VE can capture and compress video data + from digital or analog sources. diff --git a/drivers/media/platform/aspeed/Makefile b/drivers/media/platform/aspeed/Makefile new file mode 100644 index 000000000000..1979af63dadd --- /dev/null +++ b/drivers/media/platform/aspeed/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c similarity index 100% rename from drivers/media/platform/aspeed-video.c rename to drivers/media/platform/aspeed/aspeed-video.c From patchwork Mon Mar 14 16:34:02 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: 12780565 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A9815C433EF for ; Mon, 14 Mar 2022 17:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=okVN4QvwB0yFBl9x95yZv04F24TqRCU6tqqGdURHQSA=; b=TIQjl9Z3fL5ZwI IDVG9rqxp+uZZpOAZKjgZZx86T5+m72DKrDTZgC/a8ULJsxc6k2YfbaXeEueiAc+EXMexFieO62M5 17MqEGl0QBTFjgzsGMhkrelaPcqhlmRGwsy+GweBlqePoOkpLUqRa4ThJdoaK3NHgkhzSAfjP7BHi +NotLlMKsPcse9GlJnJo+xEF8hmiaoC+KVxVGSQjiFJrbSn95KsU+cApbeZ3Qf9rKy53c8aY3gi6p E8YHE8Ww/AZi3R/yMAMhZpuUU/ef7SPQab0TMjH9P47GPfDkbhfiLQ7qwsoH+bgzuXQE8Nt7+gvbW ObeIPcxtpVS+y85vNtoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToL4-006KQH-0y; Mon, 14 Mar 2022 17:18:35 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToDB-006HQe-1l for linux-arm-kernel@bombadil.infradead.org; Mon, 14 Mar 2022 17:10:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=i7XJOp/2puoj47zY05ksDEjkRLPgRYBhdWgohrrOxF8=; b=M7q9NdeNxEyPrHcmJBd3dJRmOQ wXTwUXUEYXbb5G4sIKzu3t8wVyxDZFU0Dw37rga+zGf0HXIg3fWJrGgYJ9ox/9F3JIx4fomTYPoSx fxpDjI06dB75AEBQK5P7hRTlTZB6o+hag0HDj5bSLXNEXoX6vXw9af388G5i4ziHOqrnk9YAOJmNx O4DeggtyIiQMKfYaCdq1430efkk4CZi5gRiHtX0P0PEh+nh72pwL3l7eh3XaSp4WJhn0pIMtMMTwi vWg9JjD0+W8yZ2Md8aqLEvVQxH93SnlSxT+9klBhOQM4UfOLagj7TTmz85TbLOOtqat/oJSKjYwN4 Dwlqo/cg==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf5-000uEI-5X for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:18 +0000 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 6BCD16140B; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E3CDC36AEC; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=liZGOEi5kwKibIHDLOkP1/y+H373rnV9CYI73V4HmPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n1J2983tmUn3iZnCNgQJb5Xb33SGWHNR0nZKXFBIMKtop8s3M8DzMRlnE0K2oblam SzAFzILtBx8OHhnR1gS+b7yrgngRzmwVrauNHcvdOTMdFa2OmQGTbROv+XLlSaCueh t4invXgUDzVnElWZnxyH60c6Kj5aTUrqVNJPBajxO9heHEVw60NTAb6cdPZzrhRq9o h+P1GG0u15CMQ9f5+iZWraRfPQgS295LizCVqRexyeE722IO7gqa58/CxBDpV2q86Q WZ2DQNtPwsQ5GD7OJ6QK5ulMGsNvr5m8iVaJuNyUVsKhbAK8ZsVXkC5pm7/SAu9A4w 6DkOuK4TCQqvg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTney-001wwY-In; Mon, 14 Mar 2022 17:35:04 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Colin Ian King , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Geert Uytterhoeven , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Julia Lawall , Laurent Pinchart , Laurentiu Palcu , Ming Qian , Mirela Rabulea , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Rikard Falkeborn , Rui Miguel Silva , Sakari Ailus , Sascha Hauer , Shawn Guo , Wei Yongjun , Yang Yingliang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 07/67] media: platform: place NXP drivers on a separate dir Date: Mon, 14 Mar 2022 17:34:02 +0100 Message-Id: <46fb99951fe2c71adfd7f4ea4439af5ed5ebb7f7.1647274406.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163511_734639_E16430E0 X-CRM114-Status: GOOD ( 23.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to cleanup the main platform media directory, move NXP drivers to their own directory. Reviewed-by: Laurent Pinchart 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 40 +---------- drivers/media/platform/Makefile | 6 +- drivers/media/platform/imx/Kconfig | 25 ------- drivers/media/platform/imx/Makefile | 1 - drivers/media/platform/nxp/Kconfig | 66 +++++++++++++++++++ drivers/media/platform/nxp/Makefile | 8 +++ drivers/media/platform/{ => nxp}/fsl-viu.c | 0 .../media/platform/{ => nxp}/imx-jpeg/Kconfig | 0 .../platform/{ => nxp}/imx-jpeg/Makefile | 0 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.c | 0 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.h | 0 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg.c | 0 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg.h | 0 .../platform/{imx => nxp}/imx-mipi-csis.c | 0 drivers/media/platform/{ => nxp}/imx-pxp.c | 0 drivers/media/platform/{ => nxp}/imx-pxp.h | 0 .../media/platform/{ => nxp}/mx2_emmaprp.c | 0 18 files changed, 78 insertions(+), 70 deletions(-) delete mode 100644 drivers/media/platform/imx/Kconfig delete mode 100644 drivers/media/platform/imx/Makefile create mode 100644 drivers/media/platform/nxp/Kconfig create mode 100644 drivers/media/platform/nxp/Makefile rename drivers/media/platform/{ => nxp}/fsl-viu.c (100%) rename drivers/media/platform/{ => nxp}/imx-jpeg/Kconfig (100%) rename drivers/media/platform/{ => nxp}/imx-jpeg/Makefile (100%) rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.c (100%) rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.h (100%) rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg.c (100%) rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg.h (100%) rename drivers/media/platform/{imx => nxp}/imx-mipi-csis.c (100%) rename drivers/media/platform/{ => nxp}/imx-pxp.c (100%) rename drivers/media/platform/{ => nxp}/imx-pxp.h (100%) rename drivers/media/platform/{ => nxp}/mx2_emmaprp.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1b6f48a660de..780ef2ef3362 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11841,7 +11841,7 @@ M: Philipp Zabel L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git -F: drivers/media/platform/imx-pxp.[ch] +F: drivers/media/platform/nxp/imx-pxp.[ch] MEDIA DRIVERS FOR ASCOT2E M: Sergey Kozlov diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 10f453ff2717..711b6ab9370b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -29,6 +29,8 @@ config V4L_MEM2MEM_DRIVERS to capture and output drivers, which use memory buffers for just one of those. +source "drivers/media/platform/nxp/Kconfig" + # V4L platform drivers source "drivers/media/platform/marvell-ccic/Kconfig" @@ -61,19 +63,6 @@ config VIDEO_SH_VOU help Support for the Video Output Unit (VOU) on SuperH SoCs. -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 - help - Support for Freescale VIU video driver. This device captures - video data, or overlays video on DIU frame buffer. - - Say Y here if you want to enable VIU device on MPC5121e Rev2+. - In doubt, say N. - config VIDEO_MUX tristate "Video Multiplexer" depends on V4L_PLATFORM_DRIVERS @@ -193,7 +182,6 @@ source "drivers/media/platform/xilinx/Kconfig" source "drivers/media/platform/rcar-vin/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/sunxi/Kconfig" -source "drivers/media/platform/imx/Kconfig" config VIDEO_TI_CAL tristate "TI CAL (Camera Adaptation Layer) driver" @@ -273,18 +261,6 @@ config VIDEO_CODA config VIDEO_IMX_VDOA def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST -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 - help - The i.MX Pixel Pipeline is a memory-to-memory engine for scaling, - color space conversion, and rotation. - -source "drivers/media/platform/imx-jpeg/Kconfig" - config VIDEO_MEDIATEK_JPEG tristate "Mediatek JPEG Codec driver" depends on V4L_MEM2MEM_DRIVERS @@ -423,18 +399,6 @@ config VIDEO_SAMSUNG_S5P_MFC help MFC 5.1 and 6.x driver for V4L2 -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 - select V4L2_MEM2MEM_DEV - help - MX2X chips have a PrP that can be used to process buffers from - memory to memory. Operations include resizing and format - conversion. - config VIDEO_SAMSUNG_EXYNOS_GSC tristate "Samsung Exynos G-Scaler driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 18ec3d208483..4458690c1965 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -15,14 +15,13 @@ obj-y += coda/ obj-y += davinci/ obj-y += exynos-gsc/ obj-y += exynos4-is/ -obj-y += imx/ -obj-y += imx-jpeg/ obj-y += marvell-ccic/ obj-y += meson/ge2d/ obj-y += mtk-jpeg/ obj-y += mtk-mdp/ obj-y += mtk-vcodec/ obj-y += mtk-vpu/ +obj-y += nxp/ obj-y += omap/ obj-y += omap3isp/ obj-y += qcom/camss/ @@ -48,10 +47,8 @@ obj-y += xilinx/ # Please place here only ancillary drivers that aren't SoC-specific # Please keep it alphabetically sorted by Kconfig name # (e. g. LC_ALL=C sort Makefile) -obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o obj-$(CONFIG_VIDEO_MUX) += video-mux.o -obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o @@ -61,4 +58,3 @@ obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o -obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o diff --git a/drivers/media/platform/imx/Kconfig b/drivers/media/platform/imx/Kconfig deleted file mode 100644 index 7cd0617c9b1b..000000000000 --- a/drivers/media/platform/imx/Kconfig +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -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 - Say yes here to enable support for capture drivers on i.MX SoCs. - Support for the single SoC features are selectable in the sub-menu - options. - -if VIDEO_IMX - -config VIDEO_IMX_MIPI_CSIS - tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" - select MEDIA_CONTROLLER - select V4L2_FWNODE - select VIDEO_V4L2_SUBDEV_API - default n - help - Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver - v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs. - -endif # VIDEO_IMX diff --git a/drivers/media/platform/imx/Makefile b/drivers/media/platform/imx/Makefile deleted file mode 100644 index f72bdbe8e6ef..000000000000 --- a/drivers/media/platform/imx/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig new file mode 100644 index 000000000000..df52d32ebe50 --- /dev/null +++ b/drivers/media/platform/nxp/Kconfig @@ -0,0 +1,66 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# V4L drivers + +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 + Say yes here to enable support for capture drivers on i.MX SoCs. + Support for the single SoC features are selectable in the sub-menu + options. + +if VIDEO_IMX + +config VIDEO_IMX_MIPI_CSIS + tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" + select MEDIA_CONTROLLER + select V4L2_FWNODE + select VIDEO_V4L2_SUBDEV_API + default n + help + Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver + v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs. + +endif # VIDEO_IMX + +config VIDEO_VIU + tristate "Freescale/NXP VIU Video Driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C + select VIDEOBUF_DMA_CONTIG + default y + help + Support for Freescale VIU video driver. This device captures + video data, or overlays video on DIU frame buffer. + + Say Y here if you want to enable VIU device on MPC5121e Rev2+. + In doubt, say N. + +# mem2mem drivers + +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 + help + The i.MX Pixel Pipeline is a memory-to-memory engine for scaling, + color space conversion, and rotation. + +config VIDEO_MX2_EMMAPRP + tristate "Freescale/NXP 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 + select V4L2_MEM2MEM_DEV + help + MX2X chips have a PrP that can be used to process buffers from + memory to memory. Operations include resizing and format + conversion. + +source "drivers/media/platform/nxp/imx-jpeg/Kconfig" diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/nxp/Makefile new file mode 100644 index 000000000000..efc38c6578ce --- /dev/null +++ b/drivers/media/platform/nxp/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-y += imx-jpeg/ + +obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o +obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o +obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o +obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/nxp/fsl-viu.c similarity index 100% rename from drivers/media/platform/fsl-viu.c rename to drivers/media/platform/nxp/fsl-viu.c diff --git a/drivers/media/platform/imx-jpeg/Kconfig b/drivers/media/platform/nxp/imx-jpeg/Kconfig similarity index 100% rename from drivers/media/platform/imx-jpeg/Kconfig rename to drivers/media/platform/nxp/imx-jpeg/Kconfig diff --git a/drivers/media/platform/imx-jpeg/Makefile b/drivers/media/platform/nxp/imx-jpeg/Makefile similarity index 100% rename from drivers/media/platform/imx-jpeg/Makefile rename to drivers/media/platform/nxp/imx-jpeg/Makefile diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c similarity index 100% rename from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h similarity index 100% rename from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c similarity index 100% rename from drivers/media/platform/imx-jpeg/mxc-jpeg.c rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.h b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h similarity index 100% rename from drivers/media/platform/imx-jpeg/mxc-jpeg.h rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h diff --git a/drivers/media/platform/imx/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c similarity index 100% rename from drivers/media/platform/imx/imx-mipi-csis.c rename to drivers/media/platform/nxp/imx-mipi-csis.c diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c similarity index 100% rename from drivers/media/platform/imx-pxp.c rename to drivers/media/platform/nxp/imx-pxp.c diff --git a/drivers/media/platform/imx-pxp.h b/drivers/media/platform/nxp/imx-pxp.h similarity index 100% rename from drivers/media/platform/imx-pxp.h rename to drivers/media/platform/nxp/imx-pxp.h diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/nxp/mx2_emmaprp.c similarity index 100% rename from drivers/media/platform/mx2_emmaprp.c rename to drivers/media/platform/nxp/mx2_emmaprp.c From patchwork Mon Mar 14 16:34:09 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: 12780568 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B3F1EC433EF for ; Mon, 14 Mar 2022 17:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Wmc2CmFXKBqsXiItTfOhjLaGOVsoGSaX5ja6fcp0LEU=; b=352m5VG+h1dlVE 5b8MAzUx3iCnb4bbO+URA+9UxR1udzMxRzsvrGnD7isKPUxRettfz87mKZ6x15O+qsaGLrlLVE5tG 4VvqKFOy9uREiysXb2GyLhIsAGolD6mHWpYXJwpZr7djSoWarUvZX4ZdHTgJvo2Lp7KlU0PaBGVSZ WvXwNoHHGWWVmps14DwLLLhYKTEr3JT9hh2t7IcoVsB2ns0MLqDSYN6homKWzww7fzqoB2vbxv6YH F3jw4WmI/CxH+gKKsVQYBw6752wvoxgqG1bFsvdB/48ys9CwOlydOsSGtAN4X2iXejnrRXAALOQ4M v63Y2TOaV5EmSRgUdQ3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToNz-006LWy-1C; Mon, 14 Mar 2022 17:21:37 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToDG-006HQe-RI for linux-arm-kernel@bombadil.infradead.org; Mon, 14 Mar 2022 17:10:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=ko9Q/tncp8XslcuAQuO4OFsOgxn1LvznLIDwkF6g52I=; b=o0EiqVTYUG+dugFcxJcuU93oZv MbthclkAoeFCvIyq/AkZhqA8QEaxJ8yAal0ZHu8zAugfqEME2QOYbgz6z8dnyYcWzsHPHPg+1PGhE 3r/ng/ywZzeIo3Iqucn0Fyc27Ce9GV2vcA97YClBaT6Oc/ps3p7t4BhHCv5F4d+P5RxivGOJxgoI7 RN4xwSysj/HmT/WqnoiYvRwD5PEx4gb0GVyuoZrAcOtNc8NsYSviikheiKiTCl07zk7Tb5vfYLwCb XHd36EDGlE4nre2bB+9ZxKauvtFGlpq6jzq6J0eLZHrny8Nx9o754YYemQm+O8ZJBUQ126Qj6Ph23 KreauyEQ==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf4-000uEJ-Sf for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:13 +0000 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 76AF16140F; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D67AC36AFE; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=gOUuJMesojzmA0PEHNeJlR53Zptsx87vJGdxUuVU11o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Evb0fMaaFNUJdRreW3vY/Q600Nh5/8pkTt3fhTYXVzcCjo5q8sGe/PJXbpYittt0I y7HlOwFO3nTm5rKuIWfQ4ozD8Ws3NZbCR9qfzC/sHT+2RmrcCEQNAaAPSW4E283iYD dGcoRB6d+AH0dl8OJR7dP+qy5jVXxCpwlKWNCrtS46FPKpilGVVxyZgFrwpBiKcoeb u7I+HbObRw0pT7a0Z3qCsXK9mbmXfb9461Ou3W/NxfvmSUymwYLV2z8RXat8tZkJJJ GLXdOoPeWr3xqryKxXMUWh5k3LlznJYDSi28Ho9TUkPUqpJVK559HEA/yh0NriEi6T Zby8eZ5cTjx5w== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wx1-0m; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: 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 v2 14/67] media: platform: exynos-gsc: move config to its own file Date: Mon, 14 Mar 2022 17:34:09 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163511_455505_044F5EFE X-CRM114-Status: GOOD ( 15.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.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 16:34:10 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: 12780569 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AD333C433EF for ; Mon, 14 Mar 2022 17:24:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PmiTBfKNAAazKOVtMmIFmPPPQ5gL/bdJN+lAuv5wWYg=; b=dwa0QdNev1COFJ MUsG1qqeNpTrF7aTPiZXC2eb/XsLrXZw/9n36aoKhxYOPjX5605bpvRSTeqIgqEtmeG0TlFB3A8a6 L5Bx92209lJEMdxuXZe7Un/K8gb2YbH0TFteK3z7rPevR4REGSa7LOi1vjgHsJ+AE7aPDZ81TO4xk KrFnV79RvH/cYRqSKwlKvrTpEca5Mdnvykf4CSE1PDHrG5HoSLDJFOTvmlfNp7vJoTY2ojIRCfJH/ lye6EtGHivQhZ7nvZEmiEbMXyLY6O1+1ljjt6HrtdVc3CkmAWpZJOMHtloCVcLAF/mffuWS640LaU X2XnSSO+w2VmUhSmMK/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToOr-006LvY-G7; Mon, 14 Mar 2022 17:22:32 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToDF-006HQe-S1; Mon, 14 Mar 2022 17:10:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=polWvja3vMUWvUfJ1G+VUUYdVS0oovwHGRgUfrtOjG0=; b=qKD4gQ4cHM0Ldr/kqV9L3m3yAG hg+phl2enbM80WwUCH+Sf+1l3vpct4WSCR9WpQ5X3naSoNddpK+mOK+PnBfJMeVEF245RvzC00x9r baFjvy/EWfE8f+nTjtMZL20dR4LQcoprChXImUWbqQ8FdJsJtAjl7+O3jqrQDjCJejNnSXFbH4Zlh uZNnk7qLLl/7IhtLyIzO6Vcn7kMumQ0B3lidXj8VTeX047Vqz1/tYTNSLX4xPwnqdO3yUbruatxe1 8b62NFYZajwR/BDYcv3c/PliniXvOkJKQpJKIIuAn9CHg0YQNXHzfK0d9OqFoOqvDtO5a3DFOwnfx yXIVHM9Q==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf4-000uEP-Vl; Mon, 14 Mar 2022 16:35:14 +0000 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 85D2AB80E9B; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43F57C36B00; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=uaiopVtJBKfx6miqmhyDXFmsPK2jSz5M/upaCokt73I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZK5KsmaIe+Pjxj6TBsrpqTEwQ62r5lJbkCJlGRwOme9adM3y5cRdQ3egluf5zhYUq TPrda85VbeItGN22zRwYbgM3lwlwPXwX4hvMzzjGSPklOoa+f9wXyByNZ43RavV/W/ QPKDPtCHKhW8YGQVNKo3q1KwLXI2/LVhwF9pw5bH/RitK/yjRc8WHNOoi3xWAW4O2u qhRgjOha/YYqlwm+MWntF27XhSaXTmzX90OJQRzNBx1Ik12Cz1Os1FExZ/klUa+L0G 6dZGvrqgDGaQYQdq0bU6SCW3oK2e2psVo6S9QD5vWqnpJuwOuHLq2Z8Lj56/w1n3DC MycMqv4Ps687Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wx5-2F; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Jerome Brunet , Kevin Hilman , Laurent Pinchart , Martin Blumenstingl , Ming Qian , Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 15/67] media: platform: ge2d: move config to its own file Date: Mon, 14 Mar 2022 17:34:10 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163511_457229_8A5BC44B X-CRM114-Status: GOOD ( 14.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place ge2d-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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 15 +-------------- drivers/media/platform/meson/ge2d/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 drivers/media/platform/meson/ge2d/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 57ca2426a83b..d3b7bef19237 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -47,6 +47,7 @@ source "drivers/media/platform/coda/Kconfig" source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/exynos-gsc/Kconfig" +source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/aspeed/Kconfig" @@ -273,20 +274,6 @@ config VIDEO_MEM2MEM_DEINTERLACE help Generic deinterlacing V4L2 driver. -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 - select V4L2_MEM2MEM_DEV - help - This is a v4l2 driver for Amlogic GE2D 2D graphics accelerator. - GE2D is a standalone 2D graphic acceleration unit, with color converter, - image scaling, BitBLT & alpha blending operations. - - To compile this driver as a module choose m here. - config VIDEO_SAMSUNG_S5P_G2D tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/meson/ge2d/Kconfig b/drivers/media/platform/meson/ge2d/Kconfig new file mode 100644 index 000000000000..8c3f3b1b6b05 --- /dev/null +++ b/drivers/media/platform/meson/ge2d/Kconfig @@ -0,0 +1,14 @@ +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 + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Amlogic GE2D 2D graphics accelerator. + GE2D is a standalone 2D graphic acceleration unit, with color converter, + image scaling, BitBLT & alpha blending operations. + + To compile this driver as a module choose m here. + From patchwork Mon Mar 14 16:34:11 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: 12780528 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EC457C433EF for ; Mon, 14 Mar 2022 17:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=g9cYk0+Izl0VIK2tuUZ7t7NpdwN/R2fSb2ay0vQUWco=; b=jD5XemezB8s5Wo SPTeUc7DkOKOe2lRL4hIPE5+Y7SF3Rph+mZJK6xQOQvmithUcaS7e5D05R/eIb8t3Bm1QegGvaqGS LPptdDeY26KaXGTLTiGBkqAkNvLHNkQgR9/XXhdKnjuzoPYLkovAvCoX/CS5/0xfgp/2ltwXfY+iY Qv72w9DIArP5Wb2U7Fd9kDHlIYySq6zAS2UYKa2cv0o0CvShaPs3hyLD7FtFlsi6Svso13oYJSppw dkyzbk7JyzmvpvP9YJim5BrvxDfWmvmsXNBT5b38nbakrhhBjJ9N+VD4DePVlPrABQj9F5abQAZec 8tgtb/bxz60B2MDKmbcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToAX-006GH6-Cb; Mon, 14 Mar 2022 17:07:43 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo1e-006Cfr-LB; Mon, 14 Mar 2022 16:58:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=HtDo48HrvpKtbsAmNPc346dCLrzvDMprT/nGUleojkA=; b=u2gSL2GvBuM7u2502lG5+KIpJ0 4rlLzR1GjSKPYr8uSb7rbozclnhHufM8k/zmNV7lkgLSnQibWnFP0UDbovxDQUTKXJz1M80HQYzn2 w1q/On1J43o5hjUyUXJn1RoNjSb6rSOkRS+ikLlKi9Om6gfI/MnjIftGtl2GMe7xRhPt2C3SINJ4q 9/LY/ZGOSnhjKTSY6FJQ6kcUuWKXgKxCyrnqKKK00egGAVrDmifUkgPSxGPyx4IaWy7YdR3+PlNf+ LA1a74SBoalZmCyO1nqED2nNL6iwycQKDF0RazLUzufn9tO89q9NGZM2hqnfDZurXr37etU25c0lT 2j3rijMw==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfB-004DOy-86; Mon, 14 Mar 2022 16:35:19 +0000 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 E2DD761452; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E235C36B03; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=oR/Nqcf8uV2nNNdkbYKq+1DFuBdrsIdZT4cOwhjy4dk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ptmuRLEs3wsSnLiRNvUZ1PXi3FQm4MWbMq/SMJOg++sKPzZJtjXP9Yildc5p5Cm6l Rvn+/K5dhAo6z1+i4oYQMl9cq2UDtSQ/oy+YPibFO7/7fLu1QbKQyqLFSS1aeSfcHu GQvU8I4LWlGAJaAsOW8qfUiTYjkVzeDRRrtLvq8fiwg8oUyCNtzXlC0oZQZeG61AAN +ecOPn/1RbBOdztRLf+ZcGE353/WrM4URrKFKrWPecCGceDPPHWBIFnAXgwZr/IhEX +Zby3Ygp17AhancB3vWZLzlt8Xjk5l9xlL45NoZ4twLZE/Dx2bDWkpUDcG07zeJpJk QrGD/KOVLxz+g== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wx9-3O; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 16/67] media: platform: mtk-jpeg: move config to its own file Date: Mon, 14 Mar 2022 17:34:11 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163517_541475_2219324B X-CRM114-Status: GOOD ( 14.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place mtk-jpeg-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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 17 +---------------- drivers/media/platform/mtk-jpeg/Kconfig | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 drivers/media/platform/mtk-jpeg/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d3b7bef19237..f517aa951460 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -48,6 +48,7 @@ source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" +source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/aspeed/Kconfig" @@ -181,22 +182,6 @@ config VIDEO_TI_CAL_MC # Mem2mem drivers -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 - depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - Mediatek jpeg codec driver provides HW capability to decode - JPEG format - - To compile this driver as a module, choose M here: the - module will be called mtk-jpeg - config VIDEO_MEDIATEK_VPU tristate "Mediatek Video Processor Unit" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mtk-jpeg/Kconfig b/drivers/media/platform/mtk-jpeg/Kconfig new file mode 100644 index 000000000000..72ed920b011a --- /dev/null +++ b/drivers/media/platform/mtk-jpeg/Kconfig @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only +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 + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + Mediatek jpeg codec driver provides HW capability to decode + JPEG format + + To compile this driver as a module, choose M here: the + module will be called mtk-jpeg From patchwork Mon Mar 14 16:34:12 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: 12780468 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 0AD05C433EF for ; Mon, 14 Mar 2022 16:39:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ThWcsCa7yiECcyvETquavW0Jj5tIMpHvChI0+cYfJLQ=; b=vJ70VXO9we2Xml d6YcicLdoaZSImyh22oJcwn3uuHxdH86WYsKltTg2DBPKrb5l0sJidA9ledtP088zBdeMXVmRj2cu Nb+YcoAR9noT5KN3z9Q6LHI5UaDgff8hahb6PLfA9yd+1N6CGOEOP0RtQ3zqOIOajyZKCRjX92N9v SB1XO2RikQ2MHmfMJZyjHRUa+w//mEhPjpF1fOHHjxc+rhY/jQl6rKXY95MW+G7pR4KFA2U+gmzBt zD1aIPGOvx7FFPNIBEcdwfJjQiuVeVfWplo7mCrVb18pINANVZ7a6vCHxl5//kxnH7uCnM4/YdcPx TfXiDmEwMqnPmIBoSTTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTni0-0064bl-US; Mon, 14 Mar 2022 16:38:14 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf3-0063DQ-Io; Mon, 14 Mar 2022 16:35:15 +0000 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 A90ED6142C; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 558BDC340FA; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=pmys06zExcq9mFc9MtmgK2Gobelbrfe0JNy9rF51YDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HfOR7JUCQV+7vciGrPfC2MZ6ZnWmax8lfhyYLJU5F+wT9Gs/t5RyViV6J7tyDpPGi z9z9Cj70yihRXt/YxL6MWheueYmexmFPF+ewZQw2DrrhFThOOS8Ar6AgvyIKFojDNz Q3Ne0ziWJQy30vo52VYcxA+SMS5LZlIvgnWXTk3DdZQ7ocsaNhHaqSvq2e2XDVrxf4 HDsr2gOfWvybjesQ+NuH/q/1X/qhkJBeyTyh8TXfs2ez+vfbzR4sypXPw7jRDFUkFg hwzQz9QOVfQfKOgulDs2xQOieZVBHbKO2tw1NmfdILu+xRAF5qPjNsoKCan8yiaZFl oc9KZY67GsDmw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wxD-4W; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 17/67] media: platform: mtk-mdp: move config to its own file Date: Mon, 14 Mar 2022 17:34:12 +0100 Message-Id: <5778cf934613daa97d580603721b1d614064b77e.1647274406.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_093509_772922_E7240C6C X-CRM114-Status: GOOD ( 16.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place mtk-mdp-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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 18 +----------------- drivers/media/platform/mtk-mdp/Kconfig | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 drivers/media/platform/mtk-mdp/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f517aa951460..3b3d7af47ca1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -49,6 +49,7 @@ source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" +source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/aspeed/Kconfig" @@ -196,23 +197,6 @@ config VIDEO_MEDIATEK_VPU To compile this driver as a module, choose M here: the module will be called mtk-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 - depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - select VIDEO_MEDIATEK_VPU - help - It is a v4l2 driver and present in Mediatek MT8173 SoCs. - The driver supports for scaling and color space conversion. - - To compile this driver as a module, choose M here: the - module will be called mtk-mdp. - config VIDEO_MEDIATEK_VCODEC tristate "Mediatek Video Codec driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platform/mtk-mdp/Kconfig new file mode 100644 index 000000000000..0cc743165a1a --- /dev/null +++ b/drivers/media/platform/mtk-mdp/Kconfig @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0-only +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 + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + select VIDEO_MEDIATEK_VPU + help + It is a v4l2 driver and present in Mediatek MT8173 SoCs. + The driver supports for scaling and color space conversion. + + To compile this driver as a module, choose M here: the + module will be called mtk-mdp. From patchwork Mon Mar 14 16:34:13 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: 12780485 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E9900C433FE for ; Mon, 14 Mar 2022 16:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3OZ+W84YnpUuKZgg+uuHW/he7w6Stpb4I3zgunff/oY=; b=V52nhZHwJL8kkZ 5rJlKpYbjqr0aoKylB9jK5bwIMhXp8wDaSP3I1bXGhpOFKlV+kzZDIckFY19o3fBvT5d0O4jNGs9l NWlgPNf0tiFEGVV0gih5e+Z2BXSt0kjTZJEE+JdQWLFOBxQg+hhKsBGX7TZrAmzB7+7ZRhUD7Z4cj Guv/7qlM37NjchcQH1LhKgKxC6sDvCVvzUI4hq1Su0hzWhG7xg7rsHAJLfz6P2LZ5Tmu/+WIR0yPg vP+VIYDSiU0xi+vD63uHWw4e2TMyWodT0XLm04OGagdytKpVMZ/nW2YVpvcLsQ+fc2kTW2sTu5rT8 PayhVTYpIlx9KlyOHOkA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnkb-0065nn-Iu; Mon, 14 Mar 2022 16:40:54 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf9-0063GW-B8; Mon, 14 Mar 2022 16:35:20 +0000 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 C8B0E61440; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68C1CC36AE2; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=RDBawNucX7GVbj7v6fMyJ+XspQaSaH+FwtEpq8ue/vI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tQhY7v3Fg+CSA2E8gcEKxdifGbAnuk6h6tj2g3ASLqfKUu2rGOaH6tJd0TazrzKKs 78d4YotvdEBN4W5iiSYPkGgyHcT1Yo+N7aJLCz1ZAQ8TFKh1nhFwiWNXjc+f1c4p6q YMeJs3WVJs/oGJNHQlhSIy9B6gdiIrkXXnr7uH9fafebqfPHLP86a6xYgfM3eU1HnS 4a9BaVv4maT9ibWxZRk3wtJvNI/HwcowEbgqiy+EcbjFV4uICuCZ1enMS2Ygok0jU2 5JsCKv1HP/6RCsgfh8+b+5NeyS+DDcMTEtSbuQbt+sl/CXiLE8hw+0sjqwYudZcJ95 hZBddHr4oDOMw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wxH-5i; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , Nicolas Dufresne , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 18/67] media: platform: mtk-vcodec: move config to its own file Date: Mon, 14 Mar 2022 17:34:13 +0100 Message-Id: <39b7b40cabbdec8b8c2d263a1d040b1bd74e8775.1647274406.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_093515_569792_D9AC82BC X-CRM114-Status: GOOD ( 17.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place mtk-vcodec-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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 37 +---------------------- drivers/media/platform/mtk-vcodec/Kconfig | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 drivers/media/platform/mtk-vcodec/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 3b3d7af47ca1..ab7c85613625 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -50,6 +50,7 @@ source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" +source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/aspeed/Kconfig" @@ -197,42 +198,6 @@ config VIDEO_MEDIATEK_VPU To compile this driver as a module, choose M here: the module will be called mtk-vpu. -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 - depends on VIDEO_MEDIATEK_VPU || MTK_SCP - # The two following lines ensure we have the same state ("m" or "y") as - # our dependencies, to avoid missing symbols during link. - depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU - depends on MTK_SCP || !MTK_SCP - depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU - select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP - select V4L2_H264 - select MEDIA_CONTROLLER - select MEDIA_CONTROLLER_REQUEST_API - help - Mediatek video codec driver provides HW capability to - encode and decode in a range of video formats on MT8173 - and MT8183. - - Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to - also be selected. Support for MT8183 depends on MTK_SCP. - - To compile this driver as modules, choose M here: the - modules will be called mtk-vcodec-dec and mtk-vcodec-enc. - -config VIDEO_MEDIATEK_VCODEC_VPU - bool - -config VIDEO_MEDIATEK_VCODEC_SCP - bool - config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mtk-vcodec/Kconfig new file mode 100644 index 000000000000..635801a19d55 --- /dev/null +++ b/drivers/media/platform/mtk-vcodec/Kconfig @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_MEDIATEK_VCODEC_SCP + bool + +config VIDEO_MEDIATEK_VCODEC_VPU + bool + +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 + depends on VIDEO_MEDIATEK_VPU || MTK_SCP + # The two following lines ensure we have the same state ("m" or "y") as + # our dependencies, to avoid missing symbols during link. + depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU + depends on MTK_SCP || !MTK_SCP + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU + select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP + select V4L2_H264 + select MEDIA_CONTROLLER + select MEDIA_CONTROLLER_REQUEST_API + help + Mediatek video codec driver provides HW capability to + encode and decode in a range of video formats on MT8173 + and MT8183. + + Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to + also be selected. Support for MT8183 depends on MTK_SCP. + + To compile this driver as modules, choose M here: the + modules will be called mtk-vcodec-dec and mtk-vcodec-enc. From patchwork Mon Mar 14 16:34:14 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: 12780484 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6635CC433EF for ; Mon, 14 Mar 2022 16:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zmmCJhFrBwL/uUeQ/Lf05dlyONVmArkdzLg1Cv00w10=; b=h/AdPgTMQnmkIG o3BTo3U9rMkd6TbpoOUlrLY6COdkbdRILYtEdUxUply0gZ4LeYvkSDzxyNzd0ZwDFipowwQNc5NdV k6yeabXa8Zof7uyCqvCrX15NCD7h0jtwH4FhmY1tCeMKx1ro6O9w0tj/0TZx6o0AP18SV93UqUy8k bFNN9YO85GtjGCt45q+vfXNb7m+yRhmBX+ffwpLbFkV7rlWTd84FbdiF6GmRPdJ57Adyh84PMQTD0 njX++LLy3OxSp3k7JHT4qhaUB2MRafKx9jf8uOmWJQiyMIHH/Cj0fK17xDJ7YgnkoozmaeN9dEP/2 GDZr7eCYlHPS3n0kT79w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnjS-0065Dx-Lo; Mon, 14 Mar 2022 16:39:44 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf9-0063GX-2U; Mon, 14 Mar 2022 16:35:19 +0000 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 D568F6144D; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73C1BC36B07; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=l19tbzsY/YOED6q+PCSIvlcX5s2C1xmnk/4eeFjhClw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U4Fm56V7X35xOT5PR/RkPcliQPtUvsExEziAPmecN56BljA1VS/35Ey/IRowq8lvp 0vUh4U9w67pYNJWDnO0gqMxCN6dq9vZytJo/bQD4P3nmCuHZsu9N+7mPGAR3YwTc+o sRc2xa78yt6tgf+CY/2GoIACNNlKdBoAb0VUF2xOTEEiPxZ4yFXi63fgj6fEHqtdEZ JG7p3pEyAeTrJvukCML8OBRz4iF+QsIiXDgAfxI4YkvGbhKJhpe7Pjz1n6PSaisAt9 yzblFoNtxONDnBeYG7FNzP/dyfZdADJ4x3MS5hNrCZtdhdKaNRkhb7Ktc/giLFbE28 xndiCmc8x1Cgg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wxL-6w; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 19/67] media: platform: mtk-vpu: move config to its own file Date: Mon, 14 Mar 2022 17:34:14 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_093515_664477_A2BE8BA0 X-CRM114-Status: GOOD ( 16.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place mtk-vpu-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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 15 +-------------- drivers/media/platform/mtk-vpu/Kconfig | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 drivers/media/platform/mtk-vpu/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index ab7c85613625..39bf4c57e044 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -51,6 +51,7 @@ source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" +source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/aspeed/Kconfig" @@ -184,20 +185,6 @@ config VIDEO_TI_CAL_MC # Mem2mem drivers -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 - This driver provides downloading VPU firmware and - communicating with VPU. This driver for hw video - codec embedded in Mediatek's MT8173 SOCs. It is able - to handle video decoding/encoding in a range of formats. - - To compile this driver as a module, choose M here: the - module will be called mtk-vpu. - config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platform/mtk-vpu/Kconfig new file mode 100644 index 000000000000..df679ea79ed0 --- /dev/null +++ b/drivers/media/platform/mtk-vpu/Kconfig @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only + +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 + This driver provides downloading VPU firmware and + communicating with VPU. This driver for hw video + codec embedded in Mediatek's MT8173 SOCs. It is able + to handle video decoding/encoding in a range of formats. + + To compile this driver as a module, choose M here: the + module will be called mtk-vpu. From patchwork Mon Mar 14 16:34:18 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: 12780527 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CEFD6C433EF for ; Mon, 14 Mar 2022 17:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O+KAXIwiXV7ykEaeMGO1fc3AJurfGLRI1jU1zY+Ao4k=; b=C9d9Ni+siVUXYC XUf4CruS4rZto5H9I2T7b43fCAR4d1BVJBVn8SxRahkoPDTBOb1UwvVw2PBAaf4L1acGORnl8eYq6 t02S+AnbUo8HrAldW6cRcsyPBFZJHW7Jxo4LAB3/+Ux0UVTDKj0+klZWegFkiZZIclxbW4WUXjcct 54bb6Ei0WUbytHqX9mI/020+kM3IZaWu67aBizzImkuze41FWH3D5s/lzHaLESOgVjkm1L+FbovQj 5dD1keHQpYyZX1im7GRSNeV4wRfwCRrpBrl2JA6BUNZPBdUZZC6bE90pdWtVY9CuYuDvzkIX3SA+z eCWWpLMXs+/HdqrDQ5KA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo9X-006FsN-2i; Mon, 14 Mar 2022 17:06:39 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo1d-006Cfr-91; Mon, 14 Mar 2022 16:58:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=bt4YTP6ITjuFi80ToJRqO/Gb4DdMgqp5PcYcJVfJmQs=; b=dmQiUqEGmQQ7k4CuDxKyayMX3I szYrUuo/6elulxNnSCy7mDDBSzB9yDrmOrIwNDmNI7kWO3Tz17OL1YDj4ESDgQuK/WuiCqgfpXRwR oD7pfZyRbgUWB3TqDh1xECG1jXqkjBwHzWjxZI00hrGAtnwf7l2yly78sYjd6JUcWqdCxuh8/n7jG DUnesz6Tkjg3YmdHcv3e3q3aCcyIYDM5DwFgK+maKUHTwihT4x88hp29C5GdNh53G3LsSzAXrrDvn d2LRV5QVMb+556OB5+QjE56VK0v9PhSsKypVYK3mPVGnLitTACb4ABhK5MV9LUAe6a/M+3fjnuQGr C4R+vtwQ==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfB-004DOx-86; Mon, 14 Mar 2022 16:35:22 +0000 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 39B896146B; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8FD4CC36B0D; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=PPlZL/SB0tCVqUNa5+hEYDWbRfVKycaXFHPXViRWxog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rw3skd91+m0Bb4GFijkmNg4xwrbQwkV4paNOWX/EMRLsxRkRiYOmzqpLSvd06uZdy iI5Fl/3v5xPubAsxQ3oYnNnzlfjXLG6x92dynUs/ai+IwvhtfAQP3PdTfaMHEhCWKj 435JWetqWTptL5OME05iE2pfhYJCGknkV8cBQTrcFjgTUbk6BdIBhPcGJYQLWnCR87 RVDboYaDmkmJz6yu+FxY0tpJS2qAWeN+8PzidQedLCqwJz57vcWx7ZxP8vafLTr6Z7 r4GG4lAqVpRfDf+uuLUSxcmYTyPYyOqV0SDVssw1W8u9aaYf8VIpLDq0i9OCv3mJA9 fBvx9uNf9QGhA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wxb-DJ; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Ezequiel Garcia , Hans Verkuil , Heiko Stuebner , Jacob Chen , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v2 23/67] media: platform: rga: move config to its own file Date: Mon, 14 Mar 2022 17:34:18 +0100 Message-Id: <2feaaa94cd80692cdcfe4488fe8ee08b40c80a63.1647274406.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163517_543965_03243205 X-CRM114-Status: GOOD ( 15.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place rga-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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 16 +--------------- drivers/media/platform/rockchip/rga/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 drivers/media/platform/rockchip/rga/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 5a8495338fd4..314e25dd7ca1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -58,6 +58,7 @@ source "drivers/media/platform/qcom/camss/Kconfig" source "drivers/media/platform/qcom/venus/Kconfig" source "drivers/media/platform/aspeed/Kconfig" +source "drivers/media/platform/rockchip/rga/Kconfig" config VIDEO_MUX tristate "Video Multiplexer" @@ -284,21 +285,6 @@ config VIDEO_STM32_DMA2D The STM32 DMA2D is a memory-to-memory engine for pixel conversion and specialized DMA dedicated to image manipulation. -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 - select V4L2_MEM2MEM_DEV - help - This is a v4l2 driver for Rockchip SOC RGA 2d graphics accelerator. - Rockchip RGA is a separate 2D raster graphic acceleration unit. - It accelerates 2D graphics operations, such as point/line drawing, - image scaling, rotation, BitBLT, alpha blending and image blur/sharpness. - - To compile this driver as a module choose m here. - config VIDEO_TI_VPE tristate "TI VPE (Video Processing Engine) driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/rockchip/rga/Kconfig b/drivers/media/platform/rockchip/rga/Kconfig new file mode 100644 index 000000000000..0106cc8a93a7 --- /dev/null +++ b/drivers/media/platform/rockchip/rga/Kconfig @@ -0,0 +1,14 @@ +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 + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Rockchip SOC RGA 2d graphics accelerator. + Rockchip RGA is a separate 2D raster graphic acceleration unit. + It accelerates 2D graphics operations, such as point/line drawing, + image scaling, rotation, BitBLT, alpha blending and image blur/sharpness. + + To compile this driver as a module choose m here. From patchwork Mon Mar 14 16:34:22 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: 12780555 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CA780C433F5 for ; Mon, 14 Mar 2022 17:15:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lkk8rg6FPHboc+uk3VqZjMA1q9Mo1jQMAfbtpPQhOxo=; b=mfxMMbF3hYww4t gYBljHnIaX7Nweym4qf+tm87MbsW1DmDd3T2dObFZLJgADUja4JSodaVrVbPQ5rU3JHcOYtLqtLPE 1yIKdwLctW5iTFQi+wGnj1fZtOM2zKcqPwmJ9fhhYEWdDbEO27prrJNM7bUZZCOxjeiHjp+Xehaji wL8Uyj5whbzpMjnSta18fN4wCnQx6YUqW0/4wjyQc8diEVhVJ27Nd/sEBb0l77I0XE/64kY7UwacA wZsVOYeAXFg9itS2VYfHTm0J7qsj9y34epBtzFmR/eDIhB3OwdoICp/jBGqhVkau1licIYFPgo/GY c7/cChLWvTIchKwLAcpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToGP-006Idu-06; Mon, 14 Mar 2022 17:13:46 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToD5-006HQe-HE for linux-arm-kernel@bombadil.infradead.org; Mon, 14 Mar 2022 17:10:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=FkVgPz6OGBdwHEx7tPbPgfTl/QYNjErEsa9BVfzVxz0=; b=bYXMfXHq6hpOc7JJO75ojLifgo NueKIH2WpaTT9e96OnSTZcqpCbqqNXoU6Sq31HtD3Vz51ZLcrqmtcDloGis+VNaXUgy6qaUvS1oGn vgUnvAYlTByMiVBkjxi0D3K1PAy3LGsW++vheYhX3e6M6b8fTq6hKOgAjMW8uPs4TrsaLLvuCv+vW wfsNL5pDNoihA05sSMmvmaEjCShRWmsNb+zCcLyXEmvYOLiK63anbCIJoz4MQYGsAKb6AnCWB4xKB IOB8mMuIBSBnNnZ9ird7D0ytSSMr0uZKSEW9ago+HqdW5KBc9Xo4pkFjSFe/5sMGbXpjKm9Xk0AJ0 VwoIb6JA==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfA-000uJW-J7 for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:23 +0000 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 934C56147C; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9704C341C4; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=2PKmISKOFAkqstqssbty0pmniLiBFu2V7iI65huNjOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f/NPOSnEyFk/cAf9LHAJsgJ5mSSChGzr9I2flaYHxrsTNdHcSccmcajpAvqsZn7C0 FnoytEPD19wx3xzkC6Xrf5+nknTPGGyCY8cGqjZx9x0Eh02NgcB+4MEX47WdqIHpdA kzWhTqpKwdXrxhLSrugOGRVh43iJX0dp6LcB765kxcFW3M2awHon2g6/q3TlS9uTi+ L9qq3ESfYmar3tNVcSd7s2zpzLDKWIEgPwy48cn5y+JqEelKYKtz1msRII4y+TDFX6 KiqSAdWz6v//64D5veYJu5LtWzDSZkt0uswat81Nss/RQIetteiaNBIecLlUv1TwYk wUAgQs6oXN01A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wxr-K4; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Alexandre Torgue , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Maxime Coquelin , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH v2 27/67] media: platform: stm32: move config to its own file Date: Mon, 14 Mar 2022 17:34:22 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163516_921096_DBBE8EE6 X-CRM114-Status: GOOD ( 16.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place stm32-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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 29 +------------------------- drivers/media/platform/stm32/Kconfig | 31 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 drivers/media/platform/stm32/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 9408096a365e..b14a0fc78f41 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -62,6 +62,7 @@ source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" +source "drivers/media/platform/stm32/Kconfig" config VIDEO_MUX tristate "Video Multiplexer" @@ -77,21 +78,6 @@ config VIDEO_MUX source "drivers/media/platform/intel/Kconfig" -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 - select MEDIA_CONTROLLER - select V4L2_FWNODE - help - This module makes the STM32 Digital Camera Memory Interface (DCMI) - available as a v4l2 device. - - To compile this driver as a module, choose M here: the module - will be called stm32-dcmi. - config VIDEO_ROCKCHIP_ISP1 tristate "Rockchip Image Signal Processing v1 Unit driver" depends on V4L_PLATFORM_DRIVERS @@ -223,19 +209,6 @@ config VIDEO_STI_DELTA_DRIVER select V4L2_MEM2MEM_DEV select RPMSG -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 - select V4L2_MEM2MEM_DEV - help - Enables DMA2D hardware support on stm32. - - The STM32 DMA2D is a memory-to-memory engine for pixel conversion - and specialized DMA dedicated to image manipulation. - config VIDEO_TI_VPE tristate "TI VPE (Video Processing Engine) driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/stm32/Kconfig new file mode 100644 index 000000000000..60b87e403c7c --- /dev/null +++ b/drivers/media/platform/stm32/Kconfig @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# V4L drivers +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 + select MEDIA_CONTROLLER + select V4L2_FWNODE + help + This module makes the STM32 Digital Camera Memory Interface (DCMI) + available as a v4l2 device. + + To compile this driver as a module, choose M here: the module + will be called stm32-dcmi. + +# Mem2mem drivers +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 + select V4L2_MEM2MEM_DEV + help + Enables DMA2D hardware support on stm32. + + The STM32 DMA2D is a memory-to-memory engine for pixel conversion + and specialized DMA dedicated to image manipulation. From patchwork Mon Mar 14 16:34:23 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: 12780494 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E6B8DC433EF for ; Mon, 14 Mar 2022 16:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=d4+LWKS3PSkR9Xrd/RfqF3+IRhVVfPiM9JUjxsjVyWQ=; b=w/u54JY9SLoyFD YNWblYh5S2ZHuEBAwmuuaPL3jL2mg/ZTeUx3Ud0oAxc5ApAh/sEV4MPthAICeLCD4i4szlTeweZz0 sz3v5m8Pk+b/gHjtX/7Tb2/P/+AOctwKLsnQp63S3PI6qd3lhPssdGyZ0b3pDfBPlbiEizvK1W1vt xQu6XvbBffqHRyzCTrsdbGYbnerQFZEEffp6J2Uslq6YyLpe70EjrVgJVj3lnx/n6Y3HblPpOdUdp TwVZMD4flsMB478t2VchL1GPyEPHijFtDvmtA92i3X/DLRSqG4Dg3tIu0KhdimcTUI3adADP3KoFN EBb3WLuY+yhacZsFri6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnoe-0067Kq-28; Mon, 14 Mar 2022 16:45:04 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf9-0063HF-Va for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:21 +0000 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 76BFC61477; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0982C36B1B; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=WOkVtOHHayyCOnVX04H7XtmUdBPxe5g/efnDu+Rd+zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lVdonliOKkEtlXqa+DWeOXJu+FwoAsv4IIv1Gapuj4a97aBR06JxfO6TMkpmsJg/B OFW6uUPjdMyfcfYVJPGrqYX7shYypWwIbhVKXpMFhnX/U7DRdqocoD13Dlfo6/ngts 91v51gcWCPCcRC/3V8FF95Y7qIzwLviZvReztnuc9UT/GtvGbmy2LTQx/hCwLYLDjs nLhUSIyUPxhsrHuw7ZW+vZyCBj9l4TrpNKiSs8HwGiei3b/ZO5hxy6wLXt/gputIBk yrcV0utz14FkT8ZBK9RCGiANRMkMF5elKI4tfXNzn5/ov2WzZ3Qn2JGIbzsPyXcFj4 0x4dZNyqVC17w== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wxv-LY; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Chen-Yu Tsai , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Maxime Ripard , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH v2 28/67] media: platform: sun8i-di: move config to its own file Date: Mon, 14 Mar 2022 17:34:23 +0100 Message-Id: <7c2f0067cf14537fb4768d39410f571fe69a73be.1647274406.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_093516_728530_74E93AF8 X-CRM114-Status: GOOD ( 16.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place sun8i-di-specific config stuff on a separate Kconfig file. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 15 +-------------- drivers/media/platform/sunxi/sun8i-di/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 drivers/media/platform/sunxi/sun8i-di/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b14a0fc78f41..61f8a8fae109 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -63,6 +63,7 @@ source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" source "drivers/media/platform/stm32/Kconfig" +source "drivers/media/platform/sunxi/sun8i-di/Kconfig" config VIDEO_MUX tristate "Video Multiplexer" @@ -230,20 +231,6 @@ config VIDEO_TI_VPE_DEBUG help Enable debug messages on VPE driver. -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 - depends on PM - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - Support for the Allwinner deinterlace unit with scaling - capability found on some SoCs, like H3. - To compile this driver as a module choose m here. - config VIDEO_SUN8I_ROTATE tristate "Allwinner DE2 rotation driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/platform/sunxi/sun8i-di/Kconfig new file mode 100644 index 000000000000..8d762e664d45 --- /dev/null +++ b/drivers/media/platform/sunxi/sun8i-di/Kconfig @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only +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 + depends on PM + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + Support for the Allwinner deinterlace unit with scaling + capability found on some SoCs, like H3. + To compile this driver as a module choose m here. From patchwork Mon Mar 14 16:34:24 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: 12780512 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 686B7C433F5 for ; Mon, 14 Mar 2022 17:01:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hpiXuEfgdogAXQaeZduYlq7xCwgB3y+aXs5gGdEdI0M=; b=TN6GecxJzO+3x5 28RlInJwGGBzEYxcxvRIH13Vrxgt2yY5pJJNv5OKyM1YmQAb/Gdp49l0jDQbR8u22fasEe0ANuzdG G0olz09h2FkPGCk3h1Cv2JSHksliUht+8v2UaXj/OQjXDWA+OBG94MyGkRdLiuCIfGCCnVE0+58Y7 1OQZVMv04UdEViK4vriVE8f6ipb16CdqXwp1g0SXKhs0k+rE4IFmXf78+KkBS2EPZJ50VveKLfwSz avh4NlNkf2+FBdT1cND5jLgcZjDnl0Au/PZrAfFTl3Fz1M7D/9LwzsrywqmDtle7yDkux61Ef6XHi XnFEN8mR3ZHg7K6wUhzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo3D-006DHR-VH; Mon, 14 Mar 2022 17:00:08 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo0I-006C8R-Bp for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:57:11 +0000 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 A85ED61483; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8B56C341C6; Mon, 14 Mar 2022 16:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275707; bh=dARsq0/2pDR3/nM1+SpQnMtEdZWOUExQy6OyQs3qLZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nGvX2T6SQjUFfHAEwHRQgh/mlFRJhrubQU3TAd8DjAr0t5k7MGmk7lps2UCqdwNnt Z8vdXupLm8AbmZakgZF23BlAdqiXqsa0IPmQICDVjL5RATy8JNZS3pncWiUmCapOIX 0fMhTCrJCaikQts9B+Zeq6tlTjJZ1XxhyHpVT0M6HZVZm+3VfZBaSCgdSFrQUHiSPh uiyaTy5qjq7iqQQytfEjFfOraDH9xCCxuMRoBfe5Vo2ab1qgPffwVz0mWo2BwqNPIW H05itkKe7ffl+RH0R+6R7Pog7h3kbXyrSbNqAgS36zTGcfSl4RWRQRvJb3Qaze5IPY a4tE9G4UsoWTQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wxz-N3; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Chen-Yu Tsai , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Maxime Ripard , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH v2 29/67] media: platform: sun8i-rotate: move config to its own file Date: Mon, 14 Mar 2022 17:34:24 +0100 Message-Id: <6b8d5a719102d262a769c60e2a4cc42d4f7a59a9.1647274406.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_095706_801669_03AF497D X-CRM114-Status: GOOD ( 16.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place sun8i-rotate-specific config stuff on a separate Kconfig file. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 14 +------------- drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 61f8a8fae109..224ebe4f5348 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -64,6 +64,7 @@ source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/sunxi/sun8i-di/Kconfig" +source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" config VIDEO_MUX tristate "Video Multiplexer" @@ -231,19 +232,6 @@ config VIDEO_TI_VPE_DEBUG help Enable debug messages on VPE driver. -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 - depends on PM - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - Support for the Allwinner DE2 rotation unit. - To compile this driver as a module choose m here. - config VIDEO_TEGRA_VDE tristate "NVIDIA Tegra Video Decoder Engine driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Kconfig b/drivers/media/platform/sunxi/sun8i-rotate/Kconfig new file mode 100644 index 000000000000..64a8ea76e917 --- /dev/null +++ b/drivers/media/platform/sunxi/sun8i-rotate/Kconfig @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only + +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 + depends on PM + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + Support for the Allwinner DE2 rotation unit. + To compile this driver as a module choose m here. From patchwork Mon Mar 14 16:34:27 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: 12780574 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1479EC433F5 for ; Mon, 14 Mar 2022 17:24:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9uW6f0dLyjZ23EkNXgWkIge4IJWnQAqNwS1lv+nQme0=; b=KH3K5XNN72x4nF hkwMULXJvuHLM3y3qSlLm1rWSAit7CvIUDdd8iP9gviCdVPLlrIWtIjy9B8kt/3X6UOpqPg3cwyRy /qELf5bIFsq6KGcyG+VDcPPM4pf68ahGSjmq/tJjFz0zW3X0D/it/QAKNSTkj1K0ALsVWUCSkOALE yIZAQmR2yz8U4HRxxKymEXVRiGA0IhBDCzZiByTjMq5hE0kAn/F7PrBowJ6S4lJDWZzectr53Xs+Q +BCJbWrJeLbp4kwqvcNPXJBhLZvNpPIIdhgZdPjWUNQ80tf5OgvDaVZrRj4lFHgbsA+I4BfIAb+7d 7KUBXsrh793MXExLn1dg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToPS-006MBI-GM; Mon, 14 Mar 2022 17:23:07 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToDI-006HQe-Qc; Mon, 14 Mar 2022 17:10:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=dJRdv9VlMDcj+ee73hvSiL46hRiN/ZS8WJECrSqQUGY=; b=ifDnu6yYye6ezNF9EIC8rwfeR/ ZArunk9SMCqPAFAFNylstMwKSngAF1NPrkKXmIEjFi2nEV+9goUOlI3FntVaVAgx2kwVnN2A5J5Oc aiD1MiXy+hPzT087U5gp+yvnVzJ+af3MJ9SNkQ9xpVLF3O/lD5YMKeNLAok3lLcGzEipNu3KzkEQ1 TRQdnmki2GC/QTInI5phlpZj0ozEk4woz0HrqFae7WMfxVL2wyOa+gFcOEPmMWf/OvE/TF3RxQQFN MpKj9PLXXXXyC3jc3zsPtW+vbwCktrlM0V5hfZwf+tRcESfF2OT4CRk2XWLO2RAO/e/qyZLQpSAGS dm5gzNng==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf4-000uEq-Vm; Mon, 14 Mar 2022 16:35:13 +0000 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 D92A7B80EA5; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DEE6C341CE; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275708; bh=xbwA4h9rJP6sQlhwxOwHv3TsRVwMHPDFIs9vlQYLPQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q9NMmsIv/1PFLIjsz1DzZOsk9hqIRNasOt1FojCHN/AMcXoOLI6xN4WFP3Yh9r2gX L7GaDuk3/2RpPF3GafSfIS77mZ80DtObpnZOJra3xH4kL2rF/slrPiJ6vRv/qFQ4Wt /RmOBrW5UAjpRw0Rb+BNMenHHn15SApXh8kgLt8LkTxSNSXgf0+lM+dltotKXm11eL RGuEhLyGUB2phryqgJxYASeFa2QSK+2pRP6YZI112JOgAm5HbpbuedVrE7EdvQQprw cyhuScmEsE7L+3aT272POS/1TMAdexKJ6LmNHzhB6zsj41ZWgCDyN0b8Eob//ijbPw JJZ77JFZNiHwA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnez-001wyC-Sn; Mon, 14 Mar 2022 17:35:05 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dafna Hirschfeld , Dmitry Osipenko , Hans Verkuil , Heiko Stuebner , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v2 32/67] media: platform: rkisp1: move config to its own file Date: Mon, 14 Mar 2022 17:34:27 +0100 Message-Id: <83f1eeefb5f29fc2bcd79360f581f09a0398f042.1647274406.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163511_402665_6C239531 X-CRM114-Status: GOOD ( 15.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to better organize the platform/Kconfig, place rkisp1-specific config stuff on a separate Kconfig file. Reviewed-by: Laurent Pinchart 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 20 +------------------ .../media/platform/rockchip/rkisp1/Kconfig | 19 ++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 drivers/media/platform/rockchip/rkisp1/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 228881ae0d22..29afef26cbe4 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -59,6 +59,7 @@ source "drivers/media/platform/qcom/venus/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/rockchip/rga/Kconfig" +source "drivers/media/platform/rockchip/rkisp1/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" @@ -82,25 +83,6 @@ config VIDEO_MUX source "drivers/media/platform/intel/Kconfig" -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 - select VIDEO_V4L2_SUBDEV_API - select VIDEOBUF2_DMA_CONTIG - select VIDEOBUF2_VMALLOC - select V4L2_FWNODE - select GENERIC_PHY_MIPI_DPHY - default n - help - Enable this to support the Image Signal Processing (ISP) module - present in RK3399 SoCs. - - To compile this driver as a module, choose M here: the module - will be called rockchip-isp1. - source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/rockchip/rkisp1/Kconfig b/drivers/media/platform/rockchip/rkisp1/Kconfig new file mode 100644 index 000000000000..c2e464317929 --- /dev/null +++ b/drivers/media/platform/rockchip/rkisp1/Kconfig @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0-only +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 + select VIDEO_V4L2_SUBDEV_API + select VIDEOBUF2_DMA_CONTIG + select VIDEOBUF2_VMALLOC + select V4L2_FWNODE + select GENERIC_PHY_MIPI_DPHY + default n + help + Enable this to support the Image Signal Processing (ISP) module + present in RK3399 SoCs. + + To compile this driver as a module, choose M here: the module + will be called rockchip-isp1. From patchwork Mon Mar 14 16:34:33 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: 12780549 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EDE1BC433EF for ; Mon, 14 Mar 2022 17:12:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rPl9lmabzyoIAT70jG7wsvN/5jBr0QqJJXxYAUwhF0o=; b=eh7lKuBL8hJShe vhK+YdAmt5FTr052LyWz6ThASX7ujR8A1VSyyqeTCiFJm4L+IG3f5+4vvV/kF0HvSMKGVn8x73d7m mMokMVZ+mUafNxSdYrYM9gJANJPQpaKFXuXSnNezgGdijtYiNmcvgwgbSsOdt59xh2bXCojrCATZ+ kJYGuDfO4OuhAMXnCPFThNfcgd7HvREP+pqUBXExWvA0Q1zLCS6thspko0DHBcI74C0K0Z+ZUSnPZ 0Lv1fnadSogybLiFnDfXQF/LTx0xk3guBFnyGxAK4+fdXhWq2hPSqWdYJ0h/lXDFx3zOlWbDTMYz8 Bxxf31gUvtje4AxKueMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToDD-006HYi-1g; Mon, 14 Mar 2022 17:10:29 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToD0-006HQe-Hz; Mon, 14 Mar 2022 17:10:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=+vuhkncLe5Poo339uYVAoFydQqACKtCkPmnAUdVJQYQ=; b=pm4x19RU2VJYfZO+s0K4k30a6z 35tXwkO12XWsIUT5UG9L9hR6EJcMN93s/Ke33CaNo2YCuYEImUdXBRJwiK2/bgwpb42qVmFNFGE20 dqCVB8AX3pYiI/R9GO7PjkiXe62ye2zFucDgJNlIafx6+TpA0p4T4FHlbGEvBPOCnx8BYvmfm4cCQ 4gD/t990aMDpOJMPwSDUevWZJZJxXMzRQskYsV5/VB24zPLIQN4LX4uAERofm+RjpRfNAnL1CJrmL tXu3PawwZXjcGRxZIuu7z9Rdra5lavRrwCf19aHdGA328OK6HqpxwZkNEk+lSaDBmSm48AEc3/FP7 qhus6vyA==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfE-000uLq-4M; Mon, 14 Mar 2022 16:35:28 +0000 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 DE05F61486; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E758C36AFC; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275708; bh=Tw9OcIpnZ6ZyVjAQ2hgynXGx9aSvOkfsqBXXRgEenAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jTiNo9CtzvZxNl9LqIZt4S/NHokSAJeV0+t4w6dUtmD8W3iHJ0HNackAbJKb7AOhI 2JxOgdckWkEzH3AiwI70xAkpHfkIzeubGIIhh4BQm6MtmxarO9f3Llh8SkszWE8LFB o7NRLGEWT1PmvyxidbX978GdpGjg6KlG3LnyPflKxF07KxxOaKTEaAxaTnwaN4hB3F vmVLGZhBTE5uP7dFQ+Dym8ntbbrh+G64ARyD2xTGHQoQEnxdukXv35l/BPOT6MV94z YyuH+/RL++6OXRq6zLdqAEmYkVVgMop3MVCMlOenp/tzMV+4iHsj8GB6kfDHuOIMki Y9uCp+a6Hzl4w== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wya-7w; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andy Gross , Bjorn Andersson , Chen-Yu Tsai , Dmitry Osipenko , Hans Verkuil , Heiko Stuebner , Jernej Skrabec , Laurent Pinchart , Maxime Ripard , Ming Qian , Robert Foss , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v2 38/67] media: platform: move some manufacturer entries Date: Mon, 14 Mar 2022 17:34:33 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163520_498884_DD6817EA X-CRM114-Status: GOOD ( 16.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As there are 4 manufacturer's directories with multiple sources (qcom, rockchip, sti and sunxi), move the sources from platform/Kconfig to their specific Konfig files. Acked-by: Jernej Skrabec Reviewed-by: Robert Foss Reviewed-by: Laurent Pinchart 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 13 +++---------- drivers/media/platform/qcom/Kconfig | 4 ++++ drivers/media/platform/rockchip/Kconfig | 3 +++ drivers/media/platform/sti/Kconfig | 5 +++++ drivers/media/platform/sunxi/Kconfig | 2 ++ 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 drivers/media/platform/qcom/Kconfig create mode 100644 drivers/media/platform/rockchip/Kconfig create mode 100644 drivers/media/platform/sti/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b7c60969c974..e3316fa37a8f 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -77,23 +77,16 @@ source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" -source "drivers/media/platform/qcom/camss/Kconfig" -source "drivers/media/platform/qcom/venus/Kconfig" +source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" -source "drivers/media/platform/rockchip/rga/Kconfig" -source "drivers/media/platform/rockchip/rkisp1/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/sti/bdisp/Kconfig" -source "drivers/media/platform/sti/c8sectpfe/Kconfig" -source "drivers/media/platform/sti/delta/Kconfig" -source "drivers/media/platform/sti/hva/Kconfig" +source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/sunxi/Kconfig" -source "drivers/media/platform/sunxi/sun8i-di/Kconfig" -source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/qcom/Kconfig new file mode 100644 index 000000000000..9f6c91cc95ca --- /dev/null +++ b/drivers/media/platform/qcom/Kconfig @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +source "drivers/media/platform/qcom/camss/Kconfig" +source "drivers/media/platform/qcom/venus/Kconfig" diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig new file mode 100644 index 000000000000..2f97c0e0268a --- /dev/null +++ b/drivers/media/platform/rockchip/Kconfig @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/rockchip/rga/Kconfig" +source "drivers/media/platform/rockchip/rkisp1/Kconfig" diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig new file mode 100644 index 000000000000..9fb5e78a92cf --- /dev/null +++ b/drivers/media/platform/sti/Kconfig @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/sti/bdisp/Kconfig" +source "drivers/media/platform/sti/c8sectpfe/Kconfig" +source "drivers/media/platform/sti/delta/Kconfig" +source "drivers/media/platform/sti/hva/Kconfig" diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig index 7151cc249afa..a10032215b08 100644 --- a/drivers/media/platform/sunxi/Kconfig +++ b/drivers/media/platform/sunxi/Kconfig @@ -2,3 +2,5 @@ source "drivers/media/platform/sunxi/sun4i-csi/Kconfig" source "drivers/media/platform/sunxi/sun6i-csi/Kconfig" +source "drivers/media/platform/sunxi/sun8i-di/Kconfig" +source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" From patchwork Mon Mar 14 16:34:35 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: 12780513 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 45414C433EF for ; Mon, 14 Mar 2022 17:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nUhz1RhcMJn/ePEXD/kfBAmNdchwUOJctei2Cz2ZGL0=; b=DFCvn6dtqSFJVc ECumOpKlnUSSc3yx7wbDfhM6wvv1XfIVnmAN/LeNRxp42WDHOyRKlXRzmq8418omvb5tOIJ3PlHqD dAAijhO9erKs51CDOndwojhzfsJQ0hKqHhC+UPZbiLBeUTtCEnbEC1GWIEfKK+iyDjbKnx3FBSCYs fWGhHdtF3Zxd8TU++9pqaL3s7H84/F/dYmhF5WAddwt2+wN1cFqb4AuOIdlTFzXdYlPzWs2X3fBZ2 8zqkPxagXp8HyyNJ5yXoDgUhliotODW+yk9CXag4UJatxxmpbrcfETslWo7uly5FzyuMGRgHui3cc MfBQlSPA0XOVo84zE8sQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo3r-006DXy-0O; Mon, 14 Mar 2022 17:00:48 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo1Z-006Cfr-Pm for linux-arm-kernel@bombadil.infradead.org; Mon, 14 Mar 2022 16:58:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=sjm52GDoyvlOjt9290o1gSyDWBPw55igMvwSg3piUao=; b=MrggEBVA3uhlJiyovt4ATDjIAj yXVduyyv5a901qv82Nd3NtR834sDLiD8BUk+qbBXFbQDFPwPs7l8/2FKQ9suX5IKiipjAP3puCLx9 1s9UER9TsSiWmhir4rkLYZnrk4RpV31zn+lsQa5SGsbmVIkqkBABukX//91OLbtuo6eI9IiFCMlgk Q5Df1PhUjPBiMbkuHKkU+DnE/4wphkgviDfLvaafFgXUhPY9Ya+SJMx4MqvNasw5rMilFk8o20m8H tvGmdVmiS1B1SZNK9vHF7b3g0/Y9ZuDs0U6FO7FKe4a900hlSmKwwAO62YKWcZL0KIXkloj41KzD4 g3X+80mg==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfF-004DRu-PS for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:27 +0000 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 16CEC61495; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 942F6C341D1; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275708; bh=mnzP78x62PrqI/Wgg4pPcVbC3/dSoYAuo2JnKAyheac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O5hZ6ne0FZJ3l2/75Y7bmdV4RlsTpG2qZmO3YGAgosrI2rI3iGYXN9QTzJAONJcKr MEqlf1VQJuvd/Yidb0S+XFai6ju94rv2XYKQA9hWbROPngJuLUvTCcNaRZ/vp5MBv1 4wmjAGnjicXQR35IOlWapRGfBk73uP15A96Jn+APtky91VBsVeIkijTuNAsDm+IIhN YgUDhDPv/ahpma2xqMnGzApS8Q4eAGiGGCf78n4/FrQ0rq1GIvaF/U2//UEmf56e0+ m+wtAyyyxpYtn5aPBd4ohyO1wd9GHwtF7LnQL6B3cAmRyogJPgT/rFKmmtJiRwujNn R+h51Jt+x3kXQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wyi-BT; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jiasheng Jiang , Lad Prabhakar , Laurent Pinchart , Marco Felsch , Martin Weber , Miaoqian Lin , Ming Qian , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Sascha Hauer , Shawn Guo , Wolfram Sang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 40/67] media: platform: rename coda/ to chips-media/ Date: Mon, 14 Mar 2022 17:34:35 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163522_091197_B070B0D3 X-CRM114-Status: GOOD ( 13.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename coda/ to chips-media/. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 4 ++-- drivers/media/platform/{coda => chips-media}/Kconfig | 0 drivers/media/platform/{coda => chips-media}/Makefile | 0 drivers/media/platform/{coda => chips-media}/coda-bit.c | 0 drivers/media/platform/{coda => chips-media}/coda-common.c | 0 drivers/media/platform/{coda => chips-media}/coda-gdi.c | 0 drivers/media/platform/{coda => chips-media}/coda-h264.c | 0 drivers/media/platform/{coda => chips-media}/coda-jpeg.c | 0 drivers/media/platform/{coda => chips-media}/coda-mpeg2.c | 0 drivers/media/platform/{coda => chips-media}/coda-mpeg4.c | 0 drivers/media/platform/{coda => chips-media}/coda.h | 0 drivers/media/platform/{coda => chips-media}/coda_regs.h | 2 +- drivers/media/platform/{coda => chips-media}/imx-vdoa.c | 0 drivers/media/platform/{coda => chips-media}/imx-vdoa.h | 0 drivers/media/platform/{coda => chips-media}/trace.h | 2 +- 17 files changed, 6 insertions(+), 6 deletions(-) rename drivers/media/platform/{coda => chips-media}/Kconfig (100%) rename drivers/media/platform/{coda => chips-media}/Makefile (100%) rename drivers/media/platform/{coda => chips-media}/coda-bit.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-common.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-gdi.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-h264.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-jpeg.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-mpeg2.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-mpeg4.c (100%) rename drivers/media/platform/{coda => chips-media}/coda.h (100%) rename drivers/media/platform/{coda => chips-media}/coda_regs.h (99%) rename drivers/media/platform/{coda => chips-media}/imx-vdoa.c (100%) rename drivers/media/platform/{coda => chips-media}/imx-vdoa.h (100%) rename drivers/media/platform/{coda => chips-media}/trace.h (98%) diff --git a/MAINTAINERS b/MAINTAINERS index 848640546398..84bc106acc57 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4771,7 +4771,7 @@ M: Philipp Zabel L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/coda.yaml -F: drivers/media/platform/coda/ +F: drivers/media/platform/chips-media/ CODE OF CONDUCT M: Greg Kroah-Hartman diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 721f27ef0130..24a43cef18de 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -71,7 +71,7 @@ source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" -source "drivers/media/platform/coda/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" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 20b07ae3ebf1..8d6e15fad0b1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,12 +6,12 @@ # Place here, alphabetically sorted by directory # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ -obj-y += aspeed/ obj-y += am437x/ obj-y += amphion/ +obj-y += aspeed/ obj-y += atmel/ obj-y += cadence/ -obj-y += coda/ +obj-y += chips-media/ obj-y += davinci/ obj-y += exynos-gsc/ obj-y += exynos4-is/ diff --git a/drivers/media/platform/coda/Kconfig b/drivers/media/platform/chips-media/Kconfig similarity index 100% rename from drivers/media/platform/coda/Kconfig rename to drivers/media/platform/chips-media/Kconfig diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/chips-media/Makefile similarity index 100% rename from drivers/media/platform/coda/Makefile rename to drivers/media/platform/chips-media/Makefile diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/chips-media/coda-bit.c similarity index 100% rename from drivers/media/platform/coda/coda-bit.c rename to drivers/media/platform/chips-media/coda-bit.c diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/chips-media/coda-common.c similarity index 100% rename from drivers/media/platform/coda/coda-common.c rename to drivers/media/platform/chips-media/coda-common.c diff --git a/drivers/media/platform/coda/coda-gdi.c b/drivers/media/platform/chips-media/coda-gdi.c similarity index 100% rename from drivers/media/platform/coda/coda-gdi.c rename to drivers/media/platform/chips-media/coda-gdi.c diff --git a/drivers/media/platform/coda/coda-h264.c b/drivers/media/platform/chips-media/coda-h264.c similarity index 100% rename from drivers/media/platform/coda/coda-h264.c rename to drivers/media/platform/chips-media/coda-h264.c diff --git a/drivers/media/platform/coda/coda-jpeg.c b/drivers/media/platform/chips-media/coda-jpeg.c similarity index 100% rename from drivers/media/platform/coda/coda-jpeg.c rename to drivers/media/platform/chips-media/coda-jpeg.c diff --git a/drivers/media/platform/coda/coda-mpeg2.c b/drivers/media/platform/chips-media/coda-mpeg2.c similarity index 100% rename from drivers/media/platform/coda/coda-mpeg2.c rename to drivers/media/platform/chips-media/coda-mpeg2.c diff --git a/drivers/media/platform/coda/coda-mpeg4.c b/drivers/media/platform/chips-media/coda-mpeg4.c similarity index 100% rename from drivers/media/platform/coda/coda-mpeg4.c rename to drivers/media/platform/chips-media/coda-mpeg4.c diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/chips-media/coda.h similarity index 100% rename from drivers/media/platform/coda/coda.h rename to drivers/media/platform/chips-media/coda.h diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platform/chips-media/coda_regs.h similarity index 99% rename from drivers/media/platform/coda/coda_regs.h rename to drivers/media/platform/chips-media/coda_regs.h index da5bb3212528..db81a904cf3f 100644 --- a/drivers/media/platform/coda/coda_regs.h +++ b/drivers/media/platform/chips-media/coda_regs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/coda/coda_regs.h + * linux/drivers/media/platform/chips-media/coda_regs.h * * Copyright (C) 2012 Vista Silicon SL * Javier Martin diff --git a/drivers/media/platform/coda/imx-vdoa.c b/drivers/media/platform/chips-media/imx-vdoa.c similarity index 100% rename from drivers/media/platform/coda/imx-vdoa.c rename to drivers/media/platform/chips-media/imx-vdoa.c diff --git a/drivers/media/platform/coda/imx-vdoa.h b/drivers/media/platform/chips-media/imx-vdoa.h similarity index 100% rename from drivers/media/platform/coda/imx-vdoa.h rename to drivers/media/platform/chips-media/imx-vdoa.h diff --git a/drivers/media/platform/coda/trace.h b/drivers/media/platform/chips-media/trace.h similarity index 98% rename from drivers/media/platform/coda/trace.h rename to drivers/media/platform/chips-media/trace.h index c0791c847f7c..19f98e6dafb9 100644 --- a/drivers/media/platform/coda/trace.h +++ b/drivers/media/platform/chips-media/trace.h @@ -167,7 +167,7 @@ DEFINE_EVENT(coda_buf_class, coda_jpeg_done, #endif /* __CODA_TRACE_H__ */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../drivers/media/platform/coda +#define TRACE_INCLUDE_PATH ../../drivers/media/platform/chips-media #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace From patchwork Mon Mar 14 16:34:37 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: 12780526 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 86FE9C433EF for ; Mon, 14 Mar 2022 17:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WhkwYF/OzQd2nY8OaZz/nw+/0X3OBorcIxQp3+2vfWs=; b=qKwOvWo7nA3SAi 3YTwtccwWuRhLEkLQpIRAa7xv4qH+bSHgxGKPOFOm1MDdJzPdE6bO4SHVoo5UhCslfAZFG/zjl3GS +SqJA7RkQJ9uwl4YooPBaYz7DtlCA5YcuqVDGqBwLDdrCPYblNTMOjVt1Nv6gkcO6PO9MdX+QRCo1 1S6YFwwJNC5EarOFsLsB2bsawLYEZ0Is9qWBPHpLwbcYVOPx6d3M2PT4He9TDWkL4iS86DClmPVBF Y808eW8GxKfpmE2InX6+Ysgl10SQ9i7eKV99HabkJaJdQbnG8HfNGXH8lmwCF51vbDPy0EZ3suFf9 cKqpoJbqjSGRENv2KasQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo8q-006FbL-Ls; Mon, 14 Mar 2022 17:05:57 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo1b-006Cfr-HN; Mon, 14 Mar 2022 16:58:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=MXYUXXIAQpLN5IbmLBbYb7oExJbhIysPnqH10wflT0A=; b=ka+a9ljXMUOBblJraJzxihdWGU N5TlQUzIeYZR+TCHx7mEvxgClR6yfIKo9eFiuSan13CsWCJZOnL3g94SHRsRxhoAalVMUWt8nMcrM 8Ccc1VB32vDqQcoixFY833NERjDAIff/W1D8I/A4RX+lBy76uj/GgABzL0m4a3BoGF9n12JM1T/yv I8z3275zM8pW7WwHcYYCz00Bftlhd4OhuwMTr/+9+DcYTWxfK1A7kb9u3Ki+QBldavAs39GXPJN47 lgTTroCVbtDNpTJ5dIK2GDMsay+S3v/l6VqS7t41H7YhB1xPXfHCkb7t4K9Vgy/A6oHDidRNUxYZJ U41smJjw==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfE-004DOy-48; Mon, 14 Mar 2022 16:35:24 +0000 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 0F97961471; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABFF7C340F5; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275708; bh=D/9Pf0G1jVKyYl+J3ogGxCO+ak+TDvvT76qMp3Ofy8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pf0jVS+1Fq/+7YbCSvKy1e+BoixrGCwVhZzDFrxW9q9ESWU5GkE3zEjlmrJufK0lG duMzCHtFghDcdbj6Nt4tOQh5w2BEpTbiSZa6vYjy5zBqYLi0w1+JMeDARD42R60mos KB/W+drz9YnPj9eBSJPkIVIJuhpM/MLLhuU9w1lJnA/EeUrJtOuO4/kJHx1hjD/BdD dQb5HppR1ulo/NPt6VAdnod1vDq8tAFT4Ew7pHE6RvJ2X4YSsGkpOpXzwba8XiQKRv G2vKIOFp6NJnfBfIzCFj6DFdtDG9WtY3m6kyA/1xlP/S7jufYmijlI3QRHCHBJEyD3 2pKfkChIx9xAA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wyq-FK; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Christophe JAILLET , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jerome Brunet , Kevin Hilman , Laurent Pinchart , Martin Blumenstingl , Ming Qian , Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 42/67] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/ Date: Mon, 14 Mar 2022 17:34:37 +0100 Message-Id: <83078d0edf793369710cf6a0c80981fa09286920.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163520_411700_AE9B9FCE X-CRM114-Status: GOOD ( 10.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename meson/ge2d/ to amlogic/meson-ge2d/. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- .../media/platform/{meson/ge2d => amlogic/meson-ge2d}/Kconfig | 0 .../media/platform/{meson/ge2d => amlogic/meson-ge2d}/Makefile | 0 .../platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d-regs.h | 0 .../media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d.c | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/Kconfig (100%) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/Makefile (100%) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d-regs.h (100%) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b83cf0eb99ce..09b0e60da4e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12523,7 +12523,7 @@ L: linux-amlogic@lists.infradead.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml -F: drivers/media/platform/meson/ge2d/ +F: drivers/media/platform/amlogic/meson-ge2d/ MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS M: Liang Yang diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 0a4260627a00..b4faee0a1b63 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -67,6 +67,7 @@ config VIDEO_MUX source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/am437x/Kconfig" +source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" @@ -77,7 +78,6 @@ 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/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 8b2deba4b62c..48531f93d92f 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,6 +7,7 @@ # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ obj-y += am437x/ +obj-y += amlogic/meson-ge2d/ obj-y += amphion/ obj-y += aspeed/ obj-y += atmel/ @@ -17,7 +18,6 @@ obj-y += exynos-gsc/ obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ -obj-y += meson/ge2d/ obj-y += mtk-jpeg/ obj-y += mtk-mdp/ obj-y += mtk-vcodec/ diff --git a/drivers/media/platform/meson/ge2d/Kconfig b/drivers/media/platform/amlogic/meson-ge2d/Kconfig similarity index 100% rename from drivers/media/platform/meson/ge2d/Kconfig rename to drivers/media/platform/amlogic/meson-ge2d/Kconfig diff --git a/drivers/media/platform/meson/ge2d/Makefile b/drivers/media/platform/amlogic/meson-ge2d/Makefile similarity index 100% rename from drivers/media/platform/meson/ge2d/Makefile rename to drivers/media/platform/amlogic/meson-ge2d/Makefile diff --git a/drivers/media/platform/meson/ge2d/ge2d-regs.h b/drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h similarity index 100% rename from drivers/media/platform/meson/ge2d/ge2d-regs.h rename to drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c similarity index 100% rename from drivers/media/platform/meson/ge2d/ge2d.c rename to drivers/media/platform/amlogic/meson-ge2d/ge2d.c From patchwork Mon Mar 14 16:34:38 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: 12780567 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 96C60C433EF for ; Mon, 14 Mar 2022 17:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wfaKUX0HgwGUqR3vHl/BxIkU+5R63X38VCeEDcmHp4o=; b=yOO90+UCTloPtI 2viPe3V0GmaW57UunTaOo6Eys0oS7n6lbEqLykyCfRNIfawd7otuPuV9AfEeVl1OiiCp8buCxX5Xn ziwCMvDlVtuBxZkvqq4d7KD7etqODdGlFaHoV61FFgDgS4KLdwYGbh0NFWQP9t7F521aj/LYGeiqy jGgU+Jx9efWal4W0iIMVwkvT3/P/Ui8qhCCIBZYtxpv01pU2c/Yqh4pbbtKRO2WZcUbjz8RygF4vE c1pdRgKGe+FVCNmaQ519BsnRmv26VyS6nExfB3aQG5FHxWV72yWKyFXTsFXU2iMEPfg26cZ67iuoe WouFIu12fywYcX6e0rHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToMc-006L0s-8W; Mon, 14 Mar 2022 17:20:10 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToDE-006HQe-6d; Mon, 14 Mar 2022 17:10:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=L455oWX63UMXOXvN1TtmBCqGYlOLXYwJOXk8mwuQUpA=; b=e+wNqqB5VEDPid0oBpxzfgU2Aa DCXovc3gI6tMtQrbPEQL2e4COabmOUOREBMWINp+zjr65omxdJFI5LGAk6pkXsVBE9QdH7ZIp4Pxy PLywVbtaURt1dTNMZ6Mkhr/8J6wDauG61oGdGqj7B/SDjY/BT69c4xFA6fTEHm6dnNwL0nun5rHUV ra+U8uiEgLWsEp1uYIBJLn5VkgmDC99ytbwyo+McFNquG0OW6DwKvy8I4zPTj3/2O20iZMrriYD5v kU9TE23v/1fKsoVkrFxEqvPt0R5MjgPGMaFVszaugInT5qvLKiGO7jRzP2bA710dbTHtSbPa3gYMQ 7a1ABFWg==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf5-000uEs-Cj; Mon, 14 Mar 2022 16:35:16 +0000 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 4497DB80EAE; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3228C36AFE; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=5qkQfzu+0qcnFdiNfdOuDKAMdtwC15GE2FC6FRqmOyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qt+k9XczkLDLhF9rswDa4vbk6/Q2B5ORsxMbAfp2tQadFCL0br/E178B8xutzddxg Ii1VsclQKk0oGdXtQJt9sOM0vZWyUOTm6Z+o0SjOcUSsFBV9vFsXDfkmP7O8Gc3/+O KLDUYMKhTfs6KneKFyUFyghotRaogFgxqBDuL+dGj1tITNecCHfhzhdhIGNPVqy6CS wtLwANyJwYQq/L8VJ/zqUcdP/ISzYNHKdOyzgz9QKKi/YqXceutiIHV/eKnTTQz292 B7X+S0+PILeRdFSJ0JBLcH6Hl7j9zzrnUkG8HmNncOqkPKTRwQvFlch/obYcrAuUf4 DNuThKexyMwYg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wyu-Gk; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , AngeloGioacchino Del Regno , Cai Huoqing , Colin Ian King , Dafna Hirschfeld , Dan Carpenter , Dmitry Osipenko , Eugen Hristev , Evan Green , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Kieran Bingham , Laurent Pinchart , Matthias Brugger , Ming Qian , Rick Chang , Sakari Ailus , Xu Wang , Yong Wu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 43/67] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/ Date: Mon, 14 Mar 2022 17:34:38 +0100 Message-Id: <0a08968029e91ff6d126e7bc4b8e17efdd64254d.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163511_711483_955BDA59 X-CRM114-Status: GOOD ( 11.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename mtk-jpeg/ to mediatek/mtk-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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile | 0 drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c | 0 drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h | 0 14 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 09b0e60da4e9..fa0a3de3865f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12130,7 +12130,7 @@ M: Rick Chang M: Bin Liu S: Supported F: Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt -F: drivers/media/platform/mtk-jpeg/ +F: drivers/media/platform/mediatek/mtk-jpeg/ MEDIATEK MDP DRIVER M: Minghsiu Tsai diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b4faee0a1b63..f1746529e763 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -78,7 +78,7 @@ 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/mtk-jpeg/Kconfig" +source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 48531f93d92f..c792f6216918 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -18,7 +18,7 @@ obj-y += exynos-gsc/ obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ -obj-y += mtk-jpeg/ +obj-y += mediatek/mtk-jpeg/ obj-y += mtk-mdp/ obj-y += mtk-vcodec/ obj-y += mtk-vpu/ diff --git a/drivers/media/platform/mtk-jpeg/Kconfig b/drivers/media/platform/mediatek/mtk-jpeg/Kconfig similarity index 100% rename from drivers/media/platform/mtk-jpeg/Kconfig rename to drivers/media/platform/mediatek/mtk-jpeg/Kconfig diff --git a/drivers/media/platform/mtk-jpeg/Makefile b/drivers/media/platform/mediatek/mtk-jpeg/Makefile similarity index 100% rename from drivers/media/platform/mtk-jpeg/Makefile rename to drivers/media/platform/mediatek/mtk-jpeg/Makefile diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h From patchwork Mon Mar 14 16:34:39 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: 12780566 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AFA25C433EF for ; Mon, 14 Mar 2022 17:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kJZsgtTjwsTIPc3IIdMhxWWevnzhJGGaMY00Wd435o0=; b=gU8qofGu4MyA9p 4SLNRbL/heQrN7SC2+TqCuztiTbr17MVGnUXlt+6Jvlm4qPX8WbPTWJLA8NI9Zewd6+KHBh6jvm9M hQ+jWn/I0z+wYxqiBPFu4aECi9PUecnIvoOSWz4pXEW77g3kxK4g620omVcAiBdBVVng1QHeRCAzx nPHSpylAC8MjDJjhld4FX4Yn0xVmZR/ca2bvhhfoH+mwxDdwtCDf0E4mrdTplcrqr8yS/w4d+odP0 hgR2t7Kz/bQBn6X8GCwSJ+Su0EoK57zqg7LW+xDRknQgs4KGNSrrbBzZGP7AjZqOuAKKcZDmuo5kk VhVPRyLGzSX7CgRHgi7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToLy-006Knj-LV; Mon, 14 Mar 2022 17:19:32 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToDB-006HQe-N0; Mon, 14 Mar 2022 17:10:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=pSX7+LSdiUpirjtamvMB01vqzQzGGVJDo6bMg8sXOkw=; b=XJCADYjcimiTkXcp5GfAW/0rlX zk5Vkk1f3i7fwLuqJwFX5nCPX6p7RySqHxZI+0h9FC+om50pRIs1ikjW01wwF61TAdFeJ+BINTh7W 2WqeOkKEKrAWEYrX4oiK/EGfbIaFmdE1QSyQuM/nXcBANL44zPfrzq5r/HFE6olFQlEJrnQnioBt9 dclGO+RRfcHAAZF1CbFXUaHo5kK9zErb50TiT8TSyZWeDl/8/xK1RoVBbIUngCbtfxcAlzWh6omga uzfU/qbkvaWK9WKk36EDoV/8EDbhO3mxNmL295pcVMZ6Psj1wPPOcHQAKbj4hl++tfVeOazbumISn 0UWcrwdw==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf5-000uEu-Fw; Mon, 14 Mar 2022 16:35:17 +0000 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 5255BB80EAF; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD2CFC36AFB; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=hQD9ONOl5WXP8OLmTwqlzucf8/noeaEmBZnVG9VfKEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OiOnt3YzrD1gBcriZleCrHhiEi/g1KQYvVYGadZAXTlfkebLh8qx9l1CrmHSHJ2TQ eVNz7AoMz1C4QTgyJmXi/mpw5PghIhFj4xPEgaogURihOqH4ASCbLQP1MqwYO0zTBr LWDj161O5Hq+VZp1E7zEH23VCduZKg+iRyVrEQPfOAD5x7JA8cZUXJx9EgGWJpWa3v L1h2odQTrc6Yc03OK30FfufXvaR3F59GT2v1t1iS4Tg33t/bQK7GCRn1U8/of34/jm qL09fE2LoMYLIdpi2hf5wjNipLv6NdxIn2m0TrmGGNk/uGe/sd5BWmsrfkhgfLR6NG ScZwI+xcoqzGQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wyy-Iu; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , AngeloGioacchino Del Regno , Arnd Bergmann , Dafna Hirschfeld , Dmitry Osipenko , Eugen Hristev , Evan Green , Hans Verkuil , Houlong Wei , Jacopo Mondi , Jernej Skrabec , Jonathan Cameron , Laurent Pinchart , Matthias Brugger , Ming Qian , Xu Wang , Yong Wu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 44/67] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/ Date: Mon, 14 Mar 2022 17:34:39 +0100 Message-Id: <8a2f9f065b1a38e3d444ad5408c809f339cbecdd.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163511_743766_CE5C7425 X-CRM114-Status: GOOD ( 11.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename mtk-mdp/ to mediatek/mtk-mdp/. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index fa0a3de3865f..2203d98bbcf1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12138,7 +12138,7 @@ M: Houlong Wei M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-mdp.txt -F: drivers/media/platform/mtk-mdp/ +F: drivers/media/platform/mediatek/mtk-mdp/ F: drivers/media/platform/mtk-vpu/ MEDIATEK MEDIA DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f1746529e763..8a7ac0b8e09f 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -79,7 +79,7 @@ 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" -source "drivers/media/platform/mtk-mdp/Kconfig" +source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index c792f6216918..6f5d09cd8f9b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -19,7 +19,7 @@ obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ -obj-y += mtk-mdp/ +obj-y += mediatek/mtk-mdp/ obj-y += mtk-vcodec/ obj-y += mtk-vpu/ obj-y += nxp/ diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platform/mediatek/mtk-mdp/Kconfig similarity index 100% rename from drivers/media/platform/mtk-mdp/Kconfig rename to drivers/media/platform/mediatek/mtk-mdp/Kconfig diff --git a/drivers/media/platform/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile similarity index 100% rename from drivers/media/platform/mtk-mdp/Makefile rename to drivers/media/platform/mediatek/mtk-mdp/Makefile diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h From patchwork Mon Mar 14 16:34:40 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: 12780557 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id BA967C433F5 for ; Mon, 14 Mar 2022 17:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y7qgzC32JwPl5cnaDHKoMHTD5pyQ2i82qLeERcIOGLQ=; b=EYn44ZYoUUrGtP wXJ67y1TBW9yzBsVJaymLITBvRyST7WSr1G0VOVU6jPPvG7Y6tXx7xradi0uk/sOdU1HgNOmDTK9w vmaAfmkyG4Mile0U1tZOX4ht8Tbq+2wjiGDYIX/p52nKxFOKS3Kx6DFiu8q4zkHeZHZbovYDsuZzN F7DI2CdpR7A0RUFkfLq80x+SnFimC99cCPpJ2zr30JBvGfpbGsreeChiwcYDlthKSw8nl5O0tyKsK u2dS4ZRIErwE5y9ESjXqYm9xcvGxRWJqsRoqJligCAqWqAf2R51rsDTJROF+E7XKQfiRFm3pX2zf3 0Urb77mf22Yu3rnrYriQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToIV-006JQB-MP; Mon, 14 Mar 2022 17:15:59 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToD6-006HQe-FO; Mon, 14 Mar 2022 17:10:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=bQz+DZspKO2NlWA3xRfNA8zOrjj317q6BL7C8mxOhzY=; b=OIsgdnO4QzBd/zye/6EHEYcm8i 4hK9LRaGPzXPMIpkaptycd8MBA4mZ1KSiPMDZ8xw9t4FFr/N3bD4997xdIJftg1I3fz/84RzJnb17 ur9E8sAe+GW9zJIAO+qTtHp9JIVaajD07RwzTrpmMlbSj2PvaIyhzD+M790Ot9lXDLWb7TaNy+6zT zqFd8Kx3UnGjB1CS8ONe7AVxiqsYFs756w/pf1ElaXFra9gaFGntjFS/gtUUERKaj8BBOrr014fto IbCtthxGcfUOz++Jv5tVhjgOGQtvPdqJnXTL8KMmDreQJQFUuIVuFaRJeFJkgwmz+yvY035BFGRAO ZiwhxiYg==; Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf9-000uIb-3E; Mon, 14 Mar 2022 16:35:22 +0000 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 76BF3B80EB5; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD372C36B06; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=o0gupAW6zbpEXw379aWkja/Syw8JErkoJTYi3M7B6GY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gDLZKE8pzceQfB1nZ5Hb+YpMglx7/H8cFhCFRIYtzkWJAjSahd+hnyXuG3GZLlimg OoRJaQcfcPFbMQI/w+2Rrev9P/HkZf4EjqBHKFsSrcCG9v+JRGfGYrOy28yDLfEpYh i5VhGUXlAUkNos7ntfwIa7Lcu4FcguDjfd8/Epv5pytnK9jO5rmj5l/jaWZAOFP8lB ksz0Vkk1mXuPu5wPSFajmE3l04FdZpZxbGrKLsK1yg57ctw0yAOVNH8yb/hitnkEdv R77PtV9ItvCTb38jJvHmKsPnmypqVwS7Geh0Yh4ZunAijWCvjROPnTtRT5zaBljXDe 7/0DLDHHtSdvA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wz2-LR; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Alexandre Courbot , AngeloGioacchino Del Regno , Benjamin Gaignard , Christophe JAILLET , Dafna Hirschfeld , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Hirokazu Honda , Hsin-Yi Wang , Irui Wang , Jacopo Mondi , Jernej Skrabec , Jiasheng Jiang , Laurent Pinchart , Maoguang Meng , Matthias Brugger , Ming Qian , Nicolas Dufresne , Steve Cho , Tiffany Lin , Tzung-Bi Shih , Yong Wu , Yunfei Dong , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 45/67] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/ Date: Mon, 14 Mar 2022 17:34:40 +0100 Message-Id: <01e83934b803e54c5712731d5fe523eb5bd4db99.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163515_449330_D4595B86 X-CRM114-Status: GOOD ( 11.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename mtk-vcodec/ to mediatek/mtk-vcodec/. Acked-by: Nicolas Dufresne 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0 .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0 .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0 .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0 .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0 .../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0 49 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 2203d98bbcf1..bfe014870a77 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12147,7 +12147,7 @@ M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt F: Documentation/devicetree/bindings/media/mediatek-vpu.txt -F: drivers/media/platform/mtk-vcodec/ +F: drivers/media/platform/mediatek/mtk-vcodec/ F: drivers/media/platform/mtk-vpu/ MEDIATEK MMC/SD/SDIO DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 8a7ac0b8e09f..10055af0c7f8 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" -source "drivers/media/platform/mtk-vcodec/Kconfig" +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 6f5d09cd8f9b..637a3a7ac036 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -20,7 +20,7 @@ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ obj-y += mediatek/mtk-mdp/ -obj-y += mtk-vcodec/ +obj-y += mediatek/mtk-vcodec/ obj-y += mtk-vpu/ obj-y += nxp/ obj-y += omap/ diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig similarity index 100% rename from drivers/media/platform/mtk-vcodec/Kconfig rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile similarity index 100% rename from drivers/media/platform/mtk-vcodec/Makefile rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h From patchwork Mon Mar 14 16:34:41 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: 12780523 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 12850C433F5 for ; Mon, 14 Mar 2022 17:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dIG85OV4d6k1CQRwo715KxqKqHF1vHpChInLzemp/9U=; b=Fgdpp9Ub0ue+fG pbXuN8X18653m6u0iFrsKdKhOT+ofZQkvVTdDu4xue8qH5vrjdPAnPihEdpebIZR3FiAa5NzYfl/S U2K3+pxkGI327b6VlXKpyTuQj3J8kOpsBl8iNDPkEAarlTIPqCH/fVLEQVNi7iFOTEyVMY5GsYZzc aDo6QJEX2X4D/881cbAQfayx4OyoACUrNrdakx1tBXZDw1dEX6h+2jadCtyyIIwsoYi65TuznZ2hh yQhkWUic06zcXjwStrwepb6hIA7sKMLcSqFXreHlN8Ku8GZlMVm7LJtRAwfYTJwzZ5MQ1FJ/qvm1z OcWNt93nVEOOUeem4gLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo5k-006EJZ-Vy; Mon, 14 Mar 2022 17:02:45 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo1a-006Cfr-56; Mon, 14 Mar 2022 16:58:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=4M0Bq2vLaEyFELsVx131Gocr3J7WMw160LmQhjTvQ6w=; b=T/tt78Hy6HNGc97OkxS63hZxfB ezAlcys9SAO5rF40Mc1f5ZNObrbMas3EsmWy55l/0kEfkmKUMqxoKFMT/MW6+T46TuwdyEpo0GLK8 iWDaCUZDGIicLMdCNyTZj4kBhOdMLwvYzzW95ecBGS8c1IcwFm5jZUKeErTWBaacoJtGjZH4NO2S1 DBVMN9l+z70caa5AcdNJRXGwUzJy85l104490Y5sSAnz8AisNhJXKP10YKxhMMAjwzSlYLPrx4rvU RmfiWqhqCf7MhYC4EZsekzoqqLWuncTpzvJKYP9frZbF8/FzJ9fkBQNEaVgbj5lQ62Kms1cynuGPG lsus24Iw==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfF-004DRs-PO; Mon, 14 Mar 2022 16:35:27 +0000 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 26376614A0; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA38FC36AE2; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=lXeLnqZ5Zmymy/mgfeMaIxAUlHmMCiEmJMsdC9TCZs0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F+jft0wgEdAZZ55ScSNXGngpwHnugRq5y24VcewiQgNeqze/dQFlQq4zaMTZtlIOl jv2aGKK6yzPhAriw+MEDLPFKeXuS9bfLFCRnxSxf8LJzaR8sku4KiOm8dIwnpJdgC6 HTj9duKag2Pmekve4en33hnqETet16VPXej7MEmQUsBz/9uepc43Y++9+wtZZlPlpm 7Wq9f/jmiGN3zo4sbcBnlBvMdNpbpJr0QE1woDf/tKBIjI89Ai1DJo+LXlAgisYvkQ oRcDE3l/b62c9vU9hRScZo9hDa+2VyG13yCdlhVvo/tSMkGXOXdzvxIq/ox+igWtza KLoj4cXw9UCNg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wz6-N7; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Christophe JAILLET , Dafna Hirschfeld , Ding Senjie , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Houlong Wei , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Matthias Brugger , Ming Qian , Sakari Ailus , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 46/67] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/ Date: Mon, 14 Mar 2022 17:34:41 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163522_068599_1DCA27DB X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename mtk-vpu/ to mediatek/mtk-vpu/. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 4 ++-- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/mediatek/mtk-mdp/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile | 0 drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c | 0 drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index bfe014870a77..58e0d42b1278 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12139,7 +12139,7 @@ M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-mdp.txt F: drivers/media/platform/mediatek/mtk-mdp/ -F: drivers/media/platform/mtk-vpu/ +F: drivers/media/platform/mediatek/mtk-vpu/ MEDIATEK MEDIA DRIVER M: Tiffany Lin @@ -12148,7 +12148,7 @@ S: Supported F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt F: Documentation/devicetree/bindings/media/mediatek-vpu.txt F: drivers/media/platform/mediatek/mtk-vcodec/ -F: drivers/media/platform/mtk-vpu/ +F: drivers/media/platform/mediatek/mtk-vpu/ MEDIATEK MMC/SD/SDIO DRIVER M: Chaotian Jing diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 10055af0c7f8..a9ad0c3bd0cc 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -81,7 +81,7 @@ source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" -source "drivers/media/platform/mtk-vpu/Kconfig" +source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 637a3a7ac036..954ad8f2cde1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -21,7 +21,7 @@ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ obj-y += mediatek/mtk-mdp/ obj-y += mediatek/mtk-vcodec/ -obj-y += mtk-vpu/ +obj-y += mediatek/mtk-vpu/ obj-y += nxp/ obj-y += omap/ obj-y += omap3isp/ diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile index 5982d65c9971..eab6f984aeea 100644 --- a/drivers/media/platform/mediatek/mtk-mdp/Makefile +++ b/drivers/media/platform/mediatek/mtk-mdp/Makefile @@ -7,4 +7,4 @@ mtk-mdp-y += mtk_mdp_vpu.o obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o -ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu +ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/mtk-vpu diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platform/mediatek/mtk-vpu/Kconfig similarity index 100% rename from drivers/media/platform/mtk-vpu/Kconfig rename to drivers/media/platform/mediatek/mtk-vpu/Kconfig diff --git a/drivers/media/platform/mtk-vpu/Makefile b/drivers/media/platform/mediatek/mtk-vpu/Makefile similarity index 100% rename from drivers/media/platform/mtk-vpu/Makefile rename to drivers/media/platform/mediatek/mtk-vpu/Makefile diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c similarity index 100% rename from drivers/media/platform/mtk-vpu/mtk_vpu.c rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h similarity index 100% rename from drivers/media/platform/mtk-vpu/mtk_vpu.h rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h From patchwork Mon Mar 14 16:34: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: 12780495 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4CED5C433EF for ; Mon, 14 Mar 2022 16:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WGxLGtL0TNnZvsreW9a4sBguI+fN7LZeWvOkmlYSIgM=; b=A7zodeeRR9QvZz RTWhBKbEhTd7waV2di4uIhPa6hm6o3osFksZLHroR6DPXwyvIQ9TNh+19cncGwVJVt+CttbwmXCty 096hc3Zsh3BTXcqt36c+Ti9OT6CePLXA+GsoohWGnre/8nyMeITPP2xlFQjR+/PmYjOLh7WWWNOzX DdAjqCrWkONOZi4hvLieVDjeQcG5I93amfyPc8MctWZDaufsk58p84F3LFTfZVjtkJsZ7oJx1PhDx YJTblDyk/UgQdhh1Q9UvzPbm4EhfXFrO+OpDNF0F0e7KaEixqCot097mGYzPCKp9O8bEiX53Ec3oY tmDlgpbN9Sj1IulSAp2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnqV-00682y-EU; Mon, 14 Mar 2022 16:47:01 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfE-0063GX-4u for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:27 +0000 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 55512614A8; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB9F0C36AEB; Mon, 14 Mar 2022 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=D6ChQjUZENhtrVmHR029FrQ3rnO9EUGBzfdvL0FFu18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vFCPJ5iEwlen4+Cv2D4dBlIPgAMbRwyG1KNlpac5nA5/YZjaNXCahBSjcu0Pg/Ou7 MV9MJuA7GbGlC1Dsi/Yko+rxsvTdcmpGF2O+XCGHuPM/4/K1lxa5oo9Rz6staYpzpX bFHSilpT/aU7/JdwyIKrCX7Hz6tX+9OirO0fNz57M51DeQ8t/MqLXUOK6KZucDhv22 85g8UMsUaM5ZcEC4fjP8T+FrlljwTTpJ/b+PJQod8Pon69Snu4gElDeYOITHiwrWAT n8ZT38jo357K7uyxhBlpk+/Y+ICn4adxLMTGo2L3h/nvIAtl7nlKO8Ehr6h9VjgSg/ FO5rrhcAmF1sA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wzA-OP; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Chen-Yu Tsai , Dinghao Liu , Dmitry Osipenko , Eugen Hristev , Ezequiel Garcia , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jia-Ju Bai , Jonathan Cameron , Laurent Pinchart , Maxime Ripard , Mikhail Rudenko , Ming Qian , Ondrej Jirman , Robert Foss , Sakari Ailus , Tomi Valkeinen , Yong Deng , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/ Date: Mon, 14 Mar 2022 17:34:42 +0100 Message-Id: <85266b480902079391d4206b8aa276ff131a730f.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_093520_849469_368E3E99 X-CRM114-Status: GOOD ( 15.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename sunxi/ to allwinner/. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 8 ++++---- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/allwinner/Kconfig | 6 ++++++ drivers/media/platform/{sunxi => allwinner}/Makefile | 0 .../media/platform/{sunxi => allwinner}/sun4i-csi/Kconfig | 0 .../platform/{sunxi => allwinner}/sun4i-csi/Makefile | 0 .../platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.c | 0 .../platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.h | 0 .../platform/{sunxi => allwinner}/sun4i-csi/sun4i_dma.c | 0 .../platform/{sunxi => allwinner}/sun4i-csi/sun4i_v4l2.c | 0 .../media/platform/{sunxi => allwinner}/sun6i-csi/Kconfig | 0 .../platform/{sunxi => allwinner}/sun6i-csi/Makefile | 0 .../platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.c | 0 .../platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.h | 0 .../{sunxi => allwinner}/sun6i-csi/sun6i_csi_reg.h | 0 .../platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.c | 0 .../platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.h | 0 .../media/platform/{sunxi => allwinner}/sun8i-di/Kconfig | 0 .../media/platform/{sunxi => allwinner}/sun8i-di/Makefile | 0 .../platform/{sunxi => allwinner}/sun8i-di/sun8i-di.c | 0 .../platform/{sunxi => allwinner}/sun8i-di/sun8i-di.h | 0 .../platform/{sunxi => allwinner}/sun8i-rotate/Kconfig | 0 .../platform/{sunxi => allwinner}/sun8i-rotate/Makefile | 0 .../{sunxi => allwinner}/sun8i-rotate/sun8i-formats.h | 0 .../{sunxi => allwinner}/sun8i-rotate/sun8i-rotate.h | 0 .../{sunxi => allwinner}/sun8i-rotate/sun8i_formats.c | 0 .../{sunxi => allwinner}/sun8i-rotate/sun8i_rotate.c | 0 drivers/media/platform/sunxi/Kconfig | 6 ------ 29 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 drivers/media/platform/allwinner/Kconfig rename drivers/media/platform/{sunxi => allwinner}/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/Kconfig (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_dma.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_v4l2.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/Kconfig (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi_reg.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/Kconfig (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/sun8i-di.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/sun8i-di.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/Kconfig (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i-formats.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i-rotate.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i_formats.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i_rotate.c (100%) delete mode 100644 drivers/media/platform/sunxi/Kconfig diff --git a/MAINTAINERS b/MAINTAINERS index 58e0d42b1278..f29195850c16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -750,7 +750,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml -F: drivers/media/platform/sunxi/sun4i-csi/ +F: drivers/media/platform/allwinner/sun4i-csi/ ALLWINNER CPUFREQ DRIVER M: Yangtao Li @@ -5114,7 +5114,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml -F: drivers/media/platform/sunxi/sun6i-csi/ +F: drivers/media/platform/allwinner/sun6i-csi/ CW1200 WLAN driver M: Solomon Peachy @@ -5391,7 +5391,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml -F: drivers/media/platform/sunxi/sun8i-di/ +F: drivers/media/platform/allwinner/sun8i-di/ DELL LAPTOP DRIVER M: Matthew Garrett @@ -16746,7 +16746,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml -F: drivers/media/platform/sunxi/sun8i-rotate/ +F: drivers/media/platform/allwinner/sun8i-rotate/ RPMSG TTY DRIVER M: Arnaud Pouliquen diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index a9ad0c3bd0cc..61240f8226bb 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -66,6 +66,7 @@ config VIDEO_MUX # TODO: create per-manufacturer directories source "drivers/media/platform/allegro-dvt/Kconfig" +source "drivers/media/platform/allwinner/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" source "drivers/media/platform/amphion/Kconfig" @@ -94,7 +95,6 @@ source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" -source "drivers/media/platform/sunxi/Kconfig" source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 954ad8f2cde1..88519e902919 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,6 +6,7 @@ # Place here, alphabetically sorted by directory # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ +obj-y += allwinner/ obj-y += am437x/ obj-y += amlogic/meson-ge2d/ obj-y += amphion/ @@ -39,7 +40,6 @@ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ obj-y += sti/hva/ obj-y += stm32/ -obj-y += sunxi/ obj-y += tegra/vde/ obj-y += ti-vpe/ obj-y += via/ diff --git a/drivers/media/platform/allwinner/Kconfig b/drivers/media/platform/allwinner/Kconfig new file mode 100644 index 000000000000..95a671d87e85 --- /dev/null +++ b/drivers/media/platform/allwinner/Kconfig @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only + +source "drivers/media/platform/allwinner/sun4i-csi/Kconfig" +source "drivers/media/platform/allwinner/sun6i-csi/Kconfig" +source "drivers/media/platform/allwinner/sun8i-di/Kconfig" +source "drivers/media/platform/allwinner/sun8i-rotate/Kconfig" diff --git a/drivers/media/platform/sunxi/Makefile b/drivers/media/platform/allwinner/Makefile similarity index 100% rename from drivers/media/platform/sunxi/Makefile rename to drivers/media/platform/allwinner/Makefile diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media/platform/allwinner/sun4i-csi/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/Kconfig rename to drivers/media/platform/allwinner/sun4i-csi/Kconfig diff --git a/drivers/media/platform/sunxi/sun4i-csi/Makefile b/drivers/media/platform/allwinner/sun4i-csi/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/Makefile rename to drivers/media/platform/allwinner/sun4i-csi/Makefile diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h b/drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/allwinner/sun6i-csi/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/Kconfig rename to drivers/media/platform/allwinner/sun6i-csi/Kconfig diff --git a/drivers/media/platform/sunxi/sun6i-csi/Makefile b/drivers/media/platform/allwinner/sun6i-csi/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/Makefile rename to drivers/media/platform/allwinner/sun6i-csi/Makefile diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/platform/allwinner/sun8i-di/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/Kconfig rename to drivers/media/platform/allwinner/sun8i-di/Kconfig diff --git a/drivers/media/platform/sunxi/sun8i-di/Makefile b/drivers/media/platform/allwinner/sun8i-di/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/Makefile rename to drivers/media/platform/allwinner/sun8i-di/Makefile diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/allwinner/sun8i-di/sun8i-di.c similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.c rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.c diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.h b/drivers/media/platform/allwinner/sun8i-di/sun8i-di.h similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.h rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.h diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Kconfig b/drivers/media/platform/allwinner/sun8i-rotate/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/Kconfig rename to drivers/media/platform/allwinner/sun8i-rotate/Kconfig diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Makefile b/drivers/media/platform/allwinner/sun8i-rotate/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/Makefile rename to drivers/media/platform/allwinner/sun8i-rotate/Makefile diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h b/drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h b/drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c b/drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig deleted file mode 100644 index a10032215b08..000000000000 --- a/drivers/media/platform/sunxi/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -source "drivers/media/platform/sunxi/sun4i-csi/Kconfig" -source "drivers/media/platform/sunxi/sun6i-csi/Kconfig" -source "drivers/media/platform/sunxi/sun8i-di/Kconfig" -source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" From patchwork Mon Mar 14 16:34: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: 12780509 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3E011C433F5 for ; Mon, 14 Mar 2022 16:56:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7rznjpJ733ls9sex3eZX7wuMY49D3K0f+h0f0SNCcq4=; b=rhtZMjylUC5Ffo F5quDW3lP+nVoH8oeysOd0z+hQzHgeLncYy68EhFKny86Hw2E6sdByZE1tJaujHen2Bs1/VpEP1Is alJnPZKB/qmNUW9kLphWthUjbjLYY/rLGQJpVAiTxAo2Nh83d/dKTybEgPgSRoy8nmmY9n/XgtmZS Oeu6eYdpxsmkaEQFJodci1+Y/v3pSjWn2fiwhnPoHa3Y5PPonkp3Y8PTUlvYteP4LS7Gm4/Sk22N6 4JDuMWkFqH9Wi+TiGSsReMvBrhrP28P37g8pM9fipxfbLSiAUfOb+/S2CxK0j1m+hdMZEX+6HrSso OasF3H0iW/oOX3ATTZVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnxh-006B36-Th; Mon, 14 Mar 2022 16:54:26 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnll-0066Jr-2h for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:42:09 +0000 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 8EE32614B0; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22316C36B0C; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=rh8izbyUs0LVVLbnTQd1n2+7Cp3WpK+wYz//UpHm9ig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Eq/vqDcfxbg07/cyT/KlRTzilSvJW1efry+nrXLdt4JmU7aNvBTo5hU/H3qFKPSyE 0jpnKeteT/zCnr4fnK+I8ehIb7CUdWGfoixG/W9Qb2DhzwP4DVA0LadletsXCbAIl2 XvY9e/EyPVE2Pj/t5T2G0o0HkOt6KsAmyrpsm1lAzLQIPErvw0P/bxkbXHjTnJl/8V XteXN279HdjNWb0D7mLQ7m3z/EttmC7Fh79id3VUDVGoyZDiH/PvFh0Kt3W3KhGV9Q DiNHs5CevcqZzc04AdxGd/tyMYdhNpXVkzomzvFNCgIuZYRw4r1JhpSm8b84qWk2KS Rzd8vAEsVBuhg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wzI-SP; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: 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 , Rui Miguel Silva , 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 v2 49/67] media: platform: rename exynos4-is/ to samsung/exynos4-is/ Date: Mon, 14 Mar 2022 17:34:44 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_094205_503207_C656C1DA X-CRM114-Status: GOOD ( 12.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.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 c9333d46047e..13dd4693b898 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 13d8f3e59116..3d0f431c167d 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -76,7 +76,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 ce9909534218..6ef541bdb225 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -16,7 +16,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 16:34:45 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: 12780514 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2ABC8C433F5 for ; Mon, 14 Mar 2022 17:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PMa86hrlaL1t0AFsIH51cuK2BuyknsT80n8QwjR8ocA=; b=43dgtdIy14zIfS 4bmLUfA7hC8iGIWjKE9MRpGAmcZq2kENSpMAFI458VQQfPsHUNOoqy35PSOexTbDO3MfxYdaX7mUj faoMxg+seD1OAHM9wAF0aPu/lbCtwrDPv9z10fNAnWi+pRGtZfDKLWkAI1wTSRX71qChAOrs7cPS9 dJM5r4Eo/4ISsbq0DCGMf8oVv13ADf+Vnj5D1ZMNh6PAITdbHiBsoEZkpY75qQmar545N5wmiglGh MjiZTwlOdtFcYxePZQW9psAgf0WJnE/9MRf2JnjvDFE8UeOJIKvZHqczZHxyaKkDkB3g/2vLRv2wX Y5gaLzHeSFrxte7LWCsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo4W-006Dno-G6; Mon, 14 Mar 2022 17:01:30 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo1a-006Cfr-Fu for linux-arm-kernel@bombadil.infradead.org; Mon, 14 Mar 2022 16:58:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=dPkqTDg/yOBtkMG0FpvuPkf177OlCh+iB3DDnNcxWBA=; b=anSzNuY4nNyu6eDRCEk2SB7Q/F fH6XH/aeGivJHEN4SmPNHDX3k1FltCT6VP0jna4k77dhcpKbCb8KVqLRsYLJmIUu18YQFjuU9o/Ms hvWG+1VaICavDYp3X+jb3GmA7cAx8dn3gh9X908z85JeJ2KvruEzbb3zlwvDn0G39luI+mC1DQCs1 KTcQnyVSYbGpR0BXj/2IC0rgDKDfsIAY5pe3ukkg4krH4Y+wlia0rUesJMWjbRjmx5Ed9mgC690Gq qoPHuRuWXkpccpOfVDlnuusd/S/VSUIHLXotCQ2BXf6chI2+ZCsHs6Ff9AVNvk0sY5ySC48pG4vTr NpHch1+w==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfF-004DRj-O7 for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:26 +0000 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 3E818614A4; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12876C36B08; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=0ZSwqbQK4ePZKheqhZHLog2xX0lLdzzxaB/EnIUMw8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hSZU1eKGqVgpP/e5GdCSqDXAhb9zMBVMT9PFR6F83MaAfQhCtTkyzRUAsztBECsHd DnRgrXdX9mBlbuNPBbZ42gHSehJVFkmk9jJTTyd4hf2fmEZmbzJzrnpxZx2dJyqN0d x/KltiOClRzMWq/q46vYgtDxOUC/REJ/IQ2IZ+jRWvrGoLEIfroaESEeiePPpQfsGF mhmd/ZMMOXA/r88DRywT+8dvVGXj6cHb0Se9/xkYtRm6iMJ2Q971xuE0g/3AXgRbYD +MaV75QRt9GS0jj2OEGQn9gdYD8X7Ew9CZFKF5+sfNGpGR9KuJQ+hF5YMp7SWIu+uc HZ13btulBHDiA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf0-001wzM-UG; Mon, 14 Mar 2022 17:35:06 +0100 From: Mauro Carvalho Chehab To: 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 v2 50/67] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/ Date: Mon, 14 Mar 2022 17:34:45 +0100 Message-Id: <602ebbef489f54515b2f25d4fb58c5fb00c78f5e.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163522_016880_98523336 X-CRM114-Status: GOOD ( 11.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.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 3d0f431c167d..0a05ef7304c0 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -75,7 +75,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 6ef541bdb225..996ec99be08f 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -15,7 +15,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 16:34:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12780493 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B7B4BC433EF for ; Mon, 14 Mar 2022 16:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m61UVdfU11/5cyRSXRGFZ6DupwRF8DLOg7HA0SGR+NU=; b=eT++3Z3whviPjQ hwoWMqZPYupfY3i6Ks/oQrGotsqE3/cNY9+eSPo9zi8g/gqV0iuJodXhocc/+6dkqtVlTA6z32sSe UOYgqc8gvZ0xMatQO47Zc8Wp7TMsKi34ISAE6SrVodzMlFNMSjUuByc+/0ggEL+N3Qnl4T+XnCttG E5CGgFbC11bMA6dOHEXMmD0jDzTVVw4P4Db+AwR3N+gOEtWIL4Kd6bxLNXG9ZgkYKFdaMOUJJUGfn sOWLADUPl9Lh2iw1q+4HV0XziqdO5hf9jpGICLMIHcc4D01UxDBSRiPu/VvkV1TzKvPxaJxrLgtnf ijDrBF/IfXC3TUn1f6Tg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnnN-0066tn-Qs; Mon, 14 Mar 2022 16:43:47 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf9-0063GZ-PA for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:21 +0000 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 72F2EB80EB3; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A283C36B0E; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=SpPr2lerPnw32f/oo2meeT4LKxL8ie8JCciAY4xJDAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j/LnPyFxtDntOYigyp1UIE8sHpu6PIacEmKyi8vM6GSPqRpv6i9kEqv9XZ57VMWOv SJmlmm9lYzaWQZ6aSL8v+mmnA/gcJkqiOwqd95HeT40Tdt+SZi3TnrWkFAd1VGAxhI CHNIBvvYx3tjXnnjO117QKEewDfcu6UTv6mG3xHu7PKVU32tSXKjVvic4dFtPQATzA EN5uZsZvzlHRcqbzv4wVozv/oGMdpgzknQ1g73TyEjD8jfTasZEdG87YFlAidR5tmX HAPQs0TsSZB82c2c8d1vsFIEyCmq9CGXHoEbQdiO3tgovMLZiaadlagff77gB5VjtW By9ISrFnCY8Aw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf1-001wzU-0h; Mon, 14 Mar 2022 17:35:07 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , =?utf-8?q?=C5=81uk?= =?utf-8?q?asz_Stelmach?= , Cai Huoqing , Dillon Min , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Ming Qian , Sakari Ailus , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 52/67] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/ Date: Mon, 14 Mar 2022 17:34:47 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_093516_157955_D3F4FF72 X-CRM114-Status: GOOD ( 12.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename s5p-g2d/ to samsung/s5p-g2d/. Signed-off-by: Mauro Carvalho Chehab Acked-by: Łukasz Stelmach --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => samsung}/s5p-g2d/Kconfig | 0 drivers/media/platform/{ => samsung}/s5p-g2d/Makefile | 0 drivers/media/platform/{ => samsung}/s5p-g2d/g2d-hw.c | 0 drivers/media/platform/{ => samsung}/s5p-g2d/g2d-regs.h | 0 drivers/media/platform/{ => samsung}/s5p-g2d/g2d.c | 0 drivers/media/platform/{ => samsung}/s5p-g2d/g2d.h | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => samsung}/s5p-g2d/Kconfig (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/Makefile (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d-hw.c (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d-regs.h (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d.c (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 80f2a0eea3f7..4b03db9ee31e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2616,7 +2616,7 @@ M: Łukasz Stelmach L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-g2d/ +F: drivers/media/platform/samsung/s5p-g2d/ ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT M: Marek Szyprowski diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index aed4394ddd05..8dd178e1a359 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-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/samsung/s5p-g2d/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 cb5e6d1df248..aa822365d8d0 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-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 += samsung/s5p-g2d/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/s5p-g2d/Kconfig b/drivers/media/platform/samsung/s5p-g2d/Kconfig similarity index 100% rename from drivers/media/platform/s5p-g2d/Kconfig rename to drivers/media/platform/samsung/s5p-g2d/Kconfig diff --git a/drivers/media/platform/s5p-g2d/Makefile b/drivers/media/platform/samsung/s5p-g2d/Makefile similarity index 100% rename from drivers/media/platform/s5p-g2d/Makefile rename to drivers/media/platform/samsung/s5p-g2d/Makefile diff --git a/drivers/media/platform/s5p-g2d/g2d-hw.c b/drivers/media/platform/samsung/s5p-g2d/g2d-hw.c similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d-hw.c rename to drivers/media/platform/samsung/s5p-g2d/g2d-hw.c diff --git a/drivers/media/platform/s5p-g2d/g2d-regs.h b/drivers/media/platform/samsung/s5p-g2d/g2d-regs.h similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d-regs.h rename to drivers/media/platform/samsung/s5p-g2d/g2d-regs.h diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/samsung/s5p-g2d/g2d.c similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d.c rename to drivers/media/platform/samsung/s5p-g2d/g2d.c diff --git a/drivers/media/platform/s5p-g2d/g2d.h b/drivers/media/platform/samsung/s5p-g2d/g2d.h similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d.h rename to drivers/media/platform/samsung/s5p-g2d/g2d.h From patchwork Mon Mar 14 16:34:48 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: 12780508 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DD1C3C433F5 for ; Mon, 14 Mar 2022 16:55:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OqmirT/9fn6fCgM5KHClQ+EdA3kbf20E7kqlwU5O47A=; b=kQN8Y6T8+MLWPB /VCfnKY8zMlHn5J5aOkDW5QC6+t0yCzXqJ2O/bNoCcrwc/tHb/XjaawAiXNYmrX+lHVtVi9mJ9ajT oeclvadKk7fRjn+LxVixeQzs+qBooRCUWwVVf1Hp71u0iWoiL75C3si9W868IpkMo3kFNreQhSiI+ dzoBWVgDTMLnZ+2RC1DZ/8e8wJJuxq9EJu9a0gOFu8s3DQfevj+o5Anv91iE4qidMvIea7a2D/oIj I8IvlgDWE80+gVI4baJUvjjTGm7UCk3o2pbgy79Tby9Gw+O8mf2JKLZ2qLd8nXxmjTRDDRt6dHclL oa6T3XTVxa5QXKm0KlkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnwx-006AkW-FK; Mon, 14 Mar 2022 16:53:39 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnll-0066Jq-2v for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:42:08 +0000 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 717BC613DC; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49363C340F6; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=cT/vXjenoBPKI/Hl1lNbu660CQn8eXNAAX/gaT9yC74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rHi9+mkgDAuaWVinfOr+4m5XVpkyvxoH705k6fsi66/AkAKSo+ZsfTR+xQ+zLQO8K 74VEfdi7VZR+FWa30hd5JX/cI+uuvWdxkDFQIq+qHy8kiuhLfYZj4IPjbBADk09K2Q m20sucw27q/KCk2a8eWrG3DKHQVPReRgoh7mtruMY0xz4gAs9eTzhl+z5ykWYmkmCq bzhVn+/fRz1vH8m7B4ocP6awJLywC/5i4PjGNDir+xrzt8wDk8dBv9txIqBPdm9p7q 9ZsA7GMwtFaE8M/tpWkkqY4m5MfsNhL5SM/UUjxKjbHgUdTMfU8yMnLSpp+U2z0HNH ATZem0Z18WA9g== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf1-001wzY-2L; Mon, 14 Mar 2022 17:35:07 +0100 From: Mauro Carvalho Chehab To: 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 v2 53/67] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/ Date: Mon, 14 Mar 2022 17:34:48 +0100 Message-Id: <4242d32300816e24c5990245b2950a5f058d61ab.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_094205_401568_3B249C2B X-CRM114-Status: GOOD ( 16.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.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 4b03db9ee31e..e01013c68fc1 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 8dd178e1a359..df67690c8f3a 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 aa822365d8d0..9c6c272797cd 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 * From patchwork Mon Mar 14 16:34:49 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: 12780499 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AF35EC433F5 for ; Mon, 14 Mar 2022 16:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DbKP7nsJ6qqy2aGzqlqdSP1xrv76BBe9911KxcjxuHY=; b=p1uKIePFOPdI/s b3JMeratx35iwvG9jWVSCqvkwqWnKGHkVo7KQbhp76knrFoRJF1WQ+rO3Y5sLcBPKrdvkLBh596Qa X0T83k1tFPUYVaW9ju4IsQcWwh0z/L+wCNsg/rlUmY3fHS3QwtOHCoP8rpHWQdrrpO3AS8wCo/3oB JlUCJB4M420uVh5xZUWr7QlsWubdG6asJxNgkffMgMzZC+Ythw9DESqNO2kLWTeyw66ur2gZ0SeDr gh9SpyQ/JTxBVvj2IrGGo8uDsLI2yzCJoxicGj9W9mHN8VEtcQfEpv2XRtFOFeo6X42/XhkdbB4jO yWYC8b2NRpKXU+BmBQCg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnrZ-0068Tc-09; Mon, 14 Mar 2022 16:48:07 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfE-0063GW-GJ for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:29 +0000 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 B1106614B7; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C4F5C36B0F; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=ceLmTV6C4Rx7NMsdzl0dlpMi5A4GYx3UEEq1drjvwlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ajefZQ4v0xDiAgTdzv3WCLapcsq8oyAU1dgPbX9OqP0Zv4+mVykDZuldA5ehRyXhd lojt7Ov2aA9gEVaKrdK8usjJNYl9jMfKEapSC/OyYkmbHCTjR8HhDLH7+l1iJWQ3qL zjlmi8T5AimSvsAbxnJYykYN3N58hORlNf65zqT5Lg9GepeIu4IeEGNzSK83ugxMcn h5vKnHJBBgOfhC4gouGrosC803xvv004GLOym8vxsLgEhC8Sy2pvC0ixkUhj6yrTsj yaVFhVSQGKD1On5ELsoPt0RReDvORThc3OhbSe1Yrkmg6ivM+25Tpj1JQLixHlfvSY t1edT5uY2aSBg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf1-001wzj-52; Mon, 14 Mar 2022 17:35:07 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andrzej Hajda , Cai Huoqing , Christophe JAILLET , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Herman , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Marek Szyprowski , Maxime Jourdan , Ming Qian , Nadezda Lutovinova , Paul Kocialkowski , Stanimir Varbanov , Sylwester Nawrocki , Tuo Li , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 54/67] media: platform: rename s5p-mfc/ to samsung/s5p-mfc/ Date: Mon, 14 Mar 2022 17:34:49 +0100 Message-Id: <281a05b760fc370df7b6a55ce3821ff779cf60a7.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_093521_569114_64970CDE X-CRM114-Status: GOOD ( 12.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename s5p-mfc/ to samsung/s5p-mfc/. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/Kconfig | 0 drivers/media/platform/{ => samsung}/s5p-mfc/Makefile | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v10.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v6.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v7.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v8.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc.c | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_common.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_debug.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.c | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_iommu.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.c | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.h | 2 +- 36 files changed, 22 insertions(+), 22 deletions(-) rename drivers/media/platform/{ => samsung}/s5p-mfc/Kconfig (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/Makefile (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v10.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v6.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v7.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v8.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc.c (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.c (89%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.h (92%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.c (98%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.h (82%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.c (98%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.h (82%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_common.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.c (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.h (92%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_debug.h (95%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.c (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.h (90%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.c (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.h (90%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.c (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_iommu.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.c (98%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.h (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.c (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.c (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.h (96%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.c (97%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.h (87%) diff --git a/MAINTAINERS b/MAINTAINERS index e01013c68fc1..a0cfe84b8192 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2641,7 +2641,7 @@ M: Andrzej Hajda L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-mfc/ +F: drivers/media/platform/samsung/s5p-mfc/ ARM/SHMOBILE ARM ARCHITECTURE M: Geert Uytterhoeven diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index df67690c8f3a..6b05afa218b3 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-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/samsung/s5p-mfc/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 9c6c272797cd..97aa99d8fac8 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-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 += samsung/s5p-mfc/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/s5p-mfc/Kconfig b/drivers/media/platform/samsung/s5p-mfc/Kconfig similarity index 100% rename from drivers/media/platform/s5p-mfc/Kconfig rename to drivers/media/platform/samsung/s5p-mfc/Kconfig diff --git a/drivers/media/platform/s5p-mfc/Makefile b/drivers/media/platform/samsung/s5p-mfc/Makefile similarity index 100% rename from drivers/media/platform/s5p-mfc/Makefile rename to drivers/media/platform/samsung/s5p-mfc/Makefile diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v10.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v6.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v7.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v7.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v8.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v8.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c similarity index 89% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c index 0e88c28f4ad3..774c573dc075 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c * * Copyright (C) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h similarity index 92% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h index ed4e32a12552..945d12fdceb7 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h * * Copyright (C) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c index 1ea4eda9c8e0..327e54e70611 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h similarity index 82% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h index 917854bffe9f..6eafa514aebc 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c index 1f42130cc865..f8588e52dfc8 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c * * Copyright (c) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h similarity index 82% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h index c19884ea2bfc..9dc44460cc38 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_common.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c index da138c314963..72d70984e99a 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h similarity index 92% rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h index 7f32ef8a6b61..653ba5f3d048 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h similarity index 95% rename from drivers/media/platform/s5p-mfc/s5p_mfc_debug.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h index 752bbe4fe48e..bba5dad6dbff 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_debug.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * This file contains debug macros diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c index c0798811755c..4b89df8bfd18 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h similarity index 90% rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h index 0e9a0e3bbbe7..0c52ab46cff7 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c index 1fad99edb091..a8877d805b29 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c * * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h similarity index 90% rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h index cacd1ca43e19..3f1b1a037a4f 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c index bb65671eea91..673962301173 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr.c + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c * * Samsung MFC (Multi Function Codec - FIMV) driver * This file contains hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h index 1c5d2d4c0543..b9831275f3ab 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * Contains declarations of hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c index a1453053e31a..8227004f6746 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c * * Samsung MFC (Multi Function Codec - FIMV) driver * This file contains hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h similarity index 96% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h index 8ca514bf5e37..e4dd03c5454c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * Contains declarations of hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c similarity index 97% rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c index 88b7d33c9197..72a901e99450 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h similarity index 87% rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h index 3d26443189a2..4159d2364e87 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ From patchwork Mon Mar 14 16:34:50 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: 12780492 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D0FFCC433EF for ; Mon, 14 Mar 2022 16:44:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uZCQTvCg0jYqTUuOA54Mt7qnQgFMr2mJ49wg4I0iEls=; b=rtvJnnhD9C922O eI0YbfcV9QbAT2OFpFiCqE6s4q9BT1RE6UN1wr6Wlt6aR6oZo3JtF0oFnzV2VVrhtTMDQxA5F/Oik nU3kQgX9uoryMREzaRislSgshOWSVD3ofYxvFrzru2HjSirk4r0AEd1teV6x0Xj38lO9skneRLnGz NIb/0Oh0wogI2JDDO6l+XsPB75j8mNJV9ODartnr3j/BSEEjSxe2BJJpt55jPotdoNiNPVifLIalf uIDLnRRbpYcZ3yeF0SMP1UkZhJe1HtSqDAPdyX5gNf31GD/tCaXv0OakbOh7AvTMHDE33enFYfHe3 E4RE9kpzbOepCkdhg1LA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnmM-0066Xl-Gy; Mon, 14 Mar 2022 16:42:43 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf9-0063GY-Di for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:20 +0000 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 91220B80EB4; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70248C36B16; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=VjwJOKOs8oHPyYCWSWn1u0Ow97//hnvsn2xXS8eZAP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tiFFmvxz8PEDznKO6aU6n8vZpRdZfe23nA/DXG83Q+AN6LI8jKepHAnRrZ/6p95vp TjMxJ+dlAaKunAyAwBdNaSmrsawP/jWa2VnH6oYf1ulZW/mRsQFOiDB3h4I+N/jP+M YdmA59WAiEa7Jdn4vj/25kmWb6raMBbOR2JtbQDZMBNL6V7vGOlePINXFd33WgBXqv IH2hIY7mIdZ6iGpaMvsb2S8KjRXT6LHwPZa1CZnwuddnX/k6oamrTek5chco6CYJ/9 J56swggJoRH9AZcF/xfrDl4/x63NGb821hz3KOFTM+4mmxyFmXwM2LOOqnriA8SlfD sa6kMlvkStJSQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf1-001x08-7q; Mon, 14 Mar 2022 17:35:07 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Alain Volmat , Alexandre Torgue , Dillon Min , Dmitriy Ulitin , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Hugues Fruchet , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Maxime Coquelin , Ming Qian , Sakari Ailus , Tomi Valkeinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH v2 55/67] media: platform: rename stm32/ to stm/stm32/ Date: Mon, 14 Mar 2022 17:34:50 +0100 Message-Id: <16d08dbabfaec4986a551efcb0dd0f07da256507.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_093515_800176_166D1536 X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename stm32/ to stm/stm32/. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => stm}/stm32/Kconfig | 0 drivers/media/platform/{ => stm}/stm32/Makefile | 0 drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-hw.c | 0 drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-regs.h | 0 drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.c | 0 drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.h | 0 drivers/media/platform/{ => stm}/stm32/stm32-dcmi.c | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => stm}/stm32/Kconfig (100%) rename drivers/media/platform/{ => stm}/stm32/Makefile (100%) rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-hw.c (100%) rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-regs.h (100%) rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.c (100%) rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.h (100%) rename drivers/media/platform/{ => stm}/stm32/stm32-dcmi.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index a0cfe84b8192..4cf03d253bc8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12046,7 +12046,7 @@ L: linux-media@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml -F: drivers/media/platform/stm32/stm32-dcmi.c +F: drivers/media/platform/stm/stm32/stm32-dcmi.c MEDIA INPUT INFRASTRUCTURE (V4L/DVB) M: Mauro Carvalho Chehab diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 6b05afa218b3..c308de1a42a4 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig" source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" source "drivers/media/platform/samsung/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" -source "drivers/media/platform/stm32/Kconfig" +source "drivers/media/platform/stm/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 97aa99d8fac8..7f077c9a416d 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -40,7 +40,7 @@ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ obj-y += sti/hva/ -obj-y += stm32/ +obj-y += stm/stm32/ obj-y += ti-vpe/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/stm/stm32/Kconfig similarity index 100% rename from drivers/media/platform/stm32/Kconfig rename to drivers/media/platform/stm/stm32/Kconfig diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/stm/stm32/Makefile similarity index 100% rename from drivers/media/platform/stm32/Makefile rename to drivers/media/platform/stm/stm32/Makefile diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/stm/stm32/dma2d/dma2d-hw.c similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c rename to drivers/media/platform/stm/stm32/dma2d/dma2d-hw.c diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/stm/stm32/dma2d/dma2d-regs.h similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h rename to drivers/media/platform/stm/stm32/dma2d/dma2d-regs.h diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/stm/stm32/dma2d/dma2d.c similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d.c rename to drivers/media/platform/stm/stm32/dma2d/dma2d.c diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/stm/stm32/dma2d/dma2d.h similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d.h rename to drivers/media/platform/stm/stm32/dma2d/dma2d.h diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm/stm32/stm32-dcmi.c similarity index 100% rename from drivers/media/platform/stm32/stm32-dcmi.c rename to drivers/media/platform/stm/stm32/stm32-dcmi.c From patchwork Mon Mar 14 16:34:51 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: 12780524 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7E4AAC433F5 for ; Mon, 14 Mar 2022 17:05:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yVSUY3SjPp0lG7CcvqhAeO77jEU5/2hJDuOZHMEMlac=; b=SxPGg6dSg593xs L0bueUW41lFkWj/Kv9wmBSd07KzPgP8vb9DqSzjJZnJnhwqdeyHSiLQY6eXTRiY/qzqDwngaYXqWv scFinpk63F39TXlPiJgp239R6i5MuDHmswsgoxnphJ2JrnBdivbbiWGhQd3PBf2ziGdIwaeLLlDxz 1rWABSJrDfjlHAUgDdlZ1ovzNt7Icyo7xgrFbLO4l63NGx0N1Fu8Rlrgwkeva7uANNC7DgUmN6+be g8lkRaJLhpRBtMnmSDu8oYDIVZvd+qc6SPPtAlwJworKyLmpGnkJEWGO7bYeaf+YYuEZgH/0BrN6f iA81KF9kKKB5uG94B1Uw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo74-006Erv-TQ; Mon, 14 Mar 2022 17:04:07 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo1d-006Cfr-KJ for linux-arm-kernel@bombadil.infradead.org; Mon, 14 Mar 2022 16:58:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=wqPow/8TTKQnsMINyNL+NYYXwFwEUoHCzq8oLdOJWP8=; b=Li9luAeIJ9rOUSOuRwlOw3gzAU 9Oq2f6/uu6dpr++tLJPGrzpxbN/1RQprLAYH8PN1Rh36lHJNbb1aNbkW+yFNcdTG4TGBxX/WouEsp RJWIoozlSbT3DHg7hpFs+J31tp8zfyC9G3CVeWmwaRvrsPhaH3tGv3AlxkEURailsd1H8c2w5ItzE OcI0dbaZIQ4e+l16ImVE7/+zmoC6QksM6NTdUQQnuUC7lw7KDgeOoEXBmc0ZNJqJHCmhB9bmm+3iI XPB0ofr/xlFfV4v7XSXdIYdwE4qXlpfiMO72+eENQJCwSW8BpJQ/ABlsEH3174wCaVBX5Yqd+3YlW WDlIG/Pg==; Received: from ams.source.kernel.org ([145.40.68.75]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfC-004DP0-9X for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 16:35:22 +0000 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 E916CB80EBF; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BDB1C36B19; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275709; bh=yFeoDdAXNpG8eqAcM9UKLZWnOV9MaJroObtIMCoZYG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m/fi0cfYaKtBMr3aeSFDZkhH+NBVO135+RSKG15o9rMzZs0bKEkXniaXsat0KzO4Y k0uYZL16ii2D0EL8XpfdXl/KqMo0RdYq/JLZZiYd+tvRdVLu01no9DIGkJDhuOCxG3 K844twOnwMeNUM0ludxLA/dV2p2DFm1zTDVLOGVlv34Nj9n4oJ4Ph++8RE9olngxWJ 5/TjnGbeiDyEHAEUO8EP4zUBfdTGeWj71iucpVtqmvBUSNlxXgnPOua393XDPDL028 N3A9F0O3mR4D6gkKDsFTjvVyPWvZ5ID5yQL1x890h60lP8z7f0RAop2UIyu8vR5e4r FHaBuHrUSyGhg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf1-001x0f-9c; Mon, 14 Mar 2022 17:35:07 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Alexandre Torgue , Cai Huoqing , Colin Ian King , Dan Carpenter , Dinghao Liu , Dmitry Osipenko , Dongliang Mu , Eugen Hristev , Evgeny Novikov , Fabien Dessenne , Hans Verkuil , Hugues Fruchet , Jacopo Mondi , Jean-Christophe Trotin , Jernej Skrabec , Jiapeng Chong , Jonathan Cameron , Lad Prabhakar , Laurent Pinchart , Maxime Coquelin , Ming Qian , Patrice Chotard , Randy Dunlap , Robert Foss , Sakari Ailus , Sean Young , Xiaofeng Cao , Yang Yingliang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH v2 56/67] media: platform: rename sti/ to stm/sti/ Date: Mon, 14 Mar 2022 17:34:51 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163518_379531_7FB38B9A X-CRM114-Status: GOOD ( 14.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename sti/ to stm/sti/. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 8 ++++---- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 8 ++++---- drivers/media/platform/sti/Kconfig | 5 ----- drivers/media/platform/stm/sti/Kconfig | 5 +++++ drivers/media/platform/{ => stm}/sti/bdisp/Kconfig | 0 drivers/media/platform/{ => stm}/sti/bdisp/Makefile | 0 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-debug.c | 0 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-filter.h | 0 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-hw.c | 0 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-reg.h | 0 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-v4l2.c | 0 drivers/media/platform/{ => stm}/sti/bdisp/bdisp.h | 0 drivers/media/platform/{ => stm}/sti/c8sectpfe/Kconfig | 0 drivers/media/platform/{ => stm}/sti/c8sectpfe/Makefile | 0 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.c | 0 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.h | 0 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.c | 0 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.h | 0 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.c | 0 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.h | 0 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.c | 0 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.h | 0 drivers/media/platform/{ => stm}/sti/delta/Kconfig | 0 drivers/media/platform/{ => stm}/sti/delta/Makefile | 0 drivers/media/platform/{ => stm}/sti/delta/delta-cfg.h | 0 drivers/media/platform/{ => stm}/sti/delta/delta-debug.c | 0 drivers/media/platform/{ => stm}/sti/delta/delta-debug.h | 0 drivers/media/platform/{ => stm}/sti/delta/delta-ipc.c | 0 drivers/media/platform/{ => stm}/sti/delta/delta-ipc.h | 0 drivers/media/platform/{ => stm}/sti/delta/delta-mem.c | 0 drivers/media/platform/{ => stm}/sti/delta/delta-mem.h | 0 .../media/platform/{ => stm}/sti/delta/delta-mjpeg-dec.c | 0 .../media/platform/{ => stm}/sti/delta/delta-mjpeg-fw.h | 0 .../media/platform/{ => stm}/sti/delta/delta-mjpeg-hdr.c | 0 drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg.h | 0 drivers/media/platform/{ => stm}/sti/delta/delta-v4l2.c | 0 drivers/media/platform/{ => stm}/sti/delta/delta.h | 0 drivers/media/platform/{ => stm}/sti/hva/Kconfig | 0 drivers/media/platform/{ => stm}/sti/hva/Makefile | 0 drivers/media/platform/{ => stm}/sti/hva/hva-debugfs.c | 0 drivers/media/platform/{ => stm}/sti/hva/hva-h264.c | 0 drivers/media/platform/{ => stm}/sti/hva/hva-hw.c | 0 drivers/media/platform/{ => stm}/sti/hva/hva-hw.h | 0 drivers/media/platform/{ => stm}/sti/hva/hva-mem.c | 0 drivers/media/platform/{ => stm}/sti/hva/hva-mem.h | 0 drivers/media/platform/{ => stm}/sti/hva/hva-v4l2.c | 0 drivers/media/platform/{ => stm}/sti/hva/hva.h | 0 48 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 drivers/media/platform/sti/Kconfig create mode 100644 drivers/media/platform/stm/sti/Kconfig rename drivers/media/platform/{ => stm}/sti/bdisp/Kconfig (100%) rename drivers/media/platform/{ => stm}/sti/bdisp/Makefile (100%) rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-debug.c (100%) rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-filter.h (100%) rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-hw.c (100%) rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-reg.h (100%) rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-v4l2.c (100%) rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp.h (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/Kconfig (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/Makefile (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.c (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.h (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.c (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.h (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.c (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.h (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.c (100%) rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.h (100%) rename drivers/media/platform/{ => stm}/sti/delta/Kconfig (100%) rename drivers/media/platform/{ => stm}/sti/delta/Makefile (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-cfg.h (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-debug.c (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-debug.h (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-ipc.c (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-ipc.h (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-mem.c (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-mem.h (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-dec.c (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-fw.h (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-hdr.c (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg.h (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta-v4l2.c (100%) rename drivers/media/platform/{ => stm}/sti/delta/delta.h (100%) rename drivers/media/platform/{ => stm}/sti/hva/Kconfig (100%) rename drivers/media/platform/{ => stm}/sti/hva/Makefile (100%) rename drivers/media/platform/{ => stm}/sti/hva/hva-debugfs.c (100%) rename drivers/media/platform/{ => stm}/sti/hva/hva-h264.c (100%) rename drivers/media/platform/{ => stm}/sti/hva/hva-hw.c (100%) rename drivers/media/platform/{ => stm}/sti/hva/hva-hw.h (100%) rename drivers/media/platform/{ => stm}/sti/hva/hva-mem.c (100%) rename drivers/media/platform/{ => stm}/sti/hva/hva-mem.h (100%) rename drivers/media/platform/{ => stm}/sti/hva/hva-v4l2.c (100%) rename drivers/media/platform/{ => stm}/sti/hva/hva.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 4cf03d253bc8..6c1055c27c65 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2710,7 +2710,7 @@ F: drivers/clocksource/clksrc_st_lpc.c F: drivers/cpufreq/sti-cpufreq.c F: drivers/dma/st_fdma* F: drivers/i2c/busses/i2c-st.c -F: drivers/media/platform/sti/c8sectpfe/ +F: drivers/media/platform/stm/sti/c8sectpfe/ F: drivers/media/rc/st_rc.c F: drivers/mmc/host/sdhci-st.c F: drivers/phy/st/phy-miphy28lp.c @@ -3383,7 +3383,7 @@ L: linux-media@vger.kernel.org S: Supported W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git -F: drivers/media/platform/sti/bdisp +F: drivers/media/platform/stm/sti/bdisp BECKHOFF CX5020 ETHERCAT MASTER DRIVER M: Dariusz Marcinkiewicz @@ -5482,7 +5482,7 @@ L: linux-media@vger.kernel.org S: Supported W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git -F: drivers/media/platform/sti/delta +F: drivers/media/platform/stm/sti/delta DELTA AHE-50DC FAN CONTROL MODULE DRIVER M: Zev Weiss @@ -8870,7 +8870,7 @@ L: linux-media@vger.kernel.org S: Supported W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git -F: drivers/media/platform/sti/hva +F: drivers/media/platform/stm/sti/hva HWPOISON MEMORY FAILURE HANDLING M: Naoya Horiguchi diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index c308de1a42a4..2ad5fde02543 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -94,7 +94,7 @@ 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/samsung/s5p-mfc/Kconfig" -source "drivers/media/platform/sti/Kconfig" +source "drivers/media/platform/stm/sti/Kconfig" source "drivers/media/platform/stm/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 7f077c9a416d..f20f1287c665 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -36,10 +36,10 @@ obj-y += samsung/s3c-camif/ obj-y += samsung/s5p-g2d/ obj-y += samsung/s5p-jpeg/ obj-y += samsung/s5p-mfc/ -obj-y += sti/bdisp/ -obj-y += sti/c8sectpfe/ -obj-y += sti/delta/ -obj-y += sti/hva/ +obj-y += stm/sti/bdisp/ +obj-y += stm/sti/c8sectpfe/ +obj-y += stm/sti/delta/ +obj-y += stm/sti/hva/ obj-y += stm/stm32/ obj-y += ti-vpe/ obj-y += via/ diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig deleted file mode 100644 index 9fb5e78a92cf..000000000000 --- a/drivers/media/platform/sti/Kconfig +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -source "drivers/media/platform/sti/bdisp/Kconfig" -source "drivers/media/platform/sti/c8sectpfe/Kconfig" -source "drivers/media/platform/sti/delta/Kconfig" -source "drivers/media/platform/sti/hva/Kconfig" diff --git a/drivers/media/platform/stm/sti/Kconfig b/drivers/media/platform/stm/sti/Kconfig new file mode 100644 index 000000000000..311930644281 --- /dev/null +++ b/drivers/media/platform/stm/sti/Kconfig @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/stm/sti/bdisp/Kconfig" +source "drivers/media/platform/stm/sti/c8sectpfe/Kconfig" +source "drivers/media/platform/stm/sti/delta/Kconfig" +source "drivers/media/platform/stm/sti/hva/Kconfig" diff --git a/drivers/media/platform/sti/bdisp/Kconfig b/drivers/media/platform/stm/sti/bdisp/Kconfig similarity index 100% rename from drivers/media/platform/sti/bdisp/Kconfig rename to drivers/media/platform/stm/sti/bdisp/Kconfig diff --git a/drivers/media/platform/sti/bdisp/Makefile b/drivers/media/platform/stm/sti/bdisp/Makefile similarity index 100% rename from drivers/media/platform/sti/bdisp/Makefile rename to drivers/media/platform/stm/sti/bdisp/Makefile diff --git a/drivers/media/platform/sti/bdisp/bdisp-debug.c b/drivers/media/platform/stm/sti/bdisp/bdisp-debug.c similarity index 100% rename from drivers/media/platform/sti/bdisp/bdisp-debug.c rename to drivers/media/platform/stm/sti/bdisp/bdisp-debug.c diff --git a/drivers/media/platform/sti/bdisp/bdisp-filter.h b/drivers/media/platform/stm/sti/bdisp/bdisp-filter.h similarity index 100% rename from drivers/media/platform/sti/bdisp/bdisp-filter.h rename to drivers/media/platform/stm/sti/bdisp/bdisp-filter.h diff --git a/drivers/media/platform/sti/bdisp/bdisp-hw.c b/drivers/media/platform/stm/sti/bdisp/bdisp-hw.c similarity index 100% rename from drivers/media/platform/sti/bdisp/bdisp-hw.c rename to drivers/media/platform/stm/sti/bdisp/bdisp-hw.c diff --git a/drivers/media/platform/sti/bdisp/bdisp-reg.h b/drivers/media/platform/stm/sti/bdisp/bdisp-reg.h similarity index 100% rename from drivers/media/platform/sti/bdisp/bdisp-reg.h rename to drivers/media/platform/stm/sti/bdisp/bdisp-reg.h diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/stm/sti/bdisp/bdisp-v4l2.c similarity index 100% rename from drivers/media/platform/sti/bdisp/bdisp-v4l2.c rename to drivers/media/platform/stm/sti/bdisp/bdisp-v4l2.c diff --git a/drivers/media/platform/sti/bdisp/bdisp.h b/drivers/media/platform/stm/sti/bdisp/bdisp.h similarity index 100% rename from drivers/media/platform/sti/bdisp/bdisp.h rename to drivers/media/platform/stm/sti/bdisp/bdisp.h diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/stm/sti/c8sectpfe/Kconfig similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/Kconfig rename to drivers/media/platform/stm/sti/c8sectpfe/Kconfig diff --git a/drivers/media/platform/sti/c8sectpfe/Makefile b/drivers/media/platform/stm/sti/c8sectpfe/Makefile similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/Makefile rename to drivers/media/platform/stm/sti/c8sectpfe/Makefile diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.c b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.c similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.c rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.c diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.h b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.h similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.h rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.h diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.c similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.c diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.h b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.h similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.h rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.h diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.c b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.c similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.c rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.c diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.h b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.h similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.h rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.h diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.c similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.c diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.h b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.h similarity index 100% rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.h rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.h diff --git a/drivers/media/platform/sti/delta/Kconfig b/drivers/media/platform/stm/sti/delta/Kconfig similarity index 100% rename from drivers/media/platform/sti/delta/Kconfig rename to drivers/media/platform/stm/sti/delta/Kconfig diff --git a/drivers/media/platform/sti/delta/Makefile b/drivers/media/platform/stm/sti/delta/Makefile similarity index 100% rename from drivers/media/platform/sti/delta/Makefile rename to drivers/media/platform/stm/sti/delta/Makefile diff --git a/drivers/media/platform/sti/delta/delta-cfg.h b/drivers/media/platform/stm/sti/delta/delta-cfg.h similarity index 100% rename from drivers/media/platform/sti/delta/delta-cfg.h rename to drivers/media/platform/stm/sti/delta/delta-cfg.h diff --git a/drivers/media/platform/sti/delta/delta-debug.c b/drivers/media/platform/stm/sti/delta/delta-debug.c similarity index 100% rename from drivers/media/platform/sti/delta/delta-debug.c rename to drivers/media/platform/stm/sti/delta/delta-debug.c diff --git a/drivers/media/platform/sti/delta/delta-debug.h b/drivers/media/platform/stm/sti/delta/delta-debug.h similarity index 100% rename from drivers/media/platform/sti/delta/delta-debug.h rename to drivers/media/platform/stm/sti/delta/delta-debug.h diff --git a/drivers/media/platform/sti/delta/delta-ipc.c b/drivers/media/platform/stm/sti/delta/delta-ipc.c similarity index 100% rename from drivers/media/platform/sti/delta/delta-ipc.c rename to drivers/media/platform/stm/sti/delta/delta-ipc.c diff --git a/drivers/media/platform/sti/delta/delta-ipc.h b/drivers/media/platform/stm/sti/delta/delta-ipc.h similarity index 100% rename from drivers/media/platform/sti/delta/delta-ipc.h rename to drivers/media/platform/stm/sti/delta/delta-ipc.h diff --git a/drivers/media/platform/sti/delta/delta-mem.c b/drivers/media/platform/stm/sti/delta/delta-mem.c similarity index 100% rename from drivers/media/platform/sti/delta/delta-mem.c rename to drivers/media/platform/stm/sti/delta/delta-mem.c diff --git a/drivers/media/platform/sti/delta/delta-mem.h b/drivers/media/platform/stm/sti/delta/delta-mem.h similarity index 100% rename from drivers/media/platform/sti/delta/delta-mem.h rename to drivers/media/platform/stm/sti/delta/delta-mem.h diff --git a/drivers/media/platform/sti/delta/delta-mjpeg-dec.c b/drivers/media/platform/stm/sti/delta/delta-mjpeg-dec.c similarity index 100% rename from drivers/media/platform/sti/delta/delta-mjpeg-dec.c rename to drivers/media/platform/stm/sti/delta/delta-mjpeg-dec.c diff --git a/drivers/media/platform/sti/delta/delta-mjpeg-fw.h b/drivers/media/platform/stm/sti/delta/delta-mjpeg-fw.h similarity index 100% rename from drivers/media/platform/sti/delta/delta-mjpeg-fw.h rename to drivers/media/platform/stm/sti/delta/delta-mjpeg-fw.h diff --git a/drivers/media/platform/sti/delta/delta-mjpeg-hdr.c b/drivers/media/platform/stm/sti/delta/delta-mjpeg-hdr.c similarity index 100% rename from drivers/media/platform/sti/delta/delta-mjpeg-hdr.c rename to drivers/media/platform/stm/sti/delta/delta-mjpeg-hdr.c diff --git a/drivers/media/platform/sti/delta/delta-mjpeg.h b/drivers/media/platform/stm/sti/delta/delta-mjpeg.h similarity index 100% rename from drivers/media/platform/sti/delta/delta-mjpeg.h rename to drivers/media/platform/stm/sti/delta/delta-mjpeg.h diff --git a/drivers/media/platform/sti/delta/delta-v4l2.c b/drivers/media/platform/stm/sti/delta/delta-v4l2.c similarity index 100% rename from drivers/media/platform/sti/delta/delta-v4l2.c rename to drivers/media/platform/stm/sti/delta/delta-v4l2.c diff --git a/drivers/media/platform/sti/delta/delta.h b/drivers/media/platform/stm/sti/delta/delta.h similarity index 100% rename from drivers/media/platform/sti/delta/delta.h rename to drivers/media/platform/stm/sti/delta/delta.h diff --git a/drivers/media/platform/sti/hva/Kconfig b/drivers/media/platform/stm/sti/hva/Kconfig similarity index 100% rename from drivers/media/platform/sti/hva/Kconfig rename to drivers/media/platform/stm/sti/hva/Kconfig diff --git a/drivers/media/platform/sti/hva/Makefile b/drivers/media/platform/stm/sti/hva/Makefile similarity index 100% rename from drivers/media/platform/sti/hva/Makefile rename to drivers/media/platform/stm/sti/hva/Makefile diff --git a/drivers/media/platform/sti/hva/hva-debugfs.c b/drivers/media/platform/stm/sti/hva/hva-debugfs.c similarity index 100% rename from drivers/media/platform/sti/hva/hva-debugfs.c rename to drivers/media/platform/stm/sti/hva/hva-debugfs.c diff --git a/drivers/media/platform/sti/hva/hva-h264.c b/drivers/media/platform/stm/sti/hva/hva-h264.c similarity index 100% rename from drivers/media/platform/sti/hva/hva-h264.c rename to drivers/media/platform/stm/sti/hva/hva-h264.c diff --git a/drivers/media/platform/sti/hva/hva-hw.c b/drivers/media/platform/stm/sti/hva/hva-hw.c similarity index 100% rename from drivers/media/platform/sti/hva/hva-hw.c rename to drivers/media/platform/stm/sti/hva/hva-hw.c diff --git a/drivers/media/platform/sti/hva/hva-hw.h b/drivers/media/platform/stm/sti/hva/hva-hw.h similarity index 100% rename from drivers/media/platform/sti/hva/hva-hw.h rename to drivers/media/platform/stm/sti/hva/hva-hw.h diff --git a/drivers/media/platform/sti/hva/hva-mem.c b/drivers/media/platform/stm/sti/hva/hva-mem.c similarity index 100% rename from drivers/media/platform/sti/hva/hva-mem.c rename to drivers/media/platform/stm/sti/hva/hva-mem.c diff --git a/drivers/media/platform/sti/hva/hva-mem.h b/drivers/media/platform/stm/sti/hva/hva-mem.h similarity index 100% rename from drivers/media/platform/sti/hva/hva-mem.h rename to drivers/media/platform/stm/sti/hva/hva-mem.h diff --git a/drivers/media/platform/sti/hva/hva-v4l2.c b/drivers/media/platform/stm/sti/hva/hva-v4l2.c similarity index 100% rename from drivers/media/platform/sti/hva/hva-v4l2.c rename to drivers/media/platform/stm/sti/hva/hva-v4l2.c diff --git a/drivers/media/platform/sti/hva/hva.h b/drivers/media/platform/stm/sti/hva/hva.h similarity index 100% rename from drivers/media/platform/sti/hva/hva.h rename to drivers/media/platform/stm/sti/hva/hva.h From patchwork Mon Mar 14 16:34:58 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: 12780554 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6EF92C433EF for ; Mon, 14 Mar 2022 17:14:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MzYFah+yW8DDUa75GKpHWeBXHtfW/ZE/sWBQKp6MPu0=; b=tyeDI2qOl0/SiZ AOhJbYppDoWOexFhbHek+er0mrEUn21AN0WG9DFXRapkeXon/k12XLr+siL7zRvFlZyDmVJtUIvPg g1TThBawUEwm0bOtl/xQqfIuzOZ5B3n2YAM6T+Te4UR5a6m6FMGJrmOzgJlscEwsBYm1yldyHikjR 4VvVdOhPuXWrjrg2f+tqoaE2pN6Gc7gJEr/YhbvxAChXxb5zbF0/cudj9mkNnOU1n0pG4c+Kw67u5 OL/ryXDnDjZP09vj/uzKRCv3d4wPpb5xtzYFRi7ay+nplsL8ykuuFafKv2qN6m00xksR8PL/ocGy9 ENAZWfEELb6lgWqxkapg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToFW-006IIt-7U; Mon, 14 Mar 2022 17:12:50 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToD4-006HQe-Ek; Mon, 14 Mar 2022 17:10:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=SJzH14hPp8QnuwupPVzPy0UEgaJz4lBBkUf0Pm1Rheo=; b=G2c1aXk+MJRffUhbs/4QEv7nEx HSjcR5XNT9cMRNP7MKq1b0eWooX9zyKvW0AOJZwH7DrXOqGahNO5K8+Pf3nd+Xy66S9dIHWL4plWc 4O7UljexvbcxAGFBuBNfTokbd9N4U6PBNKF+gS+udYu92GsiKTmIRrMsFgIeQ/BG/bmposwCaukGf JMBtyOxT9fq9gM5REsBNMNvpaA9d46RsH7mkt7YoZnlUm+d8pokm0ZZ7s3msbaEA6l0Z6n+y4aPs2 X9nzgMJk+JUyQ1LiuVozng63w+Oh9jFEwEqYUV6kCOucrdDjGHtdqf2DFpqpJHIqmW4dVrgdwqIp1 FUDwJ/0g==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfB-000uKF-9Q; Mon, 14 Mar 2022 16:35:24 +0000 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 0E49AB80EC4; Mon, 14 Mar 2022 16:35:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F099DC36AF3; Mon, 14 Mar 2022 16:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275710; bh=6J1DzTdLkt+wtXSOn8LeDPwVonbZUY5PijYr2Jghub0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BFhfASKbQ5Adc/Ua36MwdM8AQZphIR6W+Klt0QtRYncnRVPrahg+uIVqSqJEo0h8r 5WjnQ+TO2B/G/kp+F11CdfsRGR0pr0jx/5nuSOzRBhNpJAlld/vslHa1k19KX/PlOb lZcE1/UO4c5xAa0xFzIF9KaM8yAyqk+f3d/Zn1ipDT+qgkZ0GRMn+GWQDrXdZDpu/9 c2108w2hJIXtl0tTl95H3zXASEF8cF+SGpc25+ZFFRRQSbiI9PGDLJHgM/PiRNVdpX 8YZ+dti1GEgCFhVcIcEf1zw0SgK88ZPzCZ4Z+ssG1yVdjiQTxm4pehLzVzTFuNcI9d +TtaZegWIh9Tw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf1-001x4O-Mk; Mon, 14 Mar 2022 17:35:07 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Alexandre Torgue , Andy Gross , Bjorn Andersson , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Heiko Stuebner , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Maxime Coquelin , Ming Qian , Pratyush Yadav , Sakari Ailus , Shijie Qin , Tomi Valkeinen , Zhou Peng , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH v2 63/67] media: platform: Create vendor/{Makefile, Kconfig} files Date: Mon, 14 Mar 2022 17:34:58 +0100 Message-Id: <619701b36108067a84c606d7a2016cf8c3ec33b9.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163517_423915_5A46E098 X-CRM114-Status: GOOD ( 16.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Instead of placing multiple per-vendor entries at the platform/{Makefile,Kconfig}, create them at the per-vendor directories. 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 28 +++++------------------- drivers/media/platform/Makefile | 28 ++++++------------------ drivers/media/platform/amlogic/Kconfig | 2 ++ drivers/media/platform/amlogic/Makefile | 2 ++ drivers/media/platform/amphion/Kconfig | 3 +++ drivers/media/platform/mediatek/Kconfig | 5 +++++ drivers/media/platform/mediatek/Makefile | 5 +++++ drivers/media/platform/nvidia/Kconfig | 2 ++ drivers/media/platform/qcom/Makefile | 3 +++ drivers/media/platform/rockchip/Makefile | 3 +++ drivers/media/platform/samsung/Kconfig | 7 ++++++ drivers/media/platform/samsung/Makefile | 7 ++++++ drivers/media/platform/stm/Kconfig | 4 ++++ drivers/media/platform/stm/Makefile | 7 ++++++ drivers/media/platform/stm/sti/Makefile | 6 +++++ drivers/media/platform/ti/Kconfig | 5 +++++ drivers/media/platform/ti/Makefile | 6 ++++- 17 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 drivers/media/platform/amlogic/Kconfig create mode 100644 drivers/media/platform/amlogic/Makefile create mode 100644 drivers/media/platform/mediatek/Kconfig create mode 100644 drivers/media/platform/mediatek/Makefile create mode 100644 drivers/media/platform/nvidia/Kconfig create mode 100644 drivers/media/platform/qcom/Makefile create mode 100644 drivers/media/platform/rockchip/Makefile create mode 100644 drivers/media/platform/samsung/Kconfig create mode 100644 drivers/media/platform/samsung/Makefile create mode 100644 drivers/media/platform/stm/Kconfig create mode 100644 drivers/media/platform/stm/Makefile create mode 100644 drivers/media/platform/stm/sti/Makefile diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 43a654e87613..3a5211d8e59a 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -62,12 +62,9 @@ config VIDEO_MUX This driver provides support for N:1 video bus multiplexers. # Platform drivers - Please keep it alphabetically sorted - -# TODO: create per-manufacturer directories - source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/allwinner/Kconfig" -source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" +source "drivers/media/platform/amlogic/Kconfig" source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" @@ -75,28 +72,15 @@ source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" -source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" -source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" -source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" -source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" -source "drivers/media/platform/nvidia/tegra-vde/Kconfig" +source "drivers/media/platform/mediatek/Kconfig" +source "drivers/media/platform/nvidia/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/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/samsung/s5p-mfc/Kconfig" -source "drivers/media/platform/stm/sti/Kconfig" -source "drivers/media/platform/stm/stm32/Kconfig" -source "drivers/media/platform/ti-vpe/Kconfig" -source "drivers/media/platform/ti/am437x/Kconfig" -source "drivers/media/platform/ti/davinci/Kconfig" -source "drivers/media/platform/ti/omap/Kconfig" -source "drivers/media/platform/ti/omap3isp/Kconfig" +source "drivers/media/platform/samsung/Kconfig" +source "drivers/media/platform/stm/Kconfig" +source "drivers/media/platform/ti/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 2c5713ddac09..e5060cb891de 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,7 +7,7 @@ # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ obj-y += allwinner/ -obj-y += amlogic/meson-ge2d/ +obj-y += amlogic/ obj-y += amphion/ obj-y += aspeed/ obj-y += atmel/ @@ -15,28 +15,14 @@ obj-y += cadence/ obj-y += chips-media/ obj-y += intel/ obj-y += marvell/ -obj-y += mediatek/mtk-jpeg/ -obj-y += mediatek/mtk-mdp/ -obj-y += mediatek/mtk-vcodec/ -obj-y += mediatek/mtk-vpu/ -obj-y += nvidia/tegra-vde/ +obj-y += mediatek/ +obj-y += nvidia/ obj-y += nxp/ -obj-y += qcom/camss/ -obj-y += qcom/venus/ +obj-y += qcom/ obj-y += renesas/ -obj-y += rockchip/rga/ -obj-y += rockchip/rkisp1/ -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 += samsung/s5p-mfc/ -obj-y += stm/sti/bdisp/ -obj-y += stm/sti/c8sectpfe/ -obj-y += stm/sti/delta/ -obj-y += stm/sti/hva/ -obj-y += stm/stm32/ +obj-y += rockchip/ +obj-y += samsung/ +obj-y += stm/ obj-y += ti/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig new file mode 100644 index 000000000000..c67e00df6202 --- /dev/null +++ b/drivers/media/platform/amlogic/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" diff --git a/drivers/media/platform/amlogic/Makefile b/drivers/media/platform/amlogic/Makefile new file mode 100644 index 000000000000..d3cdb8fa4ddb --- /dev/null +++ b/drivers/media/platform/amlogic/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y += meson-ge2d/ diff --git a/drivers/media/platform/amphion/Kconfig b/drivers/media/platform/amphion/Kconfig index 13899649f766..e0e8098965bd 100644 --- a/drivers/media/platform/amphion/Kconfig +++ b/drivers/media/platform/amphion/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Amphion drivers" + config VIDEO_AMPHION_VPU tristate "Amphion VPU (Video Processing Unit) Codec IP" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig new file mode 100644 index 000000000000..6d74839df3d6 --- /dev/null +++ b/drivers/media/platform/mediatek/Kconfig @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" +source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" +source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" diff --git a/drivers/media/platform/mediatek/Makefile b/drivers/media/platform/mediatek/Makefile new file mode 100644 index 000000000000..403d5ecd2b10 --- /dev/null +++ b/drivers/media/platform/mediatek/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y += mtk-jpeg/ +obj-y += mtk-mdp/ +obj-y += mtk-vcodec/ +obj-y += mtk-vpu/ diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig new file mode 100644 index 000000000000..1162e272b5f9 --- /dev/null +++ b/drivers/media/platform/nvidia/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/nvidia/tegra-vde/Kconfig" diff --git a/drivers/media/platform/qcom/Makefile b/drivers/media/platform/qcom/Makefile new file mode 100644 index 000000000000..4f055c396e04 --- /dev/null +++ b/drivers/media/platform/qcom/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y += camss/ +obj-y += venus/ diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile new file mode 100644 index 000000000000..4f782b876ac9 --- /dev/null +++ b/drivers/media/platform/rockchip/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y += rga/ +obj-y += rkisp1/ diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig new file mode 100644 index 000000000000..94f30c1bca9b --- /dev/null +++ b/drivers/media/platform/samsung/Kconfig @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only +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/samsung/s5p-mfc/Kconfig" diff --git a/drivers/media/platform/samsung/Makefile b/drivers/media/platform/samsung/Makefile new file mode 100644 index 000000000000..21fea3330e4b --- /dev/null +++ b/drivers/media/platform/samsung/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y += exynos-gsc/ +obj-y += exynos4-is/ +obj-y += s3c-camif/ +obj-y += s5p-g2d/ +obj-y += s5p-jpeg/ +obj-y += s5p-mfc/ diff --git a/drivers/media/platform/stm/Kconfig b/drivers/media/platform/stm/Kconfig new file mode 100644 index 000000000000..27942626a630 --- /dev/null +++ b/drivers/media/platform/stm/Kconfig @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +source "drivers/media/platform/stm/sti/Kconfig" +source "drivers/media/platform/stm/stm32/Kconfig" diff --git a/drivers/media/platform/stm/Makefile b/drivers/media/platform/stm/Makefile new file mode 100644 index 000000000000..a1f75b2a8225 --- /dev/null +++ b/drivers/media/platform/stm/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-y += sti/bdisp/ +obj-y += sti/c8sectpfe/ +obj-y += sti/delta/ +obj-y += sti/hva/ +obj-y += stm32/ diff --git a/drivers/media/platform/stm/sti/Makefile b/drivers/media/platform/stm/sti/Makefile new file mode 100644 index 000000000000..f9ce8169b040 --- /dev/null +++ b/drivers/media/platform/stm/sti/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y += bdisp/ +obj-y += c8sectpfe/ +obj-y += delta/ +obj-y += hva/ +obj-y += stm32/ diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig index 82e285c2de64..e1ab56c3be1f 100644 --- a/drivers/media/platform/ti/Kconfig +++ b/drivers/media/platform/ti/Kconfig @@ -62,3 +62,8 @@ config VIDEO_TI_VPE_DEBUG depends on VIDEO_TI_VPE help Enable debug messages on VPE driver. + +source "drivers/media/platform/ti/am437x/Kconfig" +source "drivers/media/platform/ti/davinci/Kconfig" +source "drivers/media/platform/ti/omap/Kconfig" +source "drivers/media/platform/ti/omap3isp/Kconfig" diff --git a/drivers/media/platform/ti/Makefile b/drivers/media/platform/ti/Makefile index bbc737ccbbea..98c5fe5c40d6 100644 --- a/drivers/media/platform/ti/Makefile +++ b/drivers/media/platform/ti/Makefile @@ -1,3 +1,7 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only +obj-y += am437x/ obj-y += cal/ obj-y += vpe/ +obj-y += davinci/ +obj-y += omap/ +obj-y += omap3isp/ From patchwork Mon Mar 14 16:34:59 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: 12780525 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B6661C433F5 for ; Mon, 14 Mar 2022 17:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=ZZ73wtsTV6DNBukM7ZP+pcxr45DCMrdOgiOJEW6GNg4=; b=jKOc/RYa+Pj+dT +5m3zKrzdyFxlzZ5JhpzWXawr87C/etYes20391puhUGAiSgCcgNDwxDqhRedUQWXQwnbSUyrPhDR +zFPCtPjfoI1Ri70hVCj6PGDZzdRNRPz/1h2ZwC8GXT0jtb4PjTzSJyCiJ6qvaLbYi3ssPBw+rZPa 3c85sgLAmyceQS7nyj2926rEJUQM93yZaFL87iNm9tv/FJL7mF6t4UI8CJEoIlBSVwlg8CtMnP2wo M8u/Olr8ELX25uC4cnqDrLHiGgWuAzSerjIROTVwXgPrfIWmgZW6OaLWOPv+8QLiW3tfO/3GTf4xC YGocciQ4Sm3zZTxe11lA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo7w-006FGo-Oa; Mon, 14 Mar 2022 17:05:01 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTo1b-006Cfr-Sc; Mon, 14 Mar 2022 16:58:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=tyTITQTXCRG11vsJNkL6L8wS7cq174I1YX7L53Y1x5Y=; b=MpIVgd+2cRVKutUKbB2rfwtq1r 05BzyFYpBi2XerUCYuhLxgDaBzYdY814AQWcz4Sw3OdkX19hbmW0IGPpZrX+jsxI9IebCq0C8rScH gBHRbeFsn68u4/kBAT21UbiwZ+eK7RgKeQjMIqFl6YBP8wVnNXlqKlkpEZ3zHlUpUWvd/nQrqk++T S53bnIrKZ4ybJdX4g11eB+DAYBcNWhnNvz9akmkh90msvu6oOLpwt7gYR4RlqohReoIGW7EDWha3T Pvnxda8G54qdXUo56qCxRDHy+sZTS2GRQXiBeJvL5vywvDTlQ2qVVxJ4WaRMCei5WiaQKodAw/Azr zmgm1VBA==; Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnfC-004DQJ-Gq; Mon, 14 Mar 2022 16:35:24 +0000 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 0F5C2B80EC5; Mon, 14 Mar 2022 16:35:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08178C36B10; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275710; bh=8JpXjjyF24k0hF8LjOuHvMt2VTG3d3BfEFsLdEg6D6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S3OS2Ebm9WtiiKclLtao7kn7ub+rGbGD5uH7aEl1BXP4NyWTFMby0rUEKJ5ZqY3nJ Z0ZIJQE4TIjhobmt5LXe7oOe1OrJLAymsr/r0bwYKqZ8+r2Gyw8KxTfvCHKdIsflIQ Zwn4W0I2knPabgs5XDzRXoCalyhMYFbyldjsY55NXSsEe+V1vZZ2MYdIW2j1vEuO8K /YQZR53hADTKZsk2uI9SHnGK65TocUfv3gq2lZ9EE+2ELBAyR/t8+a+nLN0pG5rBKU hmnpsbPk9oYBV068MZRXFPNElNoNfxvd2Q51IQREZ/1vMURyJoO4lWcHNTM3cZaAaY EVY5rL/Ws11Og== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf1-001x4d-PI; Mon, 14 Mar 2022 17:35:07 +0100 From: Mauro Carvalho Chehab To: Subject: [PATCH v2 64/67] media: platform/*/Kconfig: make manufacturer menus more uniform Date: Mon, 14 Mar 2022 17:34:59 +0100 Message-Id: <4a598f62a03bd0e48f0be36cf32829291392cca8.1647274407.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163518_612864_AEDA9FA2 X-CRM114-Status: GOOD ( 16.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Heiko Stuebner , linux-aspeed@lists.ozlabs.org, Eddie James , Alexandre Torgue , Bjorn Andersson , Laurent Pinchart , linux-stm32@st-md-mailman.stormreply.com, Michael Tretter , openbmc@lists.ozlabs.org, Michal Simek , Jernej Skrabec , linux-rockchip@lists.infradead.org, Ludovic Desroches , Andy Gross , Joel Stanley , Philipp Zabel , linux-media@vger.kernel.org, Jacopo Mondi , Maxime Coquelin , linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, Hyun Kwon , Andrew Jeffery , Robert Foss , linux-kernel@vger.kernel.org, Pengutronix Kernel Team , Hans Verkuil , Eugen Hristev Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Do some adjustments at the per-vendor Kconfig, adding a comment at the beginning in order to identify the manufacturer, and adjust a few entries to make them look more uniform. Reviewed-by: Laurent Pinchart 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ drivers/media/platform/allegro-dvt/Kconfig | 3 +++ drivers/media/platform/amlogic/Kconfig | 3 +++ drivers/media/platform/aspeed/Kconfig | 3 +++ drivers/media/platform/atmel/Kconfig | 3 +++ drivers/media/platform/cadence/Kconfig | 13 +------------ drivers/media/platform/chips-media/Kconfig | 3 +++ drivers/media/platform/intel/Kconfig | 3 +++ drivers/media/platform/marvell/Kconfig | 3 +++ drivers/media/platform/mediatek/Kconfig | 3 +++ drivers/media/platform/nvidia/Kconfig | 3 +++ drivers/media/platform/nxp/Kconfig | 22 +++++----------------- drivers/media/platform/qcom/Kconfig | 2 ++ drivers/media/platform/renesas/Kconfig | 2 ++ drivers/media/platform/rockchip/Kconfig | 3 +++ drivers/media/platform/samsung/Kconfig | 3 +++ drivers/media/platform/stm/Kconfig | 2 ++ drivers/media/platform/via/Kconfig | 3 +++ drivers/media/platform/xilinx/Kconfig | 7 +++---- 18 files changed, 51 insertions(+), 33 deletions(-) diff --git a/drivers/media/platform/allegro-dvt/Kconfig b/drivers/media/platform/allegro-dvt/Kconfig index dd528e9d0958..674d234be5de 100644 --- a/drivers/media/platform/allegro-dvt/Kconfig +++ b/drivers/media/platform/allegro-dvt/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Allegro DVT drivers" + config VIDEO_ALLEGRO_DVT tristate "Allegro DVT Video IP Core" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig index c67e00df6202..c1376ec1fe23 100644 --- a/drivers/media/platform/amlogic/Kconfig +++ b/drivers/media/platform/amlogic/Kconfig @@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Amlogic drivers" + source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig index 5025e892844c..153e3e5381d5 100644 --- a/drivers/media/platform/aspeed/Kconfig +++ b/drivers/media/platform/aspeed/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Aspeed drivers" + config VIDEO_ASPEED tristate "Aspeed AST2400 and AST2500 Video Engine driver" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig index 5122290729ae..cef12629f4ef 100644 --- a/drivers/media/platform/atmel/Kconfig +++ b/drivers/media/platform/atmel/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Atmel drivers" + config VIDEO_ATMEL_ISC tristate "ATMEL Image Sensor Controller (ISC) support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/cadence/Kconfig index 79a7e9fb2575..3ae6f4e51eec 100644 --- a/drivers/media/platform/cadence/Kconfig +++ b/drivers/media/platform/cadence/Kconfig @@ -1,15 +1,6 @@ # 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. - Note that this option doesn't include new drivers in the kernel: - saying N will just cause Kconfig to skip all the questions about - Cadence media devices. - -if VIDEO_CADENCE +comment "Cadence drivers" config VIDEO_CADENCE_CSI2RX tristate "Cadence MIPI-CSI2 RX Controller" @@ -34,5 +25,3 @@ config VIDEO_CADENCE_CSI2TX To compile this driver as a module, choose M here: the module will be called cdns-csi2tx. - -endif diff --git a/drivers/media/platform/chips-media/Kconfig b/drivers/media/platform/chips-media/Kconfig index ae495fd7b25a..adf466a05699 100644 --- a/drivers/media/platform/chips-media/Kconfig +++ b/drivers/media/platform/chips-media/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Chips&Media drivers" + config VIDEO_CODA tristate "Chips&Media Coda multi-standard codec IP" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/intel/Kconfig index aeda421f7248..8a730d9bcf52 100644 --- a/drivers/media/platform/intel/Kconfig +++ b/drivers/media/platform/intel/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Intel drivers" + config VIDEO_PXA27x tristate "PXA27x Quick Capture Interface driver" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/marvell/Kconfig b/drivers/media/platform/marvell/Kconfig index bfe655b2cedd..626e0673f12c 100644 --- a/drivers/media/platform/marvell/Kconfig +++ b/drivers/media/platform/marvell/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Marvell drivers" + config VIDEO_CAFE_CCIC tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig index 6d74839df3d6..aa79626088ec 100644 --- a/drivers/media/platform/mediatek/Kconfig +++ b/drivers/media/platform/mediatek/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Mediatek drivers" + source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig index 1162e272b5f9..597402090680 100644 --- a/drivers/media/platform/nvidia/Kconfig +++ b/drivers/media/platform/nvidia/Kconfig @@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "NVidia drivers" + source "drivers/media/platform/nvidia/tegra-vde/Kconfig" diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig index df52d32ebe50..44a0d7c38936 100644 --- a/drivers/media/platform/nxp/Kconfig +++ b/drivers/media/platform/nxp/Kconfig @@ -2,20 +2,10 @@ # V4L drivers -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 - Say yes here to enable support for capture drivers on i.MX SoCs. - Support for the single SoC features are selectable in the sub-menu - options. - -if VIDEO_IMX +comment "NXP drivers" config VIDEO_IMX_MIPI_CSIS - tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" + tristate "NXP MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" select MEDIA_CONTROLLER select V4L2_FWNODE select VIDEO_V4L2_SUBDEV_API @@ -24,10 +14,8 @@ config VIDEO_IMX_MIPI_CSIS Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs. -endif # VIDEO_IMX - config VIDEO_VIU - tristate "Freescale/NXP VIU Video Driver" + tristate "NXP VIU Video Driver" depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C select VIDEOBUF_DMA_CONTIG @@ -42,7 +30,7 @@ config VIDEO_VIU # mem2mem drivers config VIDEO_IMX_PXP - tristate "i.MX Pixel Pipeline (PXP)" + tristate "NXP i.MX Pixel Pipeline (PXP)" depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST) select VIDEOBUF2_DMA_CONTIG @@ -52,7 +40,7 @@ config VIDEO_IMX_PXP color space conversion, and rotation. config VIDEO_MX2_EMMAPRP - tristate "Freescale/NXP MX2 eMMa-PrP support" + tristate "NXP MX2 eMMa-PrP support" depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on SOC_IMX27 || COMPILE_TEST diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/qcom/Kconfig index 9f6c91cc95ca..4a89587e932d 100644 --- a/drivers/media/platform/qcom/Kconfig +++ b/drivers/media/platform/qcom/Kconfig @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only +comment "Qualcomm drivers" + source "drivers/media/platform/qcom/camss/Kconfig" source "drivers/media/platform/qcom/venus/Kconfig" diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig index 3f35f1b5106d..2e3a66ea95bd 100644 --- a/drivers/media/platform/renesas/Kconfig +++ b/drivers/media/platform/renesas/Kconfig @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only +comment "Renesas drivers" + # V4L drivers config VIDEO_RCAR_ISP diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig index 2f97c0e0268a..4351e3258d14 100644 --- a/drivers/media/platform/rockchip/Kconfig +++ b/drivers/media/platform/rockchip/Kconfig @@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Rockchip drivers" + source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig index 94f30c1bca9b..c187cefbec5a 100644 --- a/drivers/media/platform/samsung/Kconfig +++ b/drivers/media/platform/samsung/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Samsung drivers" + source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/samsung/s3c-camif/Kconfig" diff --git a/drivers/media/platform/stm/Kconfig b/drivers/media/platform/stm/Kconfig index 27942626a630..58cbb6b888bf 100644 --- a/drivers/media/platform/stm/Kconfig +++ b/drivers/media/platform/stm/Kconfig @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only +comment "STMicroelectronics drivers" + source "drivers/media/platform/stm/sti/Kconfig" source "drivers/media/platform/stm/stm32/Kconfig" diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/via/Kconfig index 1dcf789dce96..f4f4293cf25c 100644 --- a/drivers/media/platform/via/Kconfig +++ b/drivers/media/platform/via/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "VIA drivers" + config VIDEO_VIA_CAMERA tristate "VIAFB camera controller support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig index a9531d5efd50..47f1eeb5d669 100644 --- a/drivers/media/platform/xilinx/Kconfig +++ b/drivers/media/platform/xilinx/Kconfig @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 +comment "Xilinx drivers" + config VIDEO_XILINX tristate "Xilinx Video IP (EXPERIMENTAL)" depends on V4L_PLATFORM_DRIVERS @@ -11,9 +13,8 @@ config VIDEO_XILINX help Driver for Xilinx Video IP Pipelines -if VIDEO_XILINX - config VIDEO_XILINX_CSI2RXSS + depends on VIDEO_XILINX tristate "Xilinx CSI-2 Rx Subsystem" help Driver for Xilinx MIPI CSI-2 Rx Subsystem. This is a V4L sub-device @@ -32,5 +33,3 @@ config VIDEO_XILINX_VTC depends on VIDEO_XILINX help Driver for the Xilinx Video Timing Controller - -endif #VIDEO_XILINX From patchwork Mon Mar 14 16:35:02 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: 12780556 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 30B1CC433F5 for ; Mon, 14 Mar 2022 17:16:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=APlnMuLp3wSiuHrBRi05ZGJ7OlZ/2N5xRIMNNEl4bLk=; b=AMV8pZlDUlNyqP +kEIxoNrZMUFopDRxoy7C8YMJhde2xVfL8eGLAIusXVHuRizDeKKIt96FbJIL83oBHcFU6mKE54Sf 4Ljzwx0oJm4Iz4UOukRHoGJ6/QFxnKSeTsJ3ot3PJIqGHOGgfStkIVWrtA07iAY1CeCotA+77ljDI 3pOYlotC9KPy+x4HcArX0AIZb0iiv2aPpu001r98oQfGQW/eFfRJ+7iDvtnOv9IfL1LvfodNHSLtQ 10rRHHUo7j3oKAGbank2CujYHTxfZ7B6rs/9CseEHTaly1q95Q3sKfCHmuMz0z8YTMnJV4DYSjz0h Xh4vdXUSADYs80T90z1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToHQ-006J2A-C4; Mon, 14 Mar 2022 17:14:48 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nToD5-006HQe-2j; Mon, 14 Mar 2022 17:10:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=rDZtvruqxz7DRnWpFA0QoKwPt82SYnjArFtNLkYPyPw=; b=F6rxVibTQusxitbO3WgyMObqqR 8IQT9gljvfqM9krht5x37VDDok9WbR91EPGNOsliJ5eJ39LgHlA+T4f3gHGd2MXBqomn6OR1hYCGt LN7pBR7Nt+jBT1zIhj5zVYvZTKBem/x7nlJYxwVTueaHPIh03PvCh/QOThTFKimO6Qnt1Z6U4I7BZ 6hfCjmJG82+85vncwIrR2C2gLOaEDn6MUkXGCEw6RlzsonKq7ssaBkw/vWY0GGvU8+Ycki2aXQmr3 DeLkQMqGEqf2ieZbCl3u2XjMqS1CYhcpO5o2vdeXCCW8HhmJszMXjXHC8AAv3Mmsfg16qYZRynSON Je0UZw1w==; Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTnf9-000uIY-1z; Mon, 14 Mar 2022 16:35:23 +0000 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 24E16B80EC6; Mon, 14 Mar 2022 16:35:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63831C36AF2; Mon, 14 Mar 2022 16:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647275710; bh=oXzvkGdwbB6HW9GK/IZizvDPe4hOuT+RXwBX5+8EZ3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UqBGLJw3D1GYo7+Ej/k3krCEhclwV3dYYYbJrHm2MhMRuVZC0qZ3YtKZSVA481c4D W2UMyJ3qMpuvygiAQ5Iaz1arzcjl2X7ecaUwf6YKanVIYKCN01h40VseiTWgIZHLXc 5zuuYeFiwNezon1b3Lm3B3X04XRO3pmFZ09adrMf8xs4Ze+lKR3/K9lJKxN0vtKdxy Bg8KXhJ0JStoWFTg14QN1Vc8Esfr0nlENllY08NffQ9b2+RA+Y3na+1PSBWwV2jrPx edwSRB5SeSts0CC0X3jUbNA8B+c/bIAFByHJWIoFfttqXtYmjQ5gzXx7mqkdtVGb4W dQvZp812wokwg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTnf2-001x8A-63; Mon, 14 Mar 2022 17:35:08 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , Alexandre Courbot , Andrew-CT Chen , AngeloGioacchino Del Regno , Arnd Bergmann , Bin Liu , Cai Huoqing , Christophe JAILLET , Colin Ian King , Dafna Hirschfeld , Ding Senjie , Evan Green , Hans Verkuil , Hirokazu Honda , Houlong Wei , Irui Wang , Jacopo Mondi , Jiasheng Jiang , Jonathan Cameron , Kieran Bingham , Lad Prabhakar , Laurent Pinchart , Maoguang Meng , Matthias Brugger , Minghsiu Tsai , Nicolas Dufresne , Rick Chang , Steve Cho , Tiffany Lin , Tzung-Bi Shih , Xu Wang , Yong Wu , Yunfei Dong , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 67/67] media: platform: rename mediatek/mtk-jpeg/ to mediatek/jpeg/ Date: Mon, 14 Mar 2022 17:35:02 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_163515_457771_BDAB094C X-CRM114-Status: GOOD ( 11.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename mediatek/mtk-jpeg/ to mediatek/jpeg/. Requested-by: AngeloGioacchino Del Regno 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 v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/ MAINTAINERS | 10 +++++----- drivers/media/platform/mediatek/Kconfig | 8 ++++---- drivers/media/platform/mediatek/Makefile | 8 ++++---- .../media/platform/mediatek/{mtk-jpeg => jpeg}/Kconfig | 0 .../platform/mediatek/{mtk-jpeg => jpeg}/Makefile | 0 .../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_core.c | 0 .../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_core.h | 0 .../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_hw.c | 0 .../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_hw.h | 0 .../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_parse.c | 0 .../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_parse.h | 0 .../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_reg.h | 0 .../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_enc_hw.c | 0 .../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_enc_hw.h | 0 .../media/platform/mediatek/{mtk-mdp => mdp}/Kconfig | 0 .../media/platform/mediatek/{mtk-mdp => mdp}/Makefile | 2 +- .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_comp.c | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_comp.h | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_core.c | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_core.h | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_ipi.h | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_m2m.c | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_m2m.h | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_regs.c | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_regs.h | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_vpu.c | 0 .../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_vpu.h | 0 .../platform/mediatek/{mtk-vcodec => vcodec}/Kconfig | 0 .../platform/mediatek/{mtk-vcodec => vcodec}/Makefile | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec.c | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec.h | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_dec_drv.c | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_dec_hw.c | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_dec_hw.h | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_dec_pm.c | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_dec_pm.h | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_dec_stateful.c | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_dec_stateless.c | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_drv.h | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc.c | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc.h | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_enc_drv.c | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_enc_pm.c | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_enc_pm.h | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw.c | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw.h | 2 +- .../{mtk-vcodec => vcodec}/mtk_vcodec_fw_priv.h | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_fw_scp.c | 0 .../{mtk-vcodec => vcodec}/mtk_vcodec_fw_vpu.c | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_intr.c | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_intr.h | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_util.c | 0 .../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_util.h | 0 .../{mtk-vcodec => vcodec}/vdec/vdec_h264_if.c | 0 .../{mtk-vcodec => vcodec}/vdec/vdec_h264_req_if.c | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec/vdec_vp8_if.c | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec/vdec_vp9_if.c | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec_drv_base.h | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec_drv_if.c | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec_drv_if.h | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec_ipi_msg.h | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec_msg_queue.c | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec_msg_queue.h | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec_vpu_if.c | 0 .../mediatek/{mtk-vcodec => vcodec}/vdec_vpu_if.h | 0 .../{mtk-vcodec => vcodec}/venc/venc_h264_if.c | 0 .../mediatek/{mtk-vcodec => vcodec}/venc/venc_vp8_if.c | 0 .../mediatek/{mtk-vcodec => vcodec}/venc_drv_base.h | 0 .../mediatek/{mtk-vcodec => vcodec}/venc_drv_if.c | 0 .../mediatek/{mtk-vcodec => vcodec}/venc_drv_if.h | 0 .../mediatek/{mtk-vcodec => vcodec}/venc_ipi_msg.h | 0 .../mediatek/{mtk-vcodec => vcodec}/venc_vpu_if.c | 0 .../mediatek/{mtk-vcodec => vcodec}/venc_vpu_if.h | 0 .../media/platform/mediatek/{mtk-vpu => vpu}/Kconfig | 0 .../media/platform/mediatek/{mtk-vpu => vpu}/Makefile | 0 .../media/platform/mediatek/{mtk-vpu => vpu}/mtk_vpu.c | 0 .../media/platform/mediatek/{mtk-vpu => vpu}/mtk_vpu.h | 0 77 files changed, 15 insertions(+), 15 deletions(-) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/Kconfig (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/Makefile (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_core.c (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_core.h (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_hw.c (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_hw.h (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_parse.c (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_parse.h (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_reg.h (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_enc_hw.c (100%) rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_enc_hw.h (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/Kconfig (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/Makefile (77%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_comp.c (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_comp.h (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_core.c (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_core.h (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_ipi.h (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_m2m.c (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_m2m.h (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_regs.c (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_regs.h (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_vpu.c (100%) rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_vpu.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/Kconfig (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/Makefile (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_drv.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_hw.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_hw.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_pm.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_pm.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_stateful.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_stateless.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_drv.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc_drv.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc_pm.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc_pm.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw.h (97%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw_priv.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw_scp.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw_vpu.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_intr.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_intr.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_util.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_util.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec/vdec_h264_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec/vdec_h264_req_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec/vdec_vp8_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec/vdec_vp9_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_drv_base.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_drv_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_drv_if.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_ipi_msg.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_msg_queue.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_msg_queue.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_vpu_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_vpu_if.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc/venc_h264_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc/venc_vp8_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_drv_base.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_drv_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_drv_if.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_ipi_msg.h (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_vpu_if.c (100%) rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_vpu_if.h (100%) rename drivers/media/platform/mediatek/{mtk-vpu => vpu}/Kconfig (100%) rename drivers/media/platform/mediatek/{mtk-vpu => vpu}/Makefile (100%) rename drivers/media/platform/mediatek/{mtk-vpu => vpu}/mtk_vpu.c (100%) rename drivers/media/platform/mediatek/{mtk-vpu => vpu}/mtk_vpu.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 81ce7b4e2b2a..152fef3163e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12130,7 +12130,7 @@ M: Rick Chang M: Bin Liu S: Supported F: Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt -F: drivers/media/platform/mediatek/mtk-jpeg/ +F: drivers/media/platform/mediatek/jpeg/ MEDIATEK MDP DRIVER M: Minghsiu Tsai @@ -12138,8 +12138,8 @@ M: Houlong Wei M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-mdp.txt -F: drivers/media/platform/mediatek/mtk-mdp/ -F: drivers/media/platform/mediatek/mtk-vpu/ +F: drivers/media/platform/mediatek/mdp/ +F: drivers/media/platform/mediatek/vpu/ MEDIATEK MEDIA DRIVER M: Tiffany Lin @@ -12147,8 +12147,8 @@ M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt F: Documentation/devicetree/bindings/media/mediatek-vpu.txt -F: drivers/media/platform/mediatek/mtk-vcodec/ -F: drivers/media/platform/mediatek/mtk-vpu/ +F: drivers/media/platform/mediatek/vcodec/ +F: drivers/media/platform/mediatek/vpu/ MEDIATEK MMC/SD/SDIO DRIVER M: Chaotian Jing diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig index aa79626088ec..122eb94ed430 100644 --- a/drivers/media/platform/mediatek/Kconfig +++ b/drivers/media/platform/mediatek/Kconfig @@ -2,7 +2,7 @@ comment "Mediatek drivers" -source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" -source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" -source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" -source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" +source "drivers/media/platform/mediatek/jpeg/Kconfig" +source "drivers/media/platform/mediatek/mdp/Kconfig" +source "drivers/media/platform/mediatek/vcodec/Kconfig" +source "drivers/media/platform/mediatek/vpu/Kconfig" diff --git a/drivers/media/platform/mediatek/Makefile b/drivers/media/platform/mediatek/Makefile index 403d5ecd2b10..d3850a13f128 100644 --- a/drivers/media/platform/mediatek/Makefile +++ b/drivers/media/platform/mediatek/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += mtk-jpeg/ -obj-y += mtk-mdp/ -obj-y += mtk-vcodec/ -obj-y += mtk-vpu/ +obj-y += jpeg/ +obj-y += mdp/ +obj-y += vcodec/ +obj-y += vpu/ diff --git a/drivers/media/platform/mediatek/mtk-jpeg/Kconfig b/drivers/media/platform/mediatek/jpeg/Kconfig similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/Kconfig rename to drivers/media/platform/mediatek/jpeg/Kconfig diff --git a/drivers/media/platform/mediatek/mtk-jpeg/Makefile b/drivers/media/platform/mediatek/jpeg/Makefile similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/Makefile rename to drivers/media/platform/mediatek/jpeg/Makefile diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.h diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.h diff --git a/drivers/media/platform/mediatek/mtk-mdp/Kconfig b/drivers/media/platform/mediatek/mdp/Kconfig similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/Kconfig rename to drivers/media/platform/mediatek/mdp/Kconfig diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mdp/Makefile similarity index 77% rename from drivers/media/platform/mediatek/mtk-mdp/Makefile rename to drivers/media/platform/mediatek/mdp/Makefile index eab6f984aeea..b7c16ebecc80 100644 --- a/drivers/media/platform/mediatek/mtk-mdp/Makefile +++ b/drivers/media/platform/mediatek/mdp/Makefile @@ -7,4 +7,4 @@ mtk-mdp-y += mtk_mdp_vpu.o obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o -ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/mtk-vpu +ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/vpu diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c rename to drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h rename to drivers/media/platform/mediatek/mdp/mtk_mdp_comp.h diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c rename to drivers/media/platform/mediatek/mdp/mtk_mdp_core.c diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_core.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h rename to drivers/media/platform/mediatek/mdp/mtk_mdp_core.h diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_ipi.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h rename to drivers/media/platform/mediatek/mdp/mtk_mdp_ipi.h diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c rename to drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h rename to drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.h diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_regs.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c rename to drivers/media/platform/mediatek/mdp/mtk_mdp_regs.c diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_regs.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h rename to drivers/media/platform/mediatek/mdp/mtk_mdp_regs.h diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c rename to drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.c diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h rename to drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/vcodec/Kconfig similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/Kconfig rename to drivers/media/platform/mediatek/vcodec/Kconfig diff --git a/drivers/media/platform/mediatek/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/vcodec/Makefile similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/Makefile rename to drivers/media/platform/mediatek/vcodec/Makefile diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_hw.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_hw.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_hw.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_hw.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_pm.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_pm.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_pm.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_pm.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.h similarity index 97% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.h index 539bb626772c..15ab6b8e3ae2 100644 --- a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.h @@ -6,7 +6,7 @@ #include #include -#include "../mtk-vpu/mtk_vpu.h" +#include "../vpu/mtk_vpu.h" struct mtk_vcodec_dev; diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_priv.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_priv.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_vpu.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_vpu.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_intr.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_intr.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_intr.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_intr.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c rename to drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c rename to drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c rename to drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c rename to drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/vcodec/vdec_drv_base.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h rename to drivers/media/platform/mediatek/vcodec/vdec_drv_base.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/vcodec/vdec_drv_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c rename to drivers/media/platform/mediatek/vcodec/vdec_drv_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/vcodec/vdec_drv_if.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h rename to drivers/media/platform/mediatek/vcodec/vdec_drv_if.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/vcodec/vdec_ipi_msg.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h rename to drivers/media/platform/mediatek/vcodec/vdec_ipi_msg.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c rename to drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h rename to drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c rename to drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h rename to drivers/media/platform/mediatek/vcodec/vdec_vpu_if.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c rename to drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/vcodec/venc/venc_vp8_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c rename to drivers/media/platform/mediatek/vcodec/venc/venc_vp8_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/vcodec/venc_drv_base.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h rename to drivers/media/platform/mediatek/vcodec/venc_drv_base.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/vcodec/venc_drv_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c rename to drivers/media/platform/mediatek/vcodec/venc_drv_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/vcodec/venc_drv_if.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h rename to drivers/media/platform/mediatek/vcodec/venc_drv_if.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/vcodec/venc_ipi_msg.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h rename to drivers/media/platform/mediatek/vcodec/venc_ipi_msg.h diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/vcodec/venc_vpu_if.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c rename to drivers/media/platform/mediatek/vcodec/venc_vpu_if.c diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/vcodec/venc_vpu_if.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h rename to drivers/media/platform/mediatek/vcodec/venc_vpu_if.h diff --git a/drivers/media/platform/mediatek/mtk-vpu/Kconfig b/drivers/media/platform/mediatek/vpu/Kconfig similarity index 100% rename from drivers/media/platform/mediatek/mtk-vpu/Kconfig rename to drivers/media/platform/mediatek/vpu/Kconfig diff --git a/drivers/media/platform/mediatek/mtk-vpu/Makefile b/drivers/media/platform/mediatek/vpu/Makefile similarity index 100% rename from drivers/media/platform/mediatek/mtk-vpu/Makefile rename to drivers/media/platform/mediatek/vpu/Makefile diff --git a/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mediatek/vpu/mtk_vpu.c similarity index 100% rename from drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c rename to drivers/media/platform/mediatek/vpu/mtk_vpu.c diff --git a/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mediatek/vpu/mtk_vpu.h similarity index 100% rename from drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h rename to drivers/media/platform/mediatek/vpu/mtk_vpu.h