From: Dafna Hirschfeld <dafna@fastmail.com>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: linux-media@vger.kernel.org, Heiko Stuebner <heiko@sntech.de>,
Paul Elder <paul.elder@ideasonboard.com>,
Tomasz Figa <tfiga@google.com>,
linux-rockchip@lists.infradead.org
Subject: Re: [PATCH v3 09/17] media: rkisp1: regs: Rename CCL, ICCL and IRCL registers with VI_ prefix
Date: Tue, 22 Mar 2022 07:12:23 +0200 [thread overview]
Message-ID: <20220322051223.bszb4r72uk7scxpy@guri> (raw)
In-Reply-To: <20220319163100.3083-10-laurent.pinchart@ideasonboard.com>
On 19.03.2022 18:30, Laurent Pinchart wrote:
> The documentation names the CCL, ICCL and IRCL registers with a VI_
> prefix, like the VI_ID and VI_DPCL registers. Fix the macro names
> accordingly.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
> ---
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 19 +++---
> .../platform/rockchip/rkisp1/rkisp1-params.c | 8 +--
> .../platform/rockchip/rkisp1/rkisp1-regs.h | 60 +++++++++----------
> 3 files changed, 44 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index f84e53b60ee1..e8abb57fb728 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -523,20 +523,21 @@ static void rkisp1_isp_stop(struct rkisp1_device *rkisp1)
> readx_poll_timeout(readl, rkisp1->base_addr + RKISP1_CIF_ISP_RIS,
> val, val & RKISP1_CIF_ISP_OFF, 20, 100);
> rkisp1_write(rkisp1,
> - RKISP1_CIF_IRCL_MIPI_SW_RST | RKISP1_CIF_IRCL_ISP_SW_RST,
> - RKISP1_CIF_IRCL);
> - rkisp1_write(rkisp1, 0x0, RKISP1_CIF_IRCL);
> + RKISP1_CIF_VI_IRCL_MIPI_SW_RST |
> + RKISP1_CIF_VI_IRCL_ISP_SW_RST,
> + RKISP1_CIF_VI_IRCL);
> + rkisp1_write(rkisp1, 0x0, RKISP1_CIF_VI_IRCL);
> }
>
> static void rkisp1_config_clk(struct rkisp1_device *rkisp1)
> {
> - u32 val = RKISP1_CIF_ICCL_ISP_CLK | RKISP1_CIF_ICCL_CP_CLK |
> - RKISP1_CIF_ICCL_MRSZ_CLK | RKISP1_CIF_ICCL_SRSZ_CLK |
> - RKISP1_CIF_ICCL_JPEG_CLK | RKISP1_CIF_ICCL_MI_CLK |
> - RKISP1_CIF_ICCL_IE_CLK | RKISP1_CIF_ICCL_MIPI_CLK |
> - RKISP1_CIF_ICCL_DCROP_CLK;
> + u32 val = RKISP1_CIF_VI_ICCL_ISP_CLK | RKISP1_CIF_VI_ICCL_CP_CLK |
> + RKISP1_CIF_VI_ICCL_MRSZ_CLK | RKISP1_CIF_VI_ICCL_SRSZ_CLK |
> + RKISP1_CIF_VI_ICCL_JPEG_CLK | RKISP1_CIF_VI_ICCL_MI_CLK |
> + RKISP1_CIF_VI_ICCL_IE_CLK | RKISP1_CIF_VI_ICCL_MIPI_CLK |
> + RKISP1_CIF_VI_ICCL_DCROP_CLK;
>
> - rkisp1_write(rkisp1, val, RKISP1_CIF_ICCL);
> + rkisp1_write(rkisp1, val, RKISP1_CIF_VI_ICCL);
>
> /* ensure sp and mp can run at the same time in V12 */
> if (rkisp1->media_dev.hw_revision == RKISP1_V12) {
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> index d41823c861ca..7a172d47d475 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> @@ -1058,8 +1058,8 @@ static void rkisp1_ie_config(struct rkisp1_params *params,
> static void rkisp1_ie_enable(struct rkisp1_params *params, bool en)
> {
> if (en) {
> - rkisp1_param_set_bits(params, RKISP1_CIF_ICCL,
> - RKISP1_CIF_ICCL_IE_CLK);
> + rkisp1_param_set_bits(params, RKISP1_CIF_VI_ICCL,
> + RKISP1_CIF_VI_ICCL_IE_CLK);
> rkisp1_write(params->rkisp1, RKISP1_CIF_IMG_EFF_CTRL_ENABLE,
> RKISP1_CIF_IMG_EFF_CTRL);
> rkisp1_param_set_bits(params, RKISP1_CIF_IMG_EFF_CTRL,
> @@ -1067,8 +1067,8 @@ static void rkisp1_ie_enable(struct rkisp1_params *params, bool en)
> } else {
> rkisp1_param_clear_bits(params, RKISP1_CIF_IMG_EFF_CTRL,
> RKISP1_CIF_IMG_EFF_CTRL_ENABLE);
> - rkisp1_param_clear_bits(params, RKISP1_CIF_ICCL,
> - RKISP1_CIF_ICCL_IE_CLK);
> + rkisp1_param_clear_bits(params, RKISP1_CIF_VI_ICCL,
> + RKISP1_CIF_VI_ICCL_IE_CLK);
> }
> }
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
> index 9e786de23480..4e2b73227e61 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
> @@ -210,7 +210,7 @@
> #define RKISP1_CIF_MI_XTD_FMT_CTRL_SP_CB_CR_SWAP BIT(1)
> #define RKISP1_CIF_MI_XTD_FMT_CTRL_DMA_CB_CR_SWAP BIT(2)
>
> -/* CCL */
> +/* VI_CCL */
> #define RKISP1_CIF_CCL_CIF_CLK_DIS BIT(2)
> /* VI_ISP_CLK_CTRL */
> #define RKISP1_CIF_CLK_CTRL_ISP_RAW BIT(0)
> @@ -241,32 +241,32 @@
> #define RKISP1_CIF_CLK_CTRL_RSZS BIT(25)
> #define RKISP1_CIF_CLK_CTRL_MIPI BIT(26)
> #define RKISP1_CIF_CLK_CTRL_MARVINMI BIT(27)
> -/* ICCL */
> -#define RKISP1_CIF_ICCL_ISP_CLK BIT(0)
> -#define RKISP1_CIF_ICCL_CP_CLK BIT(1)
> -#define RKISP1_CIF_ICCL_RES_2 BIT(2)
> -#define RKISP1_CIF_ICCL_MRSZ_CLK BIT(3)
> -#define RKISP1_CIF_ICCL_SRSZ_CLK BIT(4)
> -#define RKISP1_CIF_ICCL_JPEG_CLK BIT(5)
> -#define RKISP1_CIF_ICCL_MI_CLK BIT(6)
> -#define RKISP1_CIF_ICCL_RES_7 BIT(7)
> -#define RKISP1_CIF_ICCL_IE_CLK BIT(8)
> -#define RKISP1_CIF_ICCL_SIMP_CLK BIT(9)
> -#define RKISP1_CIF_ICCL_SMIA_CLK BIT(10)
> -#define RKISP1_CIF_ICCL_MIPI_CLK BIT(11)
> -#define RKISP1_CIF_ICCL_DCROP_CLK BIT(12)
> -/* IRCL */
> -#define RKISP1_CIF_IRCL_ISP_SW_RST BIT(0)
> -#define RKISP1_CIF_IRCL_CP_SW_RST BIT(1)
> -#define RKISP1_CIF_IRCL_YCS_SW_RST BIT(2)
> -#define RKISP1_CIF_IRCL_MRSZ_SW_RST BIT(3)
> -#define RKISP1_CIF_IRCL_SRSZ_SW_RST BIT(4)
> -#define RKISP1_CIF_IRCL_JPEG_SW_RST BIT(5)
> -#define RKISP1_CIF_IRCL_MI_SW_RST BIT(6)
> -#define RKISP1_CIF_IRCL_CIF_SW_RST BIT(7)
> -#define RKISP1_CIF_IRCL_IE_SW_RST BIT(8)
> -#define RKISP1_CIF_IRCL_SI_SW_RST BIT(9)
> -#define RKISP1_CIF_IRCL_MIPI_SW_RST BIT(11)
> +/* VI_ICCL */
> +#define RKISP1_CIF_VI_ICCL_ISP_CLK BIT(0)
> +#define RKISP1_CIF_VI_ICCL_CP_CLK BIT(1)
> +#define RKISP1_CIF_VI_ICCL_RES_2 BIT(2)
> +#define RKISP1_CIF_VI_ICCL_MRSZ_CLK BIT(3)
> +#define RKISP1_CIF_VI_ICCL_SRSZ_CLK BIT(4)
> +#define RKISP1_CIF_VI_ICCL_JPEG_CLK BIT(5)
> +#define RKISP1_CIF_VI_ICCL_MI_CLK BIT(6)
> +#define RKISP1_CIF_VI_ICCL_RES_7 BIT(7)
> +#define RKISP1_CIF_VI_ICCL_IE_CLK BIT(8)
> +#define RKISP1_CIF_VI_ICCL_SIMP_CLK BIT(9)
> +#define RKISP1_CIF_VI_ICCL_SMIA_CLK BIT(10)
> +#define RKISP1_CIF_VI_ICCL_MIPI_CLK BIT(11)
> +#define RKISP1_CIF_VI_ICCL_DCROP_CLK BIT(12)
> +/* VI_IRCL */
> +#define RKISP1_CIF_VI_IRCL_ISP_SW_RST BIT(0)
> +#define RKISP1_CIF_VI_IRCL_CP_SW_RST BIT(1)
> +#define RKISP1_CIF_VI_IRCL_YCS_SW_RST BIT(2)
> +#define RKISP1_CIF_VI_IRCL_MRSZ_SW_RST BIT(3)
> +#define RKISP1_CIF_VI_IRCL_SRSZ_SW_RST BIT(4)
> +#define RKISP1_CIF_VI_IRCL_JPEG_SW_RST BIT(5)
> +#define RKISP1_CIF_VI_IRCL_MI_SW_RST BIT(6)
> +#define RKISP1_CIF_VI_IRCL_CIF_SW_RST BIT(7)
> +#define RKISP1_CIF_VI_IRCL_IE_SW_RST BIT(8)
> +#define RKISP1_CIF_VI_IRCL_SI_SW_RST BIT(9)
> +#define RKISP1_CIF_VI_IRCL_MIPI_SW_RST BIT(11)
>
> /* C_PROC_CTR */
> #define RKISP1_CIF_C_PROC_CTR_ENABLE BIT(0)
> @@ -687,11 +687,11 @@
> /* CIF Registers */
> /* =================================================================== */
> #define RKISP1_CIF_CTRL_BASE 0x00000000
> -#define RKISP1_CIF_CCL (RKISP1_CIF_CTRL_BASE + 0x00000000)
> +#define RKISP1_CIF_VI_CCL (RKISP1_CIF_CTRL_BASE + 0x00000000)
> #define RKISP1_CIF_VI_ID (RKISP1_CIF_CTRL_BASE + 0x00000008)
> #define RKISP1_CIF_VI_ISP_CLK_CTRL_V12 (RKISP1_CIF_CTRL_BASE + 0x0000000C)
> -#define RKISP1_CIF_ICCL (RKISP1_CIF_CTRL_BASE + 0x00000010)
> -#define RKISP1_CIF_IRCL (RKISP1_CIF_CTRL_BASE + 0x00000014)
> +#define RKISP1_CIF_VI_ICCL (RKISP1_CIF_CTRL_BASE + 0x00000010)
> +#define RKISP1_CIF_VI_IRCL (RKISP1_CIF_CTRL_BASE + 0x00000014)
> #define RKISP1_CIF_VI_DPCL (RKISP1_CIF_CTRL_BASE + 0x00000018)
>
> #define RKISP1_CIF_IMG_EFF_BASE 0x00000200
> --
> Regards,
>
> Laurent Pinchart
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-03-22 5:12 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-19 16:30 [PATCH v3 00/17] media: rkisp1: Misc bug fixes and cleanups Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 01/17] media: rkisp1: capture: Initialize entity before video device Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 02/17] media: rkisp1: capture: Fix and simplify (un)registration Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 03/17] media: rkisp1: isp: " Laurent Pinchart
2022-03-22 4:23 ` Dafna Hirschfeld
2022-03-22 9:58 ` Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 04/17] media: rkisp1: resizer: " Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 05/17] media: rkisp1: params: " Laurent Pinchart
2022-03-22 4:27 ` Dafna Hirschfeld
2022-03-22 10:01 ` Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 06/17] media: rkisp1: stats: Simplify (un)registration Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 07/17] media: rkisp1: Simplify rkisp1_entities_register() error path Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 08/17] media: rkisp1: regs: Don't use BIT() macro for multi-bit register fields Laurent Pinchart
2022-03-22 5:07 ` Dafna Hirschfeld
2022-03-19 16:30 ` [PATCH v3 09/17] media: rkisp1: regs: Rename CCL, ICCL and IRCL registers with VI_ prefix Laurent Pinchart
2022-03-22 5:12 ` Dafna Hirschfeld [this message]
2022-03-19 16:30 ` [PATCH v3 10/17] media: rkisp1: Swap value and address arguments to rkisp1_write() Laurent Pinchart
2022-03-22 4:37 ` Dafna Hirschfeld
2022-03-19 16:30 ` [PATCH v3 11/17] media: rkisp1: resizer: Simplify register access Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 12/17] media: rkisp1: Move debugfs code to a separate file Laurent Pinchart
2022-03-22 4:12 ` Dafna Hirschfeld
2022-03-19 16:30 ` [PATCH v3 13/17] media: rkisp1: Compile debugfs support conditionally Laurent Pinchart
2022-03-21 12:11 ` kernel test robot
2022-03-21 12:44 ` [PATCH v3.1 " Laurent Pinchart
2022-03-22 4:12 ` Dafna Hirschfeld
2022-03-19 16:30 ` [PATCH v3 14/17] media: rkisp1: debug: Collect input status by sampling ISP_FLAGS_SHD Laurent Pinchart
2022-03-22 3:56 ` Dafna Hirschfeld
2022-03-22 8:32 ` Laurent Pinchart
2022-03-25 18:22 ` Dafna Hirschfeld
2022-03-19 16:30 ` [PATCH v3 15/17] media: rkisp1: debug: Add debugfs files to dump core and ISP registers Laurent Pinchart
2022-03-22 5:25 ` Dafna Hirschfeld
2022-03-22 10:08 ` Laurent Pinchart
2022-03-19 16:30 ` [PATCH v3 16/17] media: rkisp1: debug: Move resizer register dump to debugfs Laurent Pinchart
2022-03-22 5:28 ` Dafna Hirschfeld
2022-03-22 10:10 ` Laurent Pinchart
2022-03-19 16:31 ` [PATCH v3 17/17] media: rkisp1: capture: Bypass the main device for handling querycap Laurent Pinchart
2022-03-22 5:08 ` Dafna Hirschfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220322051223.bszb4r72uk7scxpy@guri \
--to=dafna@fastmail.com \
--cc=heiko@sntech.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=paul.elder@ideasonboard.com \
--cc=tfiga@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox