From patchwork Fri Dec 1 14:04:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 172500 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1142101vqy; Fri, 1 Dec 2023 06:05:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMvShxAFo6XzP2fUgs+DXfvTAeQ7L8dNJI6K93mWSXbD+mO7Tjv52+DYY1cg/+M8X65Ijl X-Received: by 2002:a17:903:607:b0:1cf:8a91:a84e with SMTP id kg7-20020a170903060700b001cf8a91a84emr20758046plb.50.1701439511000; Fri, 01 Dec 2023 06:05:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701439510; cv=none; d=google.com; s=arc-20160816; b=OmJ6TwZ8uaxSR+5Ff//fK5KIJPHBfkbEnVdFOZvLMQn9TFQQTOauXbtYfyeyRDDVVR xMQ8s4rwkOZwG2HjPGIeWJFJd0CDMnp9AE1hTKJaXCAKRHQS6hE/sPIrQ4F8ViaAX4x5 66c1SCFYQjyD5IfhzB8VdPWfd08swczvKAOuoCSEIUQTPhCm6oVR/GaU41lzSv3dQiB2 96t4Ffa90n87JCSY1PQyptj0ai7rneDPlF2sBLMge9cFZmOi82tA9+UK2SCGbOuBdvlK zwpXOBAF96wtQ/95zx0nZLXHeU/YONr0N8Wkj88CQBE0wJNMLBZnL8Y96CORzUmiAwt6 DSKg== 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=VFR8SzIqEOONJ6ks4L5si9xhBm/E8JQcQXpiokDIIuI=; fh=I4RLCLw/dMKPX9xPZZ8+mL0LeKDitseWF0AaQr+3mks=; b=DE43xkLO76B2tOilutC4hxO2xp8Jyh1EF3rI5Zr3FaP+ailEjBaTgD/DHQpKqTv6SA 5Lk94a5c1xmd+0BwI99uOnIiUrz6/TIfFKaVnhu14yWI3LKYW5SAuRvuR2gAjC+wPJJk LM0yL5J9LMtGaChvc9IijnFWSPgEbtARkRSXIDZvw9DketjY8CnwnIns34CTZIi0x7+Y Iyj3D7DX9CZa8xta852qmVcxx94uI4ilqJSlWIEM95oqMiVk2s2yAgf1s8m8d+vKwsh6 ai1446Q12u1I4/gM2E7SjB47xf9UHFcxljHSxW8jhKX4uzDlEnTadrLXx/P2w+vKIMUe mYTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="Bs4yQcW/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id c14-20020a170903234e00b001d044978d7esi2729302plh.598.2023.12.01.06.05.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 06:05:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="Bs4yQcW/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id 05A92836E269; Fri, 1 Dec 2023 06:05:00 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379098AbjLAOEv (ORCPT + 99 others); Fri, 1 Dec 2023 09:04:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379060AbjLAOEu (ORCPT ); Fri, 1 Dec 2023 09:04:50 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F6D094; Fri, 1 Dec 2023 06:04:56 -0800 (PST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 22F67138C; Fri, 1 Dec 2023 15:04:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1701439457; bh=6zAIEj5ay2gT7+AvgvT+WUyzdRwwv76PYE4uLNb3qOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bs4yQcW/vUdx9xaVmGD7CpLkHEu69wWuVl/djvZU0fy+fZTmDBUhNtZ6czqnNIUPs aM1PGitQ4siHqyu2UvsLCVLdAXLNbiG2JcPzLNTDHDBj5CZhF0NJ5R8ZKW+DSb8sKo gMcrmimq8GEvoBE0Pn+B+/SeLldJcmSmUX1T9/3Q= From: Paul Elder To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: laurent.pinchart@ideasonboard.com, kieran.bingham@ideasonboard.com, tomi.valkeinen@ideasonboard.com, umang.jain@ideasonboard.com, Paul Elder , Dafna Hirschfeld , 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 v2 1/4] media: rkisp1: regs: Consolidate MI interrupt wrap fields Date: Fri, 1 Dec 2023 23:04:30 +0900 Message-Id: <20231201140433.2126011-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231201140433.2126011-1-paul.elder@ideasonboard.com> References: <20231201140433.2126011-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 morse.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 (morse.vger.email [0.0.0.0]); Fri, 01 Dec 2023 06:05:00 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784088636653727555 X-GMAIL-MSGID: 1784088636653727555 Consolidate the wraparound fields in the memory interface interrupt status registers, so that it can be more succinctly expressed by taking the stream ID (main or self) as a parameter. Signed-off-by: Paul Elder Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h index 350f452e676f..bea69a0d766a 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h @@ -172,12 +172,9 @@ #define RKISP1_CIF_MI_FRAME(stream) BIT((stream)->id) #define RKISP1_CIF_MI_MBLK_LINE BIT(2) #define RKISP1_CIF_MI_FILL_MP_Y BIT(3) -#define RKISP1_CIF_MI_WRAP_MP_Y BIT(4) -#define RKISP1_CIF_MI_WRAP_MP_CB BIT(5) -#define RKISP1_CIF_MI_WRAP_MP_CR BIT(6) -#define RKISP1_CIF_MI_WRAP_SP_Y BIT(7) -#define RKISP1_CIF_MI_WRAP_SP_CB BIT(8) -#define RKISP1_CIF_MI_WRAP_SP_CR BIT(9) +#define RKISP1_CIF_MI_WRAP_Y(stream) BIT(4 + (stream)->id * 3) +#define RKISP1_CIF_MI_WRAP_CB(stream) BIT(5 + (stream)->id * 3) +#define RKISP1_CIF_MI_WRAP_CR(stream) BIT(6 + (stream)->id * 3) #define RKISP1_CIF_MI_DMA_READY BIT(11) /* MI_STATUS */