From patchwork Wed Nov 29 09:27:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 171195 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp219794vqn; Wed, 29 Nov 2023 01:29:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZKmAkY334OGy3d9A3cF23r+/YM3sv+1fjKSxhMAoLrU0mVgMa+hxQE/bxQdYojeOwkPkI X-Received: by 2002:a05:6a00:1990:b0:6bc:b13c:35d5 with SMTP id d16-20020a056a00199000b006bcb13c35d5mr18004993pfl.13.1701250192618; Wed, 29 Nov 2023 01:29:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701250192; cv=none; d=google.com; s=arc-20160816; b=SS+1jA1Esh8uTT2S3e8HXNxZX6x+tEj6556keFqd4KzQb5Mo2M0df1BYvKc6LORWpY 0UWzACvJVnFu9IdGOkjjYsWCH0y0V5xHMkDeZnSJAHCvQpHQ0/VIw285CASRlVzGmWu0 GZhXkvJzI///r2OEpzl+zMtaNOGPmrrB2oL8jlYFK2EXpkCl8fqVhsJcbdUOmf+RfOMK 1I7rel0t7yNyyPp5yoYkWhwkoJdhR15Rqf5Rbm4RCr8Aq/lDFPkUrQRFe75FtsXXe15L Ngd6RmtZ5eLbThfea2ap04QikLfiJEJaq9UWAzPlD8qjLvwJoJhubZIsiHxzHn63/QWz qL8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BaeRzf0jy3K3sMSp7HTAaTepBXg8QzB8c8qvDOutBSQ=; fh=xc/OCy166MCIXDGC4ro8vKM696GwM3HbY3do8vZAyJo=; b=OkvpakXxXPKvmKHDJx5Ao5oinEc6CtyjAiW/qDq0HvxHEQ5Gg4u4k5kR1aHbzmbyWk /2KSodQpcfvg5yme69dEyt48dCZoofTjKaq4+25PAq7URaQP/ERcfAKag0MGj9BB74OQ u8EoXhbj5werKwDf28Dwd4qv6V0pq7fWBJbdI6/uJczJ5jB2zdp/egjLAKhdrX0lt0kh jKvMNvgzD7sM179L0p456ykudI2+a/CiHAcrDpW5uSnyHYZJMQGlxpg2tMWdg78Oq384 GnmU0ecT7knw7FOnzeuwXL3Ym6cjmz5+Evfp/MUFo4ORNUPebT1n5VnbZd3YNK0mcAAR tZwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=S+lueKgW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id fd1-20020a056a002e8100b006cbdff8f01csi14595564pfb.68.2023.11.29.01.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 01:29:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=S+lueKgW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 288438045C6C; Wed, 29 Nov 2023 01:29:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230361AbjK2J33 (ORCPT + 99 others); Wed, 29 Nov 2023 04:29:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230323AbjK2J3B (ORCPT ); Wed, 29 Nov 2023 04:29:01 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B83301BF0; Wed, 29 Nov 2023 01:28:56 -0800 (PST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-135.catv02.itscom.jp [175.177.49.135]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E98CC89D; Wed, 29 Nov 2023 10:28:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1701250100; bh=PtmqHQ776xjzacozPciW19IV7z1WMooGoQuZ2O95uow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S+lueKgWphXiTmYkNBHJpbFVaHPmDiXCJE55lRXauidbPDFD9CoPUrK7rDahim9Jy NR0MvOXeSfF0WeQpMtoH12UYOEZuasBs8VA4ZWSJjF5byRwNw4CAG1UYjZX1pxPJ3h VZ+pm2ZhPlySmAST+cNAQODtcbzjA7UfqqITs6Jw= From: Paul Elder To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org Cc: kieran.bingham@ideasonboard.com, tomi.valkeinen@ideasonboard.com, umang.jain@ideasonboard.com, aford173@gmail.com, Paul Elder , Rob Herring , Dafna Hirschfeld , Laurent Pinchart , Mauro Carvalho Chehab , Heiko Stuebner , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 07/11] media: rkisp1: Add match data for i.MX8MP ISP Date: Wed, 29 Nov 2023 18:27:55 +0900 Message-Id: <20231129092759.242641-8-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231129092759.242641-1-paul.elder@ideasonboard.com> References: <20231129092759.242641-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 29 Nov 2023 01:29:50 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783890122218767866 X-GMAIL-MSGID: 1783890122218767866 Add match data to the rkisp1 driver to match the i.MX8MP ISP. Signed-off-by: Paul Elder Reviewed-by: Rob Herring --- .../platform/rockchip/rkisp1/rkisp1-dev.c | 23 +++++++++++++++++++ include/uapi/linux/rkisp1-config.h | 2 ++ 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 a789a87ec644..621d5de2cbd8 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -501,6 +501,25 @@ static const struct rkisp1_info rk3399_isp_info = { | RKISP1_FEATURE_DUAL_CROP, }; +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, + .features = RKISP1_FEATURE_MAIN_STRIDE, +}; + static const struct of_device_id rkisp1_of_match[] = { { .compatible = "rockchip,px30-cif-isp", @@ -510,6 +529,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 730673ecc63d..f602442c2018 100644 --- a/include/uapi/linux/rkisp1-config.h +++ b/include/uapi/linux/rkisp1-config.h @@ -179,12 +179,14 @@ * @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, + IMX8MP_V10, }; enum rkisp1_cif_isp_histogram_mode {