From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F320C25B08 for ; Thu, 18 Aug 2022 02:39:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242520AbiHRCjp (ORCPT ); Wed, 17 Aug 2022 22:39:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239758AbiHRCjo (ORCPT ); Wed, 17 Aug 2022 22:39:44 -0400 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CADC59BB4B for ; Wed, 17 Aug 2022 19:39:43 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 20E3A5C01AA; Wed, 17 Aug 2022 22:39:43 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 17 Aug 2022 22:39:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1660790383; x=1660876783; bh=0UMjzrOPfC CIi/3a2S1KGkKaCVMB7rOXiZlyRaT5lsY=; b=jQZwfOkr7f/OtaUy0235764faZ A5/OS3j4fDAOjKP22lnrnYI4xACRXyUX1lgNoZyZZbd7IaNRrHp89h6KYz2GyYHZ ECOdzWCT1zO97i4IaidckPooQ04EfjdGVbVj81YhvH6FoeCLZY4YmILJ6b5FFBtE Y4xtIXCemj42k+xNIv7KFw/avrGt6cXIvrQYfGXbE3w8Xj080pCrMWxvX7nU+zsn zLwqoIMeYohB/+qDKx6UrVcFjas65+tYZb1M/Mivj3ziBOESaZKKBBaA3FxkX+fH tFuJ7tvuzg6K67UcHPTMLr1HanDMf6ICt7jSdrG5EEDPE3GiGyqC7ASZuvig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1660790383; x=1660876783; bh=0UMjzrOPfCCIi/3a2S1KGkKaCVMB 7rOXiZlyRaT5lsY=; b=3Xk1xYvU4jrtTanJu8N1sJ9Sbvu9kphcXR/c7wvb/O9H x6qv2AO/SkWY4jz6ue2wT0cgeaCaXacZ5w2jF6ZwDBGmGDqV62MSDhu2qVcLktOV 3m0I9HLt50HfBXD4P4ZTVZp5noY1Ac6SzyhNBoAxdcL20PTJ1juZsvxhtvlpjZS1 fdRVu098zEh7VJqOQwlnvA3tBsHhX9mPV0k8HuvsqFoy2rEx0VMUcZsd6jxRb8PO 5odYf2KomA8mru5kzS3v9W4esMuvuHNL0HTRjqhidYsW1jKNAeLAkI8CPXEiUgZP y3ocuGgFvCUX0cgK3uZXM60iK1gunTQYxRlShH17jQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehjedgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtjeenucfhrhhomhepffgrfhhn rgcujfhirhhstghhfhgvlhguuceouggrfhhnrgesfhgrshhtmhgrihhlrdgtohhmqeenuc ggtffrrghtthgvrhhnpedvhedtledukeegveelfeeuvddujeeiteehkedvhfetkeffudej hfeftdduhedvkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpegurghfnhgrsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i0e894699:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 17 Aug 2022 22:39:40 -0400 (EDT) Date: Thu, 18 Aug 2022 05:39:38 +0300 From: Dafna Hirschfeld To: Laurent Pinchart Cc: linux-media@vger.kernel.org, Heiko Stuebner , linux-rockchip@lists.infradead.org, Paul Elder , Florian Sylvestre Subject: Re: [PATCH 3/5] media: rkisp1: Simplify LSC x/y size and grad register macros Message-ID: <20220818023938.aslenrngaat5y5o6@guri> References: <20220817021850.20460-1-laurent.pinchart@ideasonboard.com> <20220817021850.20460-4-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline In-Reply-To: <20220817021850.20460-4-laurent.pinchart@ideasonboard.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 17.08.2022 05:18, Laurent Pinchart wrote: >The LSC module x/y size and grad configuration is stored in a set of 4 >indexed registers each. The rkisp1-regs.h header defines all those >registers, but only the first one in each set is used, with manual >calculation of addresses of subsequent registers. Simplifies this by >merging all 4 register macros into one that takes the index as a >parameter. No functional change intended. > >Signed-off-by: Laurent Pinchart Reviewed-by: Dafna Hirschfeld >--- > .../platform/rockchip/rkisp1/rkisp1-params.c | 8 ++++---- > .../platform/rockchip/rkisp1/rkisp1-regs.h | 20 ++++--------------- > 2 files changed, 8 insertions(+), 20 deletions(-) > >diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c >index dbe826fd02d2..aa6efa4c6e9e 100644 >--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c >+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c >@@ -331,22 +331,22 @@ static void rkisp1_lsc_config(struct rkisp1_params *params, > /* program x size tables */ > data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2], > arg->x_size_tbl[i * 2 + 1]); >- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data); >+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data); > > /* program x grad tables */ > data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2], > arg->x_grad_tbl[i * 2 + 1]); >- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data); >+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data); > > /* program y size tables */ > data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2], > arg->y_size_tbl[i * 2 + 1]); >- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data); >+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data); > > /* program y grad tables */ > data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2], > arg->y_grad_tbl[i * 2 + 1]); >- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data); >+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data); > } > > /* restore the lsc ctrl status */ >diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h >index 044af3d6e4f3..2ad24deedec8 100644 >--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h >+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h >@@ -1162,22 +1162,10 @@ > #define RKISP1_CIF_ISP_LSC_GR_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000018) > #define RKISP1_CIF_ISP_LSC_B_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x0000001C) > #define RKISP1_CIF_ISP_LSC_GB_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000020) >-#define RKISP1_CIF_ISP_LSC_XGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000024) >-#define RKISP1_CIF_ISP_LSC_XGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000028) >-#define RKISP1_CIF_ISP_LSC_XGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000002C) >-#define RKISP1_CIF_ISP_LSC_XGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000030) >-#define RKISP1_CIF_ISP_LSC_YGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000034) >-#define RKISP1_CIF_ISP_LSC_YGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000038) >-#define RKISP1_CIF_ISP_LSC_YGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000003C) >-#define RKISP1_CIF_ISP_LSC_YGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000040) >-#define RKISP1_CIF_ISP_LSC_XSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000044) >-#define RKISP1_CIF_ISP_LSC_XSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000048) >-#define RKISP1_CIF_ISP_LSC_XSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000004C) >-#define RKISP1_CIF_ISP_LSC_XSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000050) >-#define RKISP1_CIF_ISP_LSC_YSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000054) >-#define RKISP1_CIF_ISP_LSC_YSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000058) >-#define RKISP1_CIF_ISP_LSC_YSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000005C) >-#define RKISP1_CIF_ISP_LSC_YSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000060) >+#define RKISP1_CIF_ISP_LSC_XGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000024 + (n) * 4) >+#define RKISP1_CIF_ISP_LSC_YGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000034 + (n) * 4) >+#define RKISP1_CIF_ISP_LSC_XSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000044 + (n) * 4) >+#define RKISP1_CIF_ISP_LSC_YSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000054 + (n) * 4) > #define RKISP1_CIF_ISP_LSC_TABLE_SEL (RKISP1_CIF_ISP_LSC_BASE + 0x00000064) > #define RKISP1_CIF_ISP_LSC_STATUS (RKISP1_CIF_ISP_LSC_BASE + 0x00000068) > >-- >Regards, > >Laurent Pinchart > From mboxrd@z Thu Jan 1 00:00:00 1970 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 E6487C25B08 for ; Thu, 18 Aug 2022 02:39:56 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NNEGh3XAu9kjvV+dPaC8Q/TwtEqecV+i98sEDZRw5Kg=; b=BfcqvOYVlczr2Qt+K/zt6EO11M DfPbdLwYCwXixpnFREymWzAprwx2vELciUxcZZMaNUDUZ3P6UsQF9RO7WQkDNa/7OxWu2uKYiMH7c gT5PJXCbVKAylNHmunBE/rwU1sT9nDdP8JvVZLPYRFYsLIfVmqDMCpC1jJCmZPc1Hhrwhpvk5XJRQ t3RoveebVK6p0kWXsw2KnygxcNDA84a5N+81x23JebtnmBBe8W1d+9T9ZVOCYMIywk9AxFi23HngG NT5ed5mn1EF24i0e+UmKbQDp5gZMhnNAiNxOhmxVKr5Pi1n1sTRDCsA4VfEFqm5V/WcWNinufHb2/ 6w62JP2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOVRj-00Bjiw-4c; Thu, 18 Aug 2022 02:39:47 +0000 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOVRf-00Bjc1-UD for linux-rockchip@lists.infradead.org; Thu, 18 Aug 2022 02:39:45 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 20E3A5C01AA; Wed, 17 Aug 2022 22:39:43 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 17 Aug 2022 22:39:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1660790383; x=1660876783; bh=0UMjzrOPfC CIi/3a2S1KGkKaCVMB7rOXiZlyRaT5lsY=; b=jQZwfOkr7f/OtaUy0235764faZ A5/OS3j4fDAOjKP22lnrnYI4xACRXyUX1lgNoZyZZbd7IaNRrHp89h6KYz2GyYHZ ECOdzWCT1zO97i4IaidckPooQ04EfjdGVbVj81YhvH6FoeCLZY4YmILJ6b5FFBtE Y4xtIXCemj42k+xNIv7KFw/avrGt6cXIvrQYfGXbE3w8Xj080pCrMWxvX7nU+zsn zLwqoIMeYohB/+qDKx6UrVcFjas65+tYZb1M/Mivj3ziBOESaZKKBBaA3FxkX+fH tFuJ7tvuzg6K67UcHPTMLr1HanDMf6ICt7jSdrG5EEDPE3GiGyqC7ASZuvig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1660790383; x=1660876783; bh=0UMjzrOPfCCIi/3a2S1KGkKaCVMB 7rOXiZlyRaT5lsY=; b=3Xk1xYvU4jrtTanJu8N1sJ9Sbvu9kphcXR/c7wvb/O9H x6qv2AO/SkWY4jz6ue2wT0cgeaCaXacZ5w2jF6ZwDBGmGDqV62MSDhu2qVcLktOV 3m0I9HLt50HfBXD4P4ZTVZp5noY1Ac6SzyhNBoAxdcL20PTJ1juZsvxhtvlpjZS1 fdRVu098zEh7VJqOQwlnvA3tBsHhX9mPV0k8HuvsqFoy2rEx0VMUcZsd6jxRb8PO 5odYf2KomA8mru5kzS3v9W4esMuvuHNL0HTRjqhidYsW1jKNAeLAkI8CPXEiUgZP y3ocuGgFvCUX0cgK3uZXM60iK1gunTQYxRlShH17jQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehjedgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtjeenucfhrhhomhepffgrfhhn rgcujfhirhhstghhfhgvlhguuceouggrfhhnrgesfhgrshhtmhgrihhlrdgtohhmqeenuc ggtffrrghtthgvrhhnpedvhedtledukeegveelfeeuvddujeeiteehkedvhfetkeffudej hfeftdduhedvkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpegurghfnhgrsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i0e894699:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 17 Aug 2022 22:39:40 -0400 (EDT) Date: Thu, 18 Aug 2022 05:39:38 +0300 From: Dafna Hirschfeld To: Laurent Pinchart Cc: linux-media@vger.kernel.org, Heiko Stuebner , linux-rockchip@lists.infradead.org, Paul Elder , Florian Sylvestre Subject: Re: [PATCH 3/5] media: rkisp1: Simplify LSC x/y size and grad register macros Message-ID: <20220818023938.aslenrngaat5y5o6@guri> References: <20220817021850.20460-1-laurent.pinchart@ideasonboard.com> <20220817021850.20460-4-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220817021850.20460-4-laurent.pinchart@ideasonboard.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220817_193944_126153_94CDDDDC X-CRM114-Status: UNSURE ( 9.26 ) X-CRM114-Notice: Please train this message. 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On 17.08.2022 05:18, Laurent Pinchart wrote: >The LSC module x/y size and grad configuration is stored in a set of 4 >indexed registers each. The rkisp1-regs.h header defines all those >registers, but only the first one in each set is used, with manual >calculation of addresses of subsequent registers. Simplifies this by >merging all 4 register macros into one that takes the index as a >parameter. No functional change intended. > >Signed-off-by: Laurent Pinchart Reviewed-by: Dafna Hirschfeld >--- > .../platform/rockchip/rkisp1/rkisp1-params.c | 8 ++++---- > .../platform/rockchip/rkisp1/rkisp1-regs.h | 20 ++++--------------- > 2 files changed, 8 insertions(+), 20 deletions(-) > >diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c >index dbe826fd02d2..aa6efa4c6e9e 100644 >--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c >+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c >@@ -331,22 +331,22 @@ static void rkisp1_lsc_config(struct rkisp1_params *params, > /* program x size tables */ > data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2], > arg->x_size_tbl[i * 2 + 1]); >- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data); >+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data); > > /* program x grad tables */ > data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2], > arg->x_grad_tbl[i * 2 + 1]); >- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data); >+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data); > > /* program y size tables */ > data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2], > arg->y_size_tbl[i * 2 + 1]); >- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data); >+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data); > > /* program y grad tables */ > data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2], > arg->y_grad_tbl[i * 2 + 1]); >- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data); >+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data); > } > > /* restore the lsc ctrl status */ >diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h >index 044af3d6e4f3..2ad24deedec8 100644 >--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h >+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h >@@ -1162,22 +1162,10 @@ > #define RKISP1_CIF_ISP_LSC_GR_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000018) > #define RKISP1_CIF_ISP_LSC_B_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x0000001C) > #define RKISP1_CIF_ISP_LSC_GB_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000020) >-#define RKISP1_CIF_ISP_LSC_XGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000024) >-#define RKISP1_CIF_ISP_LSC_XGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000028) >-#define RKISP1_CIF_ISP_LSC_XGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000002C) >-#define RKISP1_CIF_ISP_LSC_XGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000030) >-#define RKISP1_CIF_ISP_LSC_YGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000034) >-#define RKISP1_CIF_ISP_LSC_YGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000038) >-#define RKISP1_CIF_ISP_LSC_YGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000003C) >-#define RKISP1_CIF_ISP_LSC_YGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000040) >-#define RKISP1_CIF_ISP_LSC_XSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000044) >-#define RKISP1_CIF_ISP_LSC_XSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000048) >-#define RKISP1_CIF_ISP_LSC_XSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000004C) >-#define RKISP1_CIF_ISP_LSC_XSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000050) >-#define RKISP1_CIF_ISP_LSC_YSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000054) >-#define RKISP1_CIF_ISP_LSC_YSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000058) >-#define RKISP1_CIF_ISP_LSC_YSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000005C) >-#define RKISP1_CIF_ISP_LSC_YSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000060) >+#define RKISP1_CIF_ISP_LSC_XGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000024 + (n) * 4) >+#define RKISP1_CIF_ISP_LSC_YGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000034 + (n) * 4) >+#define RKISP1_CIF_ISP_LSC_XSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000044 + (n) * 4) >+#define RKISP1_CIF_ISP_LSC_YSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000054 + (n) * 4) > #define RKISP1_CIF_ISP_LSC_TABLE_SEL (RKISP1_CIF_ISP_LSC_BASE + 0x00000064) > #define RKISP1_CIF_ISP_LSC_STATUS (RKISP1_CIF_ISP_LSC_BASE + 0x00000068) > >-- >Regards, > >Laurent Pinchart > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip