From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8554C433EF for ; Sun, 13 Mar 2022 07:22:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233804AbiCMHXM (ORCPT ); Sun, 13 Mar 2022 03:23:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233612AbiCMHXC (ORCPT ); Sun, 13 Mar 2022 03:23:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 582A219455D; Sat, 12 Mar 2022 23:21:55 -0800 (PST) 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 D186F60F3D; Sun, 13 Mar 2022 07:21:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C93EC340F8; Sun, 13 Mar 2022 07:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647156113; bh=WNBQZe/n8/rIzk6woMVItRggP9Ox4SfzRhT4ZEEO9Pw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bAK7j1Iitai7ogG5uB8gl633Am77QnIxMU0tZlNc8vlkWDTkQ9BwWDnBg7EAK18DS co6mJNZJJGxDY3B5GXNGyrxPkaEnUA8EDoQy31jAgzGyI7xwvc+LmgD8uFUyC+xN7P oFkjkf912fQBWQT72Zw0ebpBzTKFMrUjFjFIcYQrRi1FScBa2ea1yFlOcP1VuscyQg yhoEy63gu7HaNxzm9DmtsHl2iWnJgCxeM75EeEi8D40Eow1tEdOgmhHhEztBGY6fH6 bECchRivk699jZBHFMVxgrwTF67Lrx2booK/B4HmD/eSd4TNZMJPCIyA3EZATESw2P gE3UPleaFnFIg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTIY3-0012vw-AA; Sun, 13 Mar 2022 08:21:51 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Colin Ian King , Dillon Min , 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 v3 07/39] media: platform: place NXP drivers on a separate dir Date: Sun, 13 Mar 2022 08:21:16 +0100 Message-Id: <92c5183da4244c8a95252c0fb947b227e2eba3b7.1647155572.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to cleanup the main platform media directory, move NXP drivers to their 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 v3 00/39] at: https://lore.kernel.org/all/cover.1647155572.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..a217cf7f109d --- /dev/null +++ b/drivers/media/platform/nxp/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 + +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 -- 2.35.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 07F73C433FE for ; Sun, 13 Mar 2022 08:31:11 +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=6V9RgR59+MEH2wGunyFbWv4tkRzf0E3txGGimEJxJxM=; b=qBQfYhuzELS4it g/9PDZCEhtW4Mlx51i+NzF8aBrWaF/Xew2m7Qyf5eZj6dKtSVZbgCkVV4+uFYnaC/JaHAHuecT/P6 t0B/s3FQMnwtqGSnmm9w4Eb/+rHBt8KCZnlJpnWRGyRLilIdr5u7tz7r9aBnK+lprjJ5iAYWs0skh Htstq+2RVUpXGFGPQqnY0EAb0zJx42jOXspljcx1h6+qWe2HsjBjzJyNPvygqgtp7OvqnGt+2N0r+ F6MhkWy+PTs+tWzYmRyrSQvclvFmo2qhTWLHcTsm/1RnJ497CLZ1oFzdz2WzsqZZ5UKGDjhkWa7Bl iMXh/zDapAppK7tLqwzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTJcI-002RGW-Ad; Sun, 13 Mar 2022 08:30:18 +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 1nTIY7-002Il8-Nr for linux-arm-kernel@lists.infradead.org; Sun, 13 Mar 2022 07:21:59 +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 17A9660F4F; Sun, 13 Mar 2022 07:21:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C93EC340F8; Sun, 13 Mar 2022 07:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647156113; bh=WNBQZe/n8/rIzk6woMVItRggP9Ox4SfzRhT4ZEEO9Pw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bAK7j1Iitai7ogG5uB8gl633Am77QnIxMU0tZlNc8vlkWDTkQ9BwWDnBg7EAK18DS co6mJNZJJGxDY3B5GXNGyrxPkaEnUA8EDoQy31jAgzGyI7xwvc+LmgD8uFUyC+xN7P oFkjkf912fQBWQT72Zw0ebpBzTKFMrUjFjFIcYQrRi1FScBa2ea1yFlOcP1VuscyQg yhoEy63gu7HaNxzm9DmtsHl2iWnJgCxeM75EeEi8D40Eow1tEdOgmhHhEztBGY6fH6 bECchRivk699jZBHFMVxgrwTF67Lrx2booK/B4HmD/eSd4TNZMJPCIyA3EZATESw2P gE3UPleaFnFIg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTIY3-0012vw-AA; Sun, 13 Mar 2022 08:21:51 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Colin Ian King , Dillon Min , 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 v3 07/39] media: platform: place NXP drivers on a separate dir Date: Sun, 13 Mar 2022 08:21:16 +0100 Message-Id: <92c5183da4244c8a95252c0fb947b227e2eba3b7.1647155572.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-20220312_232155_885175_F017930E X-CRM114-Status: GOOD ( 23.54 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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. 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 v3 00/39] at: https://lore.kernel.org/all/cover.1647155572.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..a217cf7f109d --- /dev/null +++ b/drivers/media/platform/nxp/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 + +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 -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel