From patchwork Thu Jun 30 23:07:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12902378 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 6C0CCCCA473 for ; Thu, 30 Jun 2022 23:09:16 +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=dQcGPigaZAoD767gOqXk/XFyXnBxZXbBhT3hu4xglwQ=; b=aHu6GWWvSbAN4u +/KEpg17doBWGdWMXBcnadGuMzfiiqJcaW0rquv/jdE9Lczc/aRdTFok7+mV+sd5OQnr02DF2rYXS I/CKmObt6BRCCZhV76rqxEvlCVGwuOk+MG+qRpRH5yc6rj13HYrMTQXo5q4wU0UZI3OXhullB5qOW YlD2fwiugn2B08F94nnM+OV6d9Tcngbs+jrRhGp7WBNo/zBIUo746dw8SGLfbY8iQmipRxIEx51M9 EDiddIhjSlj1dBWLzQhyyw7ZKeGQSHRvVnFqkM4Sf4JGChDEFVOoaBAWlvf00HpJJgweuf7tTeqhi FnFbNqUzWD3u0IlHQl+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o73HV-0021at-Fr; Thu, 30 Jun 2022 23:09:05 +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 1o73H7-0020yC-7Z for linux-rockchip@bombadil.infradead.org; Thu, 30 Jun 2022 23:08:41 +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=K2B+i8junZuYas+9MptQz8ZZChyK9IiszGc60n68Xhc=; b=KtaaX5pe60OMs+YRoPCOgJYsqX lTd0MqWoNP2xUNkItf89JygVTX3EZQdR1RSVX5/Zpna5K7fRq3DLGh32aNTyN7jsWA7ohmV+jkwdt r8CD4krpPFhi/hnpO0kc3j8ZRqkmYaaZOMPW5Flnca5at3z1YNbXc8MY1b5Yc15RI9VfaFvE/vhQH mgrZN3uvHo+KCL5yFNiMZAsUBsErSfIx5+VF2kI8iYPq224T2IFv7leX+D+wmXqOmoG/SW7XmPbid 2Y1N/5azSpaRsSIrcrh82YTYwB9iPrXhkKB56IX5p7L6u1ddvfF3MP+sUBaZWjKHQIg36SOj39e3l NaYvH10Q==; Received: from perceval.ideasonboard.com ([213.167.242.64]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o73Go-00FRLb-AJ for linux-rockchip@lists.infradead.org; Thu, 30 Jun 2022 23:08:38 +0000 Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 91410E7B; Fri, 1 Jul 2022 01:08:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1656630489; bh=GKNkOsmaDUAra13o+i06bdJmJT/ZL4BhjMtclARPSXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BCG6ThtztIDCHfr+cyZChMu42Jj3F4uWQkeKLnALI6U7Hapnk+eMY1QtfqPRkk92n OhkZQAGGmcSooDrCpIFkFC7+8El/ZHDJpBPYheqCpayNY2oFz6tMglA4Sx3Q2Q1+Mn 2bFlMn63pA4hiQPDbaYID/2W8A35ZyMDY0yaSYW4= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: linux-rockchip@lists.infradead.org, Dafna Hirschfeld , Heiko Stuebner , Helen Koike , Paul Elder Subject: [PATCH v2 48/55] media: rkisp1: Add match data for i.MX8MP ISP Date: Fri, 1 Jul 2022 02:07:06 +0300 Message-Id: <20220630230713.10580-49-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220630230713.10580-1-laurent.pinchart@ideasonboard.com> References: <20220630230713.10580-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_000832_417542_2B781F92 X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Paul Elder Add match data to the rkisp1 driver to match the i.MX8MP ISP. Signed-off-by: Paul Elder --- .../platform/rockchip/rkisp1/rkisp1-dev.c | 22 +++++++++++++++++++ include/uapi/linux/rkisp1-config.h | 3 +++ 2 files changed, 25 insertions(+) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index f2475c6235ea..a41f89807dd7 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -496,6 +496,24 @@ static const struct rkisp1_info rk3399_isp_info = { .features = RKISP1_FEATURE_MIPI_CSI2, }; +static const char * const imx8mp_isp_clks[] = { + "isp", + "hclk", + "aclk", +}; + +static const struct rkisp1_isr_data imx8mp_isp_isrs[] = { + { NULL, rkisp1_isr }, +}; + +static const struct rkisp1_info imx8mp_isp_info = { + .clks = imx8mp_isp_clks, + .clk_size = ARRAY_SIZE(imx8mp_isp_clks), + .isrs = imx8mp_isp_isrs, + .isr_size = ARRAY_SIZE(imx8mp_isp_isrs), + .isp_ver = IMX8MP_V10, +}; + static const struct of_device_id rkisp1_of_match[] = { { .compatible = "rockchip,px30-cif-isp", @@ -505,6 +523,10 @@ static const struct of_device_id rkisp1_of_match[] = { .compatible = "rockchip,rk3399-cif-isp", .data = &rk3399_isp_info, }, + { + .compatible = "fsl,imx8mp-isp", + .data = &imx8mp_isp_info, + }, {}, }; MODULE_DEVICE_TABLE(of, rkisp1_of_match); diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h index 583ca0d9a79d..40677d47825c 100644 --- a/include/uapi/linux/rkisp1-config.h +++ b/include/uapi/linux/rkisp1-config.h @@ -140,12 +140,15 @@ * @RKISP1_V11: declared in the original vendor code, but not used * @RKISP1_V12: used at least in rk3326 and px30 * @RKISP1_V13: used at least in rk1808 + * @IMX8MP_V10: used in at least imx8mp */ enum rkisp1_cif_isp_version { RKISP1_V10 = 10, RKISP1_V11, RKISP1_V12, RKISP1_V13, + /* TODO Choose a better version for this */ + IMX8MP_V10, }; enum rkisp1_cif_isp_histogram_mode {