From patchwork Fri Oct 30 05:51:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11868529 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC4131130 for ; Fri, 30 Oct 2020 05:52:22 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48280206D8 for ; Fri, 30 Oct 2020 05:52:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="0KBF1rtK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48280206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=54HJONrUm423x1/6rTp/qSgQKgW/YBfik+bziL4C6Ic=; b=0KBF1rtKnGXvR/tQ9NrbnBRIM 881okvHC2CAdNFxYobZ9kfcTcVLwflDs3zAmZKQAQqk76bJsZl0cjlY85Zu+DLDN83urVr+DbsQR7 KeGr8cAXbF6t8AeVvz9HKwgOhTxg8YMcfJaY55RUbx6me5F4UAcj0BYJiiIpybZ/UF5f38y6VP00O Ri9fnMF4VYiRmm/qvpVcY3iszsbZnr8WpetvJS5bBnVHGJdtjXp3xn+5BpqDyuAirwBRfy7gDbjkL 6TmU8Ex4TLXoGei2SDJ7gVWqYckaTKQuVAPnxKvruHiWnp1M1fw7n+ACNQWVhSSiMoUij3/y60Epe 3waSlOGKw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYNKd-0004hn-LO; Fri, 30 Oct 2020 05:52:11 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYNKb-0004gi-P3 for linux-rockchip@lists.infradead.org; Fri, 30 Oct 2020 05:52:10 +0000 Received: from floko.floko.floko (unknown [IPv6:2804:14c:483:7e3e::1005]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id F1C7B1F458F8; Fri, 30 Oct 2020 05:52:04 +0000 (GMT) From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH 1/2] media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format Date: Fri, 30 Oct 2020 02:51:52 -0300 Message-Id: <20201030055153.1981530-2-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030055153.1981530-1-helen.koike@collabora.com> References: <20201030055153.1981530-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201030_015209_910441_812F81C3 X-CRM114-Status: GOOD ( 12.97 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, dafna.hirschfeld@collabora.com, heiko@sntech.de, niklas.soderlund@ragnatech.se, linux-kernel@vger.kernel.org, tfiga@chromium.org, linux-rockchip@lists.infradead.org, laurent.pinchart@ideasonboard.com, hverkuil-cisco@xs4all.nl, kernel@collabora.com, zhengsq@rock-chips.com, ribalda@google.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org From: Shunqian Zheng Add the Rockchip ISP1 specific processing parameter format V4L2_META_FMT_RK_ISP1_PARAMS and metadata format V4L2_META_FMT_RK_ISP1_STAT_3A for 3A. Signed-off-by: Shunqian Zheng Signed-off-by: Jacob Chen Signed-off-by: Helen Koike Reviewed-by: Laurent Pinchart --- Hello, This patch is a continuation of: https://patchwork.kernel.org/project/linux-arm-kernel/patch/20191106120132.6876-2-helen.koike@collabora.com/ These formats are already documented under Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst We had agreed to keep under drivers/staging/media/rkisp1/uapi/rkisp1-config.h while the driver was in staging, since we are moving it out of staging, I guess this is the time :) Regards, Helen --- drivers/media/v4l2-core/v4l2-ioctl.c | 2 ++ drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 4 ---- include/uapi/linux/videodev2.h | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index eeff398fbdcc1..202597d031c6b 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1402,6 +1402,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break; case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break; case V4L2_META_FMT_VIVID: descr = "Vivid Metadata"; break; + case V4L2_META_FMT_RK_ISP1_PARAMS: descr = "Rockchip ISP1 3A params"; break; + case V4L2_META_FMT_RK_ISP1_STAT_3A: descr = "Rockchip ISP1 3A statistics"; break; default: /* Compressed formats */ diff --git a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h index 8d906cc7da8fc..6e449e7842605 100644 --- a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h +++ b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h @@ -9,10 +9,6 @@ #include -/* Vendor specific - used for RK_ISP1 camera sub-system */ -#define V4L2_META_FMT_RK_ISP1_PARAMS v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 params */ -#define V4L2_META_FMT_RK_ISP1_STAT_3A v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A statistics */ - /* Defect Pixel Cluster Detection */ #define RKISP1_CIF_ISP_MODULE_DPCC (1U << 0) /* Black Level Subtraction */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 534eaa4d39bc8..c2e13ba81196b 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -770,6 +770,10 @@ struct v4l2_pix_format { #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X') /* D4XX Payload Header metadata */ #define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Metadata */ +/* Vendor specific - used for RK_ISP1 camera sub-system */ +#define V4L2_META_FMT_RK_ISP1_PARAMS v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 params */ +#define V4L2_META_FMT_RK_ISP1_STAT_3A v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A statistics */ + /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe From patchwork Fri Oct 30 05:51:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11868533 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F5F161C for ; Fri, 30 Oct 2020 05:52:24 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AAAF020720 for ; Fri, 30 Oct 2020 05:52:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cLXOQimS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAAF020720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ukay0ppYf3rLqDVgc/CquzPw82ds29H3h82Dtswo/GY=; b=cLXOQimShn7eJjtPFbWRySn4M QT+XZslNoeuDaM175sDv1QWZ0ENTk9NqKzkac97yZQsVAi1EEs0XXCKiDOD6LqWBN+z9tceEZS0ex fb44AEmpfe6QNPfoA86T9tTURSliyn6Xr2Mi6rmbzrOT+i/W7nLSGTBb4tTENimBd3JCYjWXyQKMj jzxjvpE4dpKdamFuy+6rp0kAVjMZs+GF2qWilJIPlj4/9vbBdXo9Fm5ffkuvWklmMvZ3cXd9xJNsg +f+h0cmQayzg/5NNASk0gmhe9hz0lNvQ+LtJrRW1uLbuihmZ80TY8KmnUAOSeTrWF8zxy8tYLq0ac cT2P1sBMw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYNKh-0004ip-7j; Fri, 30 Oct 2020 05:52:15 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYNKe-0004i6-PK for linux-rockchip@lists.infradead.org; Fri, 30 Oct 2020 05:52:13 +0000 Received: from floko.floko.floko (unknown [IPv6:2804:14c:483:7e3e::1005]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id C205F1F458FA; Fri, 30 Oct 2020 05:52:08 +0000 (GMT) From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH 2/2] media: rockchip: rkisp1: destage Rockchip ISP1 driver Date: Fri, 30 Oct 2020 02:51:53 -0300 Message-Id: <20201030055153.1981530-3-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030055153.1981530-1-helen.koike@collabora.com> References: <20201030055153.1981530-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201030_015213_005956_C09A39C0 X-CRM114-Status: GOOD ( 17.36 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, dafna.hirschfeld@collabora.com, heiko@sntech.de, niklas.soderlund@ragnatech.se, linux-kernel@vger.kernel.org, tfiga@chromium.org, linux-rockchip@lists.infradead.org, laurent.pinchart@ideasonboard.com, hverkuil-cisco@xs4all.nl, kernel@collabora.com, zhengsq@rock-chips.com, ribalda@google.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org All the items in the TODO list were addressed, uapi was reviewed, documentation written, checkpatch errors fixed, several bugs fixed. There is no big reason to keep this driver in staging, so move it out. Signed-off-by: Helen Koike --- .../media/v4l/pixfmt-meta-rkisp1.rst | 2 +- drivers/media/platform/Kconfig | 18 ++++++++++++++++++ drivers/media/platform/Makefile | 1 + .../platform/rockchip}/rkisp1/Makefile | 0 .../rockchip}/rkisp1/rkisp1-capture.c | 0 .../platform/rockchip}/rkisp1/rkisp1-common.c | 0 .../platform/rockchip}/rkisp1/rkisp1-common.h | 2 +- .../platform/rockchip}/rkisp1/rkisp1-dev.c | 0 .../platform/rockchip}/rkisp1/rkisp1-isp.c | 0 .../platform/rockchip}/rkisp1/rkisp1-params.c | 0 .../platform/rockchip}/rkisp1/rkisp1-regs.h | 0 .../rockchip}/rkisp1/rkisp1-resizer.c | 0 .../platform/rockchip}/rkisp1/rkisp1-stats.c | 0 drivers/staging/media/Kconfig | 2 -- drivers/staging/media/Makefile | 1 - drivers/staging/media/rkisp1/Kconfig | 19 ------------------- drivers/staging/media/rkisp1/TODO | 6 ------ .../uapi/linux}/rkisp1-config.h | 0 18 files changed, 21 insertions(+), 30 deletions(-) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/Makefile (100%) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-capture.c (100%) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.c (100%) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.h (99%) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-dev.c (100%) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-isp.c (100%) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-params.c (100%) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-regs.h (100%) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-resizer.c (100%) rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-stats.c (100%) delete mode 100644 drivers/staging/media/rkisp1/Kconfig delete mode 100644 drivers/staging/media/rkisp1/TODO rename {drivers/staging/media/rkisp1/uapi => include/uapi/linux}/rkisp1-config.h (100%) diff --git a/Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst b/Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst index 7e43837ed260a..f3671472d4105 100644 --- a/Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst +++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst @@ -46,4 +46,4 @@ important tuning tools using software control loop. rkisp1 uAPI data types ====================== -.. kernel-doc:: drivers/staging/media/rkisp1/uapi/rkisp1-config.h +.. kernel-doc:: include/uapi/linux/rkisp1-config.h diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index a3cb104956d56..202d447759fd8 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -448,6 +448,24 @@ config VIDEO_RENESAS_VSP1 To compile this driver as a module, choose M here: the module will be called vsp1. +config VIDEO_ROCKCHIP_ISP1 + tristate "Rockchip Image Signal Processing v1 Unit driver" + 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. + config VIDEO_ROCKCHIP_RGA tristate "Rockchip Raster 2d Graphic Acceleration Unit" depends on VIDEO_DEV && VIDEO_V4L2 diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 62b6cdc8c7300..b342714228db4 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -52,6 +52,7 @@ obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/ +obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rockchip/rkisp1/ obj-$(CONFIG_VIDEO_ROCKCHIP_RGA) += rockchip/rga/ obj-y += omap/ diff --git a/drivers/staging/media/rkisp1/Makefile b/drivers/media/platform/rockchip/rkisp1/Makefile similarity index 100% rename from drivers/staging/media/rkisp1/Makefile rename to drivers/media/platform/rockchip/rkisp1/Makefile diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c similarity index 100% rename from drivers/staging/media/rkisp1/rkisp1-capture.c rename to drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c diff --git a/drivers/staging/media/rkisp1/rkisp1-common.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.c similarity index 100% rename from drivers/staging/media/rkisp1/rkisp1-common.c rename to drivers/media/platform/rockchip/rkisp1/rkisp1-common.c diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h similarity index 99% rename from drivers/staging/media/rkisp1/rkisp1-common.h rename to drivers/media/platform/rockchip/rkisp1/rkisp1-common.h index 692333c66f9d1..3a134e97161cb 100644 --- a/drivers/staging/media/rkisp1/rkisp1-common.h +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -20,7 +21,6 @@ #include #include "rkisp1-regs.h" -#include "uapi/rkisp1-config.h" /* * flags on the 'direction' field in struct 'rkisp1_isp_mbus_info' that indicate diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c similarity index 100% rename from drivers/staging/media/rkisp1/rkisp1-dev.c rename to drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c similarity index 100% rename from drivers/staging/media/rkisp1/rkisp1-isp.c rename to drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c similarity index 100% rename from drivers/staging/media/rkisp1/rkisp1-params.c rename to drivers/media/platform/rockchip/rkisp1/rkisp1-params.c diff --git a/drivers/staging/media/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h similarity index 100% rename from drivers/staging/media/rkisp1/rkisp1-regs.h rename to drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c similarity index 100% rename from drivers/staging/media/rkisp1/rkisp1-resizer.c rename to drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c similarity index 100% rename from drivers/staging/media/rkisp1/rkisp1-stats.c rename to drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 747c6cf1d795e..e8996b1c3b351 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -44,6 +44,4 @@ source "drivers/staging/media/tegra-video/Kconfig" source "drivers/staging/media/ipu3/Kconfig" -source "drivers/staging/media/rkisp1/Kconfig" - endif diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index b59571826ba69..24b5873ff7608 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -10,5 +10,4 @@ obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/ obj-$(CONFIG_TEGRA_VDE) += tegra-vde/ obj-$(CONFIG_VIDEO_HANTRO) += hantro/ obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/ -obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rkisp1/ obj-$(CONFIG_VIDEO_ZORAN) += zoran/ diff --git a/drivers/staging/media/rkisp1/Kconfig b/drivers/staging/media/rkisp1/Kconfig deleted file mode 100644 index 41f5def9ea442..0000000000000 --- a/drivers/staging/media/rkisp1/Kconfig +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -config VIDEO_ROCKCHIP_ISP1 - tristate "Rockchip Image Signal Processing v1 Unit driver" - 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. diff --git a/drivers/staging/media/rkisp1/TODO b/drivers/staging/media/rkisp1/TODO deleted file mode 100644 index bb5548cd6bd1b..0000000000000 --- a/drivers/staging/media/rkisp1/TODO +++ /dev/null @@ -1,6 +0,0 @@ -NOTES: -* All v4l2-compliance test must pass. -* Stats and params can be tested with libcamera and ChromiumOS stack. - -Please CC patches to Linux Media and -Helen Koike . diff --git a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h similarity index 100% rename from drivers/staging/media/rkisp1/uapi/rkisp1-config.h rename to include/uapi/linux/rkisp1-config.h