From: Michael Riesch <michael.riesch@collabora.com>
To: Amin Gattout <amin.gattout@gmail.com>,
Mehdi Djait <mehdi.djait@linux.intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Heiko Stuebner <heiko@sntech.de>
Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 4/5] media: rockchip: rkcif: add support for rk3576 vicap mipi capture
Date: Thu, 1 Oct 2026 17:30:21 +0200 [thread overview]
Message-ID: <74d65aee-043e-42a1-bdb8-c1889c4c19a8@collabora.com> (raw)
In-Reply-To: <20260921-vicap-rk3576-v2-4-0a4582e20c72@gmail.com>
Hi Amin,
Thanks for the patch!
On 9/21/26 17:30, Amin Gattout wrote:
> The RK3576 Video Capture (VICAP) unit features a Digital Video Port
> (DVP) and five MIPI CSI-2 capture interfaces. Compared to the RK3588
> variant, the MIPI register blocks are laid out differently (there is
> no block at offset 0x200), the ID_CTRL0 bit layout has changed, and
> the VC/DT filter has moved from ID_CTRL0 to ID_CTRL1. The capture
> size, which the other variants configure in ID_CTRL1, lives in the
> ID_SET_SIZE register.
>
> On the RK3576 the pixel clock of each MIPI port enters the VICAP
> through a dedicated CRU gate (CLK_VICAP_I0CLK to CLK_VICAP_I4CLK),
> so the variant claims these five clocks in addition to aclk, hclk
> and dclk.
>
> Signed-off-by: Amin Gattout <amin.gattout@gmail.com>
Reviewed-by: Michael Riesch <michael.riesch@collabora.com>
(and with that, for the complete patch series)
Best regards,
Michael
> ---
> .../platform/rockchip/rkcif/rkcif-capture-mipi.c | 140 +++++++++++++++++++++
> .../platform/rockchip/rkcif/rkcif-capture-mipi.h | 1 +
> .../media/platform/rockchip/rkcif/rkcif-common.h | 2 +-
> drivers/media/platform/rockchip/rkcif/rkcif-dev.c | 21 ++++
> 4 files changed, 163 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c
> index 432f47a1fc23..53e62d059764 100644
> --- a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c
> +++ b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c
> @@ -30,6 +30,14 @@
> #define RK3568_MIPI_CTRL0_CROP_EN BIT(5)
> #define RK3568_MIPI_CTRL0_WRDDR(type) ((type) << 1)
>
> +#define RK3576_MIPI_CTRL0_HIGH_ALIGN BIT(11)
> +#define RK3576_MIPI_CTRL0_WRDDR(type) ((type) << 8)
> +#define RK3576_MIPI_CTRL0_PARSE(type) ((type) << 4)
> +#define RK3576_MIPI_CTRL0_DMA_EN BIT(3)
> +#define RK3576_MIPI_CTRL0_CROP_EN BIT(1)
> +
> +#define RK3576_MIPI_CTRL1_DT(dt) ((dt) << 2)
> +
> #define RK3588_MIPI_CTRL0_DMA_EN BIT(28)
> #define RK3588_MIPI_CTRL0_HIGH_ALIGN BIT(27)
> #define RK3588_MIPI_CTRL0_WRDDR(type) ((type) << 5)
> @@ -490,6 +498,138 @@ const struct rkcif_mipi_match_data rkcif_rk3568_vicap_mipi_match_data = {
> },
> };
>
> +static u32
> +rkcif_rk3576_mipi_ctrl0(struct rkcif_stream *stream,
> + const struct rkcif_output_fmt *active_out_fmt)
> +{
> + u32 ctrl0 = RKCIF_MIPI_CTRL0_CAP_EN | RK3576_MIPI_CTRL0_DMA_EN |
> + RK3576_MIPI_CTRL0_CROP_EN;
> +
> + switch (active_out_fmt->mipi.type) {
> + case RKCIF_MIPI_TYPE_RAW8:
> + break;
> + case RKCIF_MIPI_TYPE_RAW10:
> + ctrl0 |= RK3576_MIPI_CTRL0_PARSE(0x1);
> + if (!active_out_fmt->mipi.compact)
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x1);
> + break;
> + case RKCIF_MIPI_TYPE_RAW12:
> + ctrl0 |= RK3576_MIPI_CTRL0_PARSE(0x2);
> + if (!active_out_fmt->mipi.compact)
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x1);
> + break;
> + case RKCIF_MIPI_TYPE_RGB888:
> + ctrl0 |= RK3576_MIPI_CTRL0_PARSE(0x7);
> + break;
> + case RKCIF_MIPI_TYPE_YUV422SP:
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x4);
> + break;
> + case RKCIF_MIPI_TYPE_YUV420SP:
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x5);
> + break;
> + case RKCIF_MIPI_TYPE_YUV400:
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x3);
> + break;
> + default:
> + break;
> + }
> +
> + return ctrl0;
> +}
> +
> +static u32
> +rkcif_rk3576_mipi_ctrl1(struct rkcif_stream *stream,
> + const struct rkcif_output_fmt *active_out_fmt)
> +{
> + return RK3576_MIPI_CTRL1_DT(active_out_fmt->mipi.dt);
> +}
> +
> +const struct rkcif_mipi_match_data rkcif_rk3576_vicap_mipi_match_data = {
> + .mipi_num = 5,
> + .mipi_ctrl0 = rkcif_rk3576_mipi_ctrl0,
> + .mipi_ctrl1 = rkcif_rk3576_mipi_ctrl1,
> + .regs = {
> + [RKCIF_MIPI_CTRL] = 0x20,
> + [RKCIF_MIPI_INTEN] = 0x74,
> + [RKCIF_MIPI_INTSTAT] = 0x78,
> + },
> + .regs_id = {
> + [RKCIF_ID0] = {
> + [RKCIF_MIPI_CTRL0] = 0x00,
> + [RKCIF_MIPI_CTRL1] = 0x04,
> + [RKCIF_MIPI_FRAME0_ADDR_Y] = 0x24,
> + [RKCIF_MIPI_FRAME0_ADDR_UV] = 0x2c,
> + [RKCIF_MIPI_FRAME0_VLW_Y] = 0x34,
> + [RKCIF_MIPI_FRAME0_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_ADDR_Y] = 0x28,
> + [RKCIF_MIPI_FRAME1_ADDR_UV] = 0x30,
> + [RKCIF_MIPI_FRAME1_VLW_Y] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_CROP_START] = 0x90,
> + [RKCIF_MIPI_SET_SIZE] = 0xa0,
> + },
> + [RKCIF_ID1] = {
> + [RKCIF_MIPI_CTRL0] = 0x08,
> + [RKCIF_MIPI_CTRL1] = 0x0c,
> + [RKCIF_MIPI_FRAME0_ADDR_Y] = 0x38,
> + [RKCIF_MIPI_FRAME0_ADDR_UV] = 0x40,
> + [RKCIF_MIPI_FRAME0_VLW_Y] = 0x48,
> + [RKCIF_MIPI_FRAME0_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_ADDR_Y] = 0x3c,
> + [RKCIF_MIPI_FRAME1_ADDR_UV] = 0x44,
> + [RKCIF_MIPI_FRAME1_VLW_Y] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_CROP_START] = 0x94,
> + [RKCIF_MIPI_SET_SIZE] = 0xa4,
> + },
> + [RKCIF_ID2] = {
> + [RKCIF_MIPI_CTRL0] = 0x10,
> + [RKCIF_MIPI_CTRL1] = 0x14,
> + [RKCIF_MIPI_FRAME0_ADDR_Y] = 0x4c,
> + [RKCIF_MIPI_FRAME0_ADDR_UV] = 0x54,
> + [RKCIF_MIPI_FRAME0_VLW_Y] = 0x5c,
> + [RKCIF_MIPI_FRAME0_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_ADDR_Y] = 0x50,
> + [RKCIF_MIPI_FRAME1_ADDR_UV] = 0x58,
> + [RKCIF_MIPI_FRAME1_VLW_Y] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_CROP_START] = 0x98,
> + [RKCIF_MIPI_SET_SIZE] = 0xa8,
> + },
> + [RKCIF_ID3] = {
> + [RKCIF_MIPI_CTRL0] = 0x18,
> + [RKCIF_MIPI_CTRL1] = 0x1c,
> + [RKCIF_MIPI_FRAME0_ADDR_Y] = 0x60,
> + [RKCIF_MIPI_FRAME0_ADDR_UV] = 0x68,
> + [RKCIF_MIPI_FRAME0_VLW_Y] = 0x70,
> + [RKCIF_MIPI_FRAME0_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_ADDR_Y] = 0x64,
> + [RKCIF_MIPI_FRAME1_ADDR_UV] = 0x6c,
> + [RKCIF_MIPI_FRAME1_VLW_Y] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_CROP_START] = 0x9c,
> + [RKCIF_MIPI_SET_SIZE] = 0xac,
> + },
> + },
> + .blocks = {
> + {
> + .offset = 0x100,
> + },
> + {
> + .offset = 0x300,
> + },
> + {
> + .offset = 0x400,
> + },
> + {
> + .offset = 0x500,
> + },
> + {
> + .offset = 0x600,
> + },
> + },
> +};
> +
> static u32
> rkcif_rk3588_mipi_ctrl0(struct rkcif_stream *stream,
> const struct rkcif_output_fmt *active_out_fmt)
> diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.h b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.h
> index 7edaca44f653..4e17cbc04b76 100644
> --- a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.h
> +++ b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.h
> @@ -13,6 +13,7 @@
> #include "rkcif-common.h"
>
> extern const struct rkcif_mipi_match_data rkcif_rk3568_vicap_mipi_match_data;
> +extern const struct rkcif_mipi_match_data rkcif_rk3576_vicap_mipi_match_data;
> extern const struct rkcif_mipi_match_data rkcif_rk3588_vicap_mipi_match_data;
>
> int rkcif_mipi_register(struct rkcif_device *rkcif);
> diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-common.h b/drivers/media/platform/rockchip/rkcif/rkcif-common.h
> index f83c8099b78e..08a213438d34 100644
> --- a/drivers/media/platform/rockchip/rkcif/rkcif-common.h
> +++ b/drivers/media/platform/rockchip/rkcif/rkcif-common.h
> @@ -27,7 +27,7 @@
> #include "rkcif-regs.h"
>
> #define RKCIF_DRIVER_NAME "rockchip-cif"
> -#define RKCIF_CLK_MAX 5
> +#define RKCIF_CLK_MAX 8
>
> enum rkcif_format_type {
> RKCIF_FMT_TYPE_INVALID,
> diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-dev.c b/drivers/media/platform/rockchip/rkcif/rkcif-dev.c
> index be3a174b9aab..2a5758776b3e 100644
> --- a/drivers/media/platform/rockchip/rkcif/rkcif-dev.c
> +++ b/drivers/media/platform/rockchip/rkcif/rkcif-dev.c
> @@ -53,6 +53,23 @@ static const struct rkcif_match_data rk3568_vicap_match_data = {
> .mipi = &rkcif_rk3568_vicap_mipi_match_data,
> };
>
> +static const char *const rk3576_vicap_clks[] = {
> + "aclk",
> + "hclk",
> + "dclk",
> + "iclk",
> + "iclk1",
> + "iclk2",
> + "iclk3",
> + "iclk4",
> +};
> +
> +static const struct rkcif_match_data rk3576_vicap_match_data = {
> + .clks = rk3576_vicap_clks,
> + .clks_num = ARRAY_SIZE(rk3576_vicap_clks),
> + .mipi = &rkcif_rk3576_vicap_mipi_match_data,
> +};
> +
> static const char *const rk3588_vicap_clks[] = {
> "aclk",
> "hclk",
> @@ -76,6 +93,10 @@ static const struct of_device_id rkcif_plat_of_match[] = {
> .compatible = "rockchip,rk3568-vicap",
> .data = &rk3568_vicap_match_data,
> },
> + {
> + .compatible = "rockchip,rk3576-vicap",
> + .data = &rk3576_vicap_match_data,
> + },
> {
> .compatible = "rockchip,rk3588-vicap",
> .data = &rk3588_vicap_match_data,
>
WARNING: multiple messages have this Message-ID (diff)
From: Michael Riesch <michael.riesch@collabora.com>
To: Amin Gattout <amin.gattout@gmail.com>,
Mehdi Djait <mehdi.djait@linux.intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Heiko Stuebner <heiko@sntech.de>
Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 4/5] media: rockchip: rkcif: add support for rk3576 vicap mipi capture
Date: Thu, 1 Oct 2026 17:30:21 +0200 [thread overview]
Message-ID: <74d65aee-043e-42a1-bdb8-c1889c4c19a8@collabora.com> (raw)
In-Reply-To: <20260921-vicap-rk3576-v2-4-0a4582e20c72@gmail.com>
Hi Amin,
Thanks for the patch!
On 9/21/26 17:30, Amin Gattout wrote:
> The RK3576 Video Capture (VICAP) unit features a Digital Video Port
> (DVP) and five MIPI CSI-2 capture interfaces. Compared to the RK3588
> variant, the MIPI register blocks are laid out differently (there is
> no block at offset 0x200), the ID_CTRL0 bit layout has changed, and
> the VC/DT filter has moved from ID_CTRL0 to ID_CTRL1. The capture
> size, which the other variants configure in ID_CTRL1, lives in the
> ID_SET_SIZE register.
>
> On the RK3576 the pixel clock of each MIPI port enters the VICAP
> through a dedicated CRU gate (CLK_VICAP_I0CLK to CLK_VICAP_I4CLK),
> so the variant claims these five clocks in addition to aclk, hclk
> and dclk.
>
> Signed-off-by: Amin Gattout <amin.gattout@gmail.com>
Reviewed-by: Michael Riesch <michael.riesch@collabora.com>
(and with that, for the complete patch series)
Best regards,
Michael
> ---
> .../platform/rockchip/rkcif/rkcif-capture-mipi.c | 140 +++++++++++++++++++++
> .../platform/rockchip/rkcif/rkcif-capture-mipi.h | 1 +
> .../media/platform/rockchip/rkcif/rkcif-common.h | 2 +-
> drivers/media/platform/rockchip/rkcif/rkcif-dev.c | 21 ++++
> 4 files changed, 163 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c
> index 432f47a1fc23..53e62d059764 100644
> --- a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c
> +++ b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c
> @@ -30,6 +30,14 @@
> #define RK3568_MIPI_CTRL0_CROP_EN BIT(5)
> #define RK3568_MIPI_CTRL0_WRDDR(type) ((type) << 1)
>
> +#define RK3576_MIPI_CTRL0_HIGH_ALIGN BIT(11)
> +#define RK3576_MIPI_CTRL0_WRDDR(type) ((type) << 8)
> +#define RK3576_MIPI_CTRL0_PARSE(type) ((type) << 4)
> +#define RK3576_MIPI_CTRL0_DMA_EN BIT(3)
> +#define RK3576_MIPI_CTRL0_CROP_EN BIT(1)
> +
> +#define RK3576_MIPI_CTRL1_DT(dt) ((dt) << 2)
> +
> #define RK3588_MIPI_CTRL0_DMA_EN BIT(28)
> #define RK3588_MIPI_CTRL0_HIGH_ALIGN BIT(27)
> #define RK3588_MIPI_CTRL0_WRDDR(type) ((type) << 5)
> @@ -490,6 +498,138 @@ const struct rkcif_mipi_match_data rkcif_rk3568_vicap_mipi_match_data = {
> },
> };
>
> +static u32
> +rkcif_rk3576_mipi_ctrl0(struct rkcif_stream *stream,
> + const struct rkcif_output_fmt *active_out_fmt)
> +{
> + u32 ctrl0 = RKCIF_MIPI_CTRL0_CAP_EN | RK3576_MIPI_CTRL0_DMA_EN |
> + RK3576_MIPI_CTRL0_CROP_EN;
> +
> + switch (active_out_fmt->mipi.type) {
> + case RKCIF_MIPI_TYPE_RAW8:
> + break;
> + case RKCIF_MIPI_TYPE_RAW10:
> + ctrl0 |= RK3576_MIPI_CTRL0_PARSE(0x1);
> + if (!active_out_fmt->mipi.compact)
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x1);
> + break;
> + case RKCIF_MIPI_TYPE_RAW12:
> + ctrl0 |= RK3576_MIPI_CTRL0_PARSE(0x2);
> + if (!active_out_fmt->mipi.compact)
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x1);
> + break;
> + case RKCIF_MIPI_TYPE_RGB888:
> + ctrl0 |= RK3576_MIPI_CTRL0_PARSE(0x7);
> + break;
> + case RKCIF_MIPI_TYPE_YUV422SP:
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x4);
> + break;
> + case RKCIF_MIPI_TYPE_YUV420SP:
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x5);
> + break;
> + case RKCIF_MIPI_TYPE_YUV400:
> + ctrl0 |= RK3576_MIPI_CTRL0_WRDDR(0x3);
> + break;
> + default:
> + break;
> + }
> +
> + return ctrl0;
> +}
> +
> +static u32
> +rkcif_rk3576_mipi_ctrl1(struct rkcif_stream *stream,
> + const struct rkcif_output_fmt *active_out_fmt)
> +{
> + return RK3576_MIPI_CTRL1_DT(active_out_fmt->mipi.dt);
> +}
> +
> +const struct rkcif_mipi_match_data rkcif_rk3576_vicap_mipi_match_data = {
> + .mipi_num = 5,
> + .mipi_ctrl0 = rkcif_rk3576_mipi_ctrl0,
> + .mipi_ctrl1 = rkcif_rk3576_mipi_ctrl1,
> + .regs = {
> + [RKCIF_MIPI_CTRL] = 0x20,
> + [RKCIF_MIPI_INTEN] = 0x74,
> + [RKCIF_MIPI_INTSTAT] = 0x78,
> + },
> + .regs_id = {
> + [RKCIF_ID0] = {
> + [RKCIF_MIPI_CTRL0] = 0x00,
> + [RKCIF_MIPI_CTRL1] = 0x04,
> + [RKCIF_MIPI_FRAME0_ADDR_Y] = 0x24,
> + [RKCIF_MIPI_FRAME0_ADDR_UV] = 0x2c,
> + [RKCIF_MIPI_FRAME0_VLW_Y] = 0x34,
> + [RKCIF_MIPI_FRAME0_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_ADDR_Y] = 0x28,
> + [RKCIF_MIPI_FRAME1_ADDR_UV] = 0x30,
> + [RKCIF_MIPI_FRAME1_VLW_Y] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_CROP_START] = 0x90,
> + [RKCIF_MIPI_SET_SIZE] = 0xa0,
> + },
> + [RKCIF_ID1] = {
> + [RKCIF_MIPI_CTRL0] = 0x08,
> + [RKCIF_MIPI_CTRL1] = 0x0c,
> + [RKCIF_MIPI_FRAME0_ADDR_Y] = 0x38,
> + [RKCIF_MIPI_FRAME0_ADDR_UV] = 0x40,
> + [RKCIF_MIPI_FRAME0_VLW_Y] = 0x48,
> + [RKCIF_MIPI_FRAME0_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_ADDR_Y] = 0x3c,
> + [RKCIF_MIPI_FRAME1_ADDR_UV] = 0x44,
> + [RKCIF_MIPI_FRAME1_VLW_Y] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_CROP_START] = 0x94,
> + [RKCIF_MIPI_SET_SIZE] = 0xa4,
> + },
> + [RKCIF_ID2] = {
> + [RKCIF_MIPI_CTRL0] = 0x10,
> + [RKCIF_MIPI_CTRL1] = 0x14,
> + [RKCIF_MIPI_FRAME0_ADDR_Y] = 0x4c,
> + [RKCIF_MIPI_FRAME0_ADDR_UV] = 0x54,
> + [RKCIF_MIPI_FRAME0_VLW_Y] = 0x5c,
> + [RKCIF_MIPI_FRAME0_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_ADDR_Y] = 0x50,
> + [RKCIF_MIPI_FRAME1_ADDR_UV] = 0x58,
> + [RKCIF_MIPI_FRAME1_VLW_Y] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_CROP_START] = 0x98,
> + [RKCIF_MIPI_SET_SIZE] = 0xa8,
> + },
> + [RKCIF_ID3] = {
> + [RKCIF_MIPI_CTRL0] = 0x18,
> + [RKCIF_MIPI_CTRL1] = 0x1c,
> + [RKCIF_MIPI_FRAME0_ADDR_Y] = 0x60,
> + [RKCIF_MIPI_FRAME0_ADDR_UV] = 0x68,
> + [RKCIF_MIPI_FRAME0_VLW_Y] = 0x70,
> + [RKCIF_MIPI_FRAME0_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_ADDR_Y] = 0x64,
> + [RKCIF_MIPI_FRAME1_ADDR_UV] = 0x6c,
> + [RKCIF_MIPI_FRAME1_VLW_Y] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_FRAME1_VLW_UV] = RKCIF_REGISTER_NOTSUPPORTED,
> + [RKCIF_MIPI_CROP_START] = 0x9c,
> + [RKCIF_MIPI_SET_SIZE] = 0xac,
> + },
> + },
> + .blocks = {
> + {
> + .offset = 0x100,
> + },
> + {
> + .offset = 0x300,
> + },
> + {
> + .offset = 0x400,
> + },
> + {
> + .offset = 0x500,
> + },
> + {
> + .offset = 0x600,
> + },
> + },
> +};
> +
> static u32
> rkcif_rk3588_mipi_ctrl0(struct rkcif_stream *stream,
> const struct rkcif_output_fmt *active_out_fmt)
> diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.h b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.h
> index 7edaca44f653..4e17cbc04b76 100644
> --- a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.h
> +++ b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.h
> @@ -13,6 +13,7 @@
> #include "rkcif-common.h"
>
> extern const struct rkcif_mipi_match_data rkcif_rk3568_vicap_mipi_match_data;
> +extern const struct rkcif_mipi_match_data rkcif_rk3576_vicap_mipi_match_data;
> extern const struct rkcif_mipi_match_data rkcif_rk3588_vicap_mipi_match_data;
>
> int rkcif_mipi_register(struct rkcif_device *rkcif);
> diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-common.h b/drivers/media/platform/rockchip/rkcif/rkcif-common.h
> index f83c8099b78e..08a213438d34 100644
> --- a/drivers/media/platform/rockchip/rkcif/rkcif-common.h
> +++ b/drivers/media/platform/rockchip/rkcif/rkcif-common.h
> @@ -27,7 +27,7 @@
> #include "rkcif-regs.h"
>
> #define RKCIF_DRIVER_NAME "rockchip-cif"
> -#define RKCIF_CLK_MAX 5
> +#define RKCIF_CLK_MAX 8
>
> enum rkcif_format_type {
> RKCIF_FMT_TYPE_INVALID,
> diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-dev.c b/drivers/media/platform/rockchip/rkcif/rkcif-dev.c
> index be3a174b9aab..2a5758776b3e 100644
> --- a/drivers/media/platform/rockchip/rkcif/rkcif-dev.c
> +++ b/drivers/media/platform/rockchip/rkcif/rkcif-dev.c
> @@ -53,6 +53,23 @@ static const struct rkcif_match_data rk3568_vicap_match_data = {
> .mipi = &rkcif_rk3568_vicap_mipi_match_data,
> };
>
> +static const char *const rk3576_vicap_clks[] = {
> + "aclk",
> + "hclk",
> + "dclk",
> + "iclk",
> + "iclk1",
> + "iclk2",
> + "iclk3",
> + "iclk4",
> +};
> +
> +static const struct rkcif_match_data rk3576_vicap_match_data = {
> + .clks = rk3576_vicap_clks,
> + .clks_num = ARRAY_SIZE(rk3576_vicap_clks),
> + .mipi = &rkcif_rk3576_vicap_mipi_match_data,
> +};
> +
> static const char *const rk3588_vicap_clks[] = {
> "aclk",
> "hclk",
> @@ -76,6 +93,10 @@ static const struct of_device_id rkcif_plat_of_match[] = {
> .compatible = "rockchip,rk3568-vicap",
> .data = &rk3568_vicap_match_data,
> },
> + {
> + .compatible = "rockchip,rk3576-vicap",
> + .data = &rk3576_vicap_match_data,
> + },
> {
> .compatible = "rockchip,rk3588-vicap",
> .data = &rk3588_vicap_match_data,
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2026-10-01 15:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-21 15:29 [PATCH v2 0/5] media: rockchip: add support for the RK3576 Video Capture unit Amin Gattout
2026-09-21 15:29 ` Amin Gattout
2026-09-21 15:29 ` [PATCH v2 1/5] media: dt-bindings: add rockchip rk3576 vicap Amin Gattout
2026-09-21 15:29 ` Amin Gattout
2026-09-23 14:51 ` Mehdi Djait
2026-09-23 14:51 ` Mehdi Djait
2026-09-21 15:29 ` [PATCH v2 2/5] media: rockchip: rkcif: add a register index for the MIPI capture size Amin Gattout
2026-09-21 15:29 ` Amin Gattout
2026-09-23 14:52 ` Mehdi Djait
2026-09-23 14:52 ` Mehdi Djait
2026-10-01 15:24 ` Michael Riesch
2026-10-01 15:24 ` Michael Riesch
2026-09-21 15:29 ` [PATCH v2 3/5] media: rockchip: rkcif: add a callback for the MIPI ID_CTRL1 register Amin Gattout
2026-09-21 15:29 ` Amin Gattout
2026-09-23 14:53 ` Mehdi Djait
2026-09-23 14:53 ` Mehdi Djait
2026-10-01 15:27 ` Michael Riesch
2026-10-01 15:27 ` Michael Riesch
2026-09-21 15:30 ` [PATCH v2 4/5] media: rockchip: rkcif: add support for rk3576 vicap mipi capture Amin Gattout
2026-09-21 15:30 ` Amin Gattout
2026-09-23 14:55 ` Mehdi Djait
2026-09-23 14:55 ` Mehdi Djait
2026-10-01 15:30 ` Michael Riesch [this message]
2026-10-01 15:30 ` Michael Riesch
2026-09-21 15:30 ` [PATCH v2 5/5] arm64: dts: rockchip: add vicap node to rk3576 Amin Gattout
2026-09-21 15:30 ` Amin Gattout
2026-09-23 14:56 ` Mehdi Djait
2026-09-23 14:56 ` Mehdi Djait
2026-09-23 14:35 ` [PATCH v2 0/5] media: rockchip: add support for the RK3576 Video Capture unit Mehdi Djait
2026-09-23 14:35 ` Mehdi Djait
2026-10-05 19:06 ` (subset) " Heiko Stuebner
2026-10-05 19:06 ` Heiko Stuebner
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=74d65aee-043e-42a1-bdb8-c1889c4c19a8@collabora.com \
--to=michael.riesch@collabora.com \
--cc=amin.gattout@gmail.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=mehdi.djait@linux.intel.com \
--cc=robh@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.