From patchwork Sat Jan 6 16:02:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 185652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp175715dyq; Sat, 6 Jan 2024 08:06:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IFsXt72JHCswg6jPFj7fAatSWju9asjLyzUQ8LjPsVNiiMQPAWKDVONe2IXgQgUJHZuo1r8 X-Received: by 2002:a17:906:7704:b0:a28:ba5d:e786 with SMTP id q4-20020a170906770400b00a28ba5de786mr1101257ejm.14.1704557177287; Sat, 06 Jan 2024 08:06:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704557177; cv=none; d=google.com; s=arc-20160816; b=hK/BUwmKY+/3bwgtBvpHS/UKPkrXcQjbL0L5ceqNULwb7owusATpiuSyfP6e1PwyTS 13Wiz2kiNIjVAH4JbX9F20FeWlHCnqWbL0MsgZiG6NclIo/vWH/BXm48M1Q4aH7a5UU4 saMo0Fc4EwkIXmergHk82aQf8anb3fT7pzkCSO73Dm0LzTAABGGEMwQbiSPN0+eUIamV Rxmh9RiU4vZQi8uS0Ir7n1NFjWbse7RB7aO1hVorZ6/nw2NIo5HwPl29435huFyDoTxp G7JFzAYNWsuJy9xjvIkLjiJ6M/D9z7DdR7IXPAqwXdDveNdsks9YBnDYkPJWXK/EGih7 VwuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=26HVAEmAXiaVkTkZn30bHNRcPh5FOj2wpaRZQvIFJNc=; fh=xDMKQ+1BNi1UtGo3kM0bUs3bKDAdyTN939W944OQMQQ=; b=NfzFKI9Nw7FOlso2qu0DfHC+wgA8cj3gZP8zr+rmk5FdlNqTquv7FOh77Mas2Qhn3J TPfUn0r2hhV2zaejv4NLR9VhFconcU7gy8YQ1n12i81TVZRCJOpQIqz92LAJVT7OinJf +erLpj0TXFfip4xVFpKuMPylvCSwOD1oYRLu77Ics5TGQKxCFDtasb8b+H8JrWdUhntj LkntYOfPxEGsdBZjw6qdGRJstyA/M2TBNNJ9qvE5ltIF9qKYwURreiza9yzkapxfJiJw n5SA4eFqzea9K+jo8rZWN8KTNwMOB9YYZY6A4RNQEWnqcsCPdUC/w3oW1ZBNNf79lrqN NDyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=dMP7oy3C; spf=pass (google.com: domain of linux-kernel+bounces-18645-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18645-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id cx2-20020a170906c80200b00a2783ce1e1asi1593228ejb.838.2024.01.06.08.06.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jan 2024 08:06:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18645-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=dMP7oy3C; spf=pass (google.com: domain of linux-kernel+bounces-18645-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18645-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id DC0F21F21DD8 for ; Sat, 6 Jan 2024 16:06:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 44C79D524; Sat, 6 Jan 2024 16:03:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="dMP7oy3C" X-Original-To: linux-kernel@vger.kernel.org Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FA0D11CA9; Sat, 6 Jan 2024 16:03:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Received: from pyrite.hamster-moth.ts.net (unknown [IPv6:2001:268:c203:a8ee:6c57:4243:1eb3:6cb]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ADC5012E4; Sat, 6 Jan 2024 17:02:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1704556944; bh=9AYpf+w/QgKAToKrG8sZDdY6LCC6lBlgD3flsWYpptg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dMP7oy3CcOQb5j6feezCbsK082pXDPr9cZD4rCLA5xGRHvBjkRTXacuLfEg66oT4u /qgVMyZWqgPuGiAR148XfXKoCyZ/OEK8aU43HII2H10MRACEG3vqZMgNPaqXJHNuHH IxbhoVEO+LaO2tI6ivD7rAUw33hA/BpAhH5/Cde4= 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 , Alexander Stein , 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 v5 06/10] media: rkisp1: Add match data for i.MX8MP ISP Date: Sun, 7 Jan 2024 01:02:17 +0900 Message-Id: <20240106160221.4183409-7-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240106160221.4183409-1-paul.elder@ideasonboard.com> References: <20240106160221.4183409-1-paul.elder@ideasonboard.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787357746370324317 X-GMAIL-MSGID: 1787357746370324317 Add match data to the rkisp1 driver to match the i.MX8MP ISP. Signed-off-by: Paul Elder Reviewed-by: Rob Herring Tested-by: Alexander Stein Tested-by: Adam Ford Reviewed-by: Tomi Valkeinen --- .../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 e79fbd4d7e44..29a8249852d4 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -532,6 +532,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, BIT(RKISP1_IRQ_ISP) | BIT(RKISP1_IRQ_MI) }, +}; + +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", @@ -541,6 +560,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 {