[PATCH 0/4] media: synopsys: csi2rx: add support for rk3588 variant

[PATCH 0/4] media: synopsys: csi2rx: add support for rk3588 variant

[Michael Riesch via B4 Relay]

Habidere,

The Rockchip RK3588 features six MIPI CSI-2 receiver units:
 - MIPI0: connected to MIPI DCPHY0
 - MIPI1: connected to MIPI DCPHY1
 - MIPI2: connected to MIPI DPHY0
 - MIPI3: connected to MIPI DPHY0-1 (only with split DPHY0)
 - MIPI4: connected to MIPI DPHY1
 - MIPI5: connected to MIPI DPHY1-1 (only with split DPHY1)

The MIPI DCPHYs (at least the CSI-2 features of them) as well
as the split DPHY mode of the DPHYs are not yet supported by
mainline. However, we can already provide support for the
MIPI2 and MIPI4 units.

When support for the split DPHY mode is introduced, the DPHY
nodes should have the property
    #phy-cells = <1>;
and the MIPI CSI-2 receiver nodes should have the property
    phys = <&csi_dphy{0,1} {0,1}>;
in case the split mode is desired. Since this is a board
specific hardware design, the properties need to be changed
in the board device tree (or any overlays).

As reasonable default, however, we can define, e.g., 
    #phy-cells = <0>;
and
    phys = <&csi_dphy{0,1}>;
in the SoC device tree include.
This series introduces initial support for this default
configuration.

In a related note, the split DPHY allows for different
integrations of the MIPI CSI-2 receiver into the different
SoCs. Therefore, we introduce a separate compatible (and not
only a fallback compatible) in the DT bindings.

Looking forward to your comments!

Signed-off-by: Michael Riesch <michael.riesch@collabora.com>
---
Michael Riesch (4):
      media: dt-bindings: rockchip,rk3568-mipi-csi2: add rk3588 compatible
      media: synopsys: csi2rx: add support for rk3588 variant
      arm64: dts: rockchip: add mipi csi-2 receiver nodes to rk3588
      arm64: defconfig: enable designware mipi csi-2 receiver

 .../bindings/media/rockchip,rk3568-mipi-csi2.yaml  |  1 +
 arch/arm64/boot/dts/rockchip/rk3588-base.dtsi      | 52 ++++++++++++++++++++++
 arch/arm64/configs/defconfig                       |  1 +
 drivers/media/platform/synopsys/dw-mipi-csi2rx.c   |  3 ++
 4 files changed, 57 insertions(+)
---
base-commit: 11439c4635edd669ae435eec308f4ab8a0804808
change-id: 20260305-rk3588-csi2rx-a11f7c15a40a

Best regards,
-- 
Michael Riesch <michael.riesch@collabora.com>

[PATCH 1/4] media: dt-bindings: rockchip,rk3568-mipi-csi2: add rk3588 compatible

[Michael Riesch via B4 Relay]

From: Michael Riesch <michael.riesch@collabora.com>

The RK3588 MIPI CSI-2 receivers are compatible to the ones found in
the RK3568. However, their integration in the respective SoC may be
different when it comes to the (currently not implemented) split
DPHY feature. Therefore, add the RK3588 compatible to allow for
future differentiation.

Signed-off-by: Michael Riesch <michael.riesch@collabora.com>
---
 Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml b/Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml
index 2c2bd87582eb..5f8014da31ca 100644
--- a/Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml
+++ b/Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml
@@ -18,6 +18,7 @@ properties:
   compatible:
     enum:
       - rockchip,rk3568-mipi-csi2
+      - rockchip,rk3588-mipi-csi2
 
   reg:
     maxItems: 1

-- 
2.39.5

[PATCH 2/4] media: synopsys: csi2rx: add support for rk3588 variant

[Michael Riesch via B4 Relay]

From: Michael Riesch <michael.riesch@collabora.com>

Add support for the RK3588 variant of the Synopsys MIPI CSI-2
Receiver.

Signed-off-by: Michael Riesch <michael.riesch@collabora.com>
---
 drivers/media/platform/synopsys/dw-mipi-csi2rx.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/media/platform/synopsys/dw-mipi-csi2rx.c b/drivers/media/platform/synopsys/dw-mipi-csi2rx.c
index 170346ae1a59..45ec815b0fba 100644
--- a/drivers/media/platform/synopsys/dw-mipi-csi2rx.c
+++ b/drivers/media/platform/synopsys/dw-mipi-csi2rx.c
@@ -609,6 +609,9 @@ static const struct of_device_id dw_mipi_csi2rx_of_match[] = {
 	{
 		.compatible = "rockchip,rk3568-mipi-csi2",
 	},
+	{
+		.compatible = "rockchip,rk3588-mipi-csi2",
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, dw_mipi_csi2rx_of_match);

-- 
2.39.5

[PATCH 3/4] arm64: dts: rockchip: add mipi csi-2 receiver nodes to rk3588

[Michael Riesch via B4 Relay]

From: Michael Riesch <michael.riesch@collabora.com>

The Rockchip RK3588 features six MIPI CSI-2 receiver units:
 - MIPI0: connected to MIPI DCPHY0 (not supported)
 - MIPI1: connected to MIPI DCPHY1 (not supported)
 - MIPI2: connected to MIPI DPHY0
 - MIPI3: connected to MIPI DPHY0-1 (not supported)
 - MIPI4: connected to MIPI DPHY1
 - MIPI5: connected to MIPI DPHY1-1 (not supported)
As the MIPI DCPHYs as well as the split DPHY mode of the DPHYs
are not yet supported, add only the device tree nodes for the
MIPI2 and MIPI4 units.

Signed-off-by: Michael Riesch <michael.riesch@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 52 +++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
index 7fe9593d8c19..3bbd057ca504 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1430,6 +1430,58 @@ av1d: video-codec@fdc70000 {
 		resets = <&cru SRST_A_AV1>, <&cru SRST_P_AV1>, <&cru SRST_A_AV1_BIU>, <&cru SRST_P_AV1_BIU>;
 	};
 
+	csi2: csi@fdd30000 {
+		compatible = "rockchip,rk3588-mipi-csi2";
+		reg = <0x0 0xfdd30000 0x0 0x10000>;
+		interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH 0>,
+			     <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH 0>;
+		interrupt-names = "err1", "err2";
+		clocks = <&cru PCLK_CSI_HOST_2>;
+		phys = <&csi_dphy0>;
+		power-domains = <&power RK3588_PD_VI>;
+		resets = <&cru SRST_P_CSI_HOST_2>;
+		status = "disabled";
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			csi2_in: port@0 {
+				reg = <0>;
+			};
+
+			csi2_out: port@1 {
+				reg = <1>;
+			};
+		};
+	};
+
+	csi4: csi@fdd50000 {
+		compatible = "rockchip,rk3588-mipi-csi2";
+		reg = <0x0 0xfdd50000 0x0 0x10000>;
+		interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH 0>,
+			     <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH 0>;
+		interrupt-names = "err1", "err2";
+		clocks = <&cru PCLK_CSI_HOST_4>;
+		phys = <&csi_dphy1>;
+		power-domains = <&power RK3588_PD_VI>;
+		resets = <&cru SRST_P_CSI_HOST_4>;
+		status = "disabled";
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			csi4_in: port@0 {
+				reg = <0>;
+			};
+
+			csi4_out: port@1 {
+				reg = <1>;
+			};
+		};
+	};
+
 	vop: vop@fdd90000 {
 		compatible = "rockchip,rk3588-vop";
 		reg = <0x0 0xfdd90000 0x0 0x4200>, <0x0 0xfdd95000 0x0 0x1000>;

-- 
2.39.5

[PATCH 4/4] arm64: defconfig: enable designware mipi csi-2 receiver

[Michael Riesch via B4 Relay]

From: Michael Riesch <michael.riesch@collabora.com>

The Synopsys DesignWare MIPI CSI-2 Receiver is integrated into
recent Rockchip SoCs, such as the RK3568 and the RK3588.
Enable the driver for it in the default configuration.

Signed-off-by: Michael Riesch <michael.riesch@collabora.com>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index b67d5b1fc45b..a93ff73ae52c 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -907,6 +907,7 @@ CONFIG_SDR_PLATFORM_DRIVERS=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_AMPHION_VPU=m
 CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_DW_MIPI_CSI2RX=m
 CONFIG_VIDEO_MEDIATEK_JPEG=m
 CONFIG_VIDEO_MEDIATEK_VCODEC=m
 CONFIG_VIDEO_WAVE_VPU=m

-- 
2.39.5

Re: [PATCH 1/4] media: dt-bindings: rockchip,rk3568-mipi-csi2: add rk3588 compatible

[Krzysztof Kozlowski]

On Fri, Mar 06, 2026 at 03:09:48PM +0100, Michael Riesch wrote:
> The RK3588 MIPI CSI-2 receivers are compatible to the ones found in
> the RK3568. However, their integration in the respective SoC may be
> different when it comes to the (currently not implemented) split

All this says they are compatible, so express it.

> DPHY feature. Therefore, add the RK3588 compatible to allow for
> future differentiation.

This I do not understand. If you just copy standard rules from
writing-bindings, then no, don't do that. It's obvious and there is
never a need to repeat any standard/common rule. If you want to say
devices are not compatible, then say that explicitly.

Best regards,
Krzysztof

Re: [PATCH 4/4] arm64: defconfig: enable designware mipi csi-2 receiver

[Krzysztof Kozlowski]

On Fri, Mar 06, 2026 at 03:09:51PM +0100, Michael Riesch wrote:
> The Synopsys DesignWare MIPI CSI-2 Receiver is integrated into
> recent Rockchip SoCs, such as the RK3568 and the RK3588.

... and used on boards foo bar.

(becuse we take defconfig for boards, not for SoCs - if there is no
single board using it, then it should not be enabled because it means
you do it for downstream which simply does not exist for us).

Best regards,
Krzysztof

Re: [PATCH 2/4] media: synopsys: csi2rx: add support for rk3588 variant

[Krzysztof Kozlowski]

On Fri, Mar 06, 2026 at 03:09:49PM +0100, Michael Riesch wrote:
> Add support for the RK3588 variant of the Synopsys MIPI CSI-2
> Receiver.
> 
> Signed-off-by: Michael Riesch <michael.riesch@collabora.com>
> ---
>  drivers/media/platform/synopsys/dw-mipi-csi2rx.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/media/platform/synopsys/dw-mipi-csi2rx.c b/drivers/media/platform/synopsys/dw-mipi-csi2rx.c
> index 170346ae1a59..45ec815b0fba 100644
> --- a/drivers/media/platform/synopsys/dw-mipi-csi2rx.c
> +++ b/drivers/media/platform/synopsys/dw-mipi-csi2rx.c
> @@ -609,6 +609,9 @@ static const struct of_device_id dw_mipi_csi2rx_of_match[] = {
>  	{
>  		.compatible = "rockchip,rk3568-mipi-csi2",
>  	},
> +	{
> +		.compatible = "rockchip,rk3588-mipi-csi2",

So device is fully compatible? Drop the entry then... or your bindings
patch is really not explained correctly.

Best regards,
Krzysztof

Re: [PATCH 1/4] media: dt-bindings: rockchip,rk3568-mipi-csi2: add rk3588 compatible

[Michael Riesch]

Hi Krzysztof,

On 3/7/26 16:33, Krzysztof Kozlowski wrote:
> On Fri, Mar 06, 2026 at 03:09:48PM +0100, Michael Riesch wrote:
>> The RK3588 MIPI CSI-2 receivers are compatible to the ones found in
>> the RK3568. However, their integration in the respective SoC may be
>> different when it comes to the (currently not implemented) split
> 
> All this says they are compatible, so express it.

..express it... how exactly? In the commit message? Or what do you mean
exactly?

>> DPHY feature. Therefore, add the RK3588 compatible to allow for
>> future differentiation.
> 
> This I do not understand. If you just copy standard rules from
> writing-bindings, then no, don't do that. It's obvious and there is
> never a need to repeat any standard/common rule. If you want to say
> devices are not compatible, then say that explicitly.

It's a bit of a complicated story. To keep it short, the RK3568 and the
RK3588 MIPI CSI-2 receivers are compatible at least right now. In
future, this may or may not change. This depends on how this split DPHY
integration is implemented -- and we won't know that for some time.
Right now I expect that the phys property will become optional when this
happens (at least for the RK3568).

What is the safe bet here? Going for a fallback compatible and adjust
everything when the split DPHY feature is implemented?

Best regards,
Michael

Re: [PATCH 4/4] arm64: defconfig: enable designware mipi csi-2 receiver

[Michael Riesch]

Hi Krzysztof,

On 3/7/26 16:34, Krzysztof Kozlowski wrote:
> On Fri, Mar 06, 2026 at 03:09:51PM +0100, Michael Riesch wrote:
>> The Synopsys DesignWare MIPI CSI-2 Receiver is integrated into
>> recent Rockchip SoCs, such as the RK3568 and the RK3588.
> 
> ... and used on boards foo bar.

foo bar = pretty much any recent board with a Rockchip SoC on it...
(plus NXP users, as there is a series by Frank in the works)

> 
> (becuse we take defconfig for boards, not for SoCs - if there is no
> single board using it, then it should not be enabled because it means
> you do it for downstream which simply does not exist for us).

... but there is not yet a mainline example. Next item on my TODO list
is to send out basic RK3588 VICAP support including the device tree bits
for the Radxa ROCK 5B+ plus camera modules. Should I include the patch
in that series? Or wait until that series has been accepted? Or will you
just take my word for it that there will be plenty of boards using that
receiver in near future?

Best regards,
Michael

Re: [PATCH 1/4] media: dt-bindings: rockchip,rk3568-mipi-csi2: add rk3588 compatible

[Krzysztof Kozlowski]

On 09/03/2026 09:50, Michael Riesch wrote:
> Hi Krzysztof,
> 
> On 3/7/26 16:33, Krzysztof Kozlowski wrote:
>> On Fri, Mar 06, 2026 at 03:09:48PM +0100, Michael Riesch wrote:
>>> The RK3588 MIPI CSI-2 receivers are compatible to the ones found in
>>> the RK3568. However, their integration in the respective SoC may be
>>> different when it comes to the (currently not implemented) split
>>
>> All this says they are compatible, so express it.
> 
> ..express it... how exactly? In the commit message? Or what do you mean
> exactly?

See DTS 101 presentation or DT spec. Compatibility is expressed by using
fallbacks.


> 
>>> DPHY feature. Therefore, add the RK3588 compatible to allow for
>>> future differentiation.
>>
>> This I do not understand. If you just copy standard rules from
>> writing-bindings, then no, don't do that. It's obvious and there is
>> never a need to repeat any standard/common rule. If you want to say
>> devices are not compatible, then say that explicitly.
> 
> It's a bit of a complicated story. To keep it short, the RK3568 and the
> RK3588 MIPI CSI-2 receivers are compatible at least right now. In
> future, this may or may not change. This depends on how this split DPHY
> integration is implemented -- and we won't know that for some time.
> Right now I expect that the phys property will become optional when this
> happens (at least for the RK3568).

This does not match at all commit msg. Using fallback allows future
differentiation, so "I will not use fallback for future differentiation"
is obviously incorrect argument.

> 
> What is the safe bet here? Going for a fallback compatible and adjust
> everything when the split DPHY feature is implemented?
> 
> Best regards,
> Michael
> 


Best regards,
Krzysztof

Re: [PATCH 4/4] arm64: defconfig: enable designware mipi csi-2 receiver

[Krzysztof Kozlowski]

On 09/03/2026 10:02, Michael Riesch wrote:
> Hi Krzysztof,
> 
> On 3/7/26 16:34, Krzysztof Kozlowski wrote:
>> On Fri, Mar 06, 2026 at 03:09:51PM +0100, Michael Riesch wrote:
>>> The Synopsys DesignWare MIPI CSI-2 Receiver is integrated into
>>> recent Rockchip SoCs, such as the RK3568 and the RK3588.
>>
>> ... and used on boards foo bar.
> 
> foo bar = pretty much any recent board with a Rockchip SoC on it...
> (plus NXP users, as there is a series by Frank in the works)
> 
>>
>> (becuse we take defconfig for boards, not for SoCs - if there is no
>> single board using it, then it should not be enabled because it means
>> you do it for downstream which simply does not exist for us).
> 
> ... but there is not yet a mainline example. Next item on my TODO list

Then why do we want it in the mainline? Answer: there is no reason.

We do not support downstream setups with mainline defconfigs.

> is to send out basic RK3588 VICAP support including the device tree bits
> for the Radxa ROCK 5B+ plus camera modules. Should I include the patch
> in that series? Or wait until that series has been accepted? Or will you
> just take my word for it that there will be plenty of boards using that
> receiver in near future?

Best regards,
Krzysztof

Re: [PATCH 1/4] media: dt-bindings: rockchip,rk3568-mipi-csi2: add rk3588 compatible

[Frank Li]

On Fri, Mar 06, 2026 at 03:09:48PM +0100, Michael Riesch via B4 Relay wrote:
> From: Michael Riesch <michael.riesch@collabora.com>
>
> The RK3588 MIPI CSI-2 receivers are compatible to the ones found in
> the RK3568. However, their integration in the respective SoC may be
> different when it comes to the (currently not implemented) split
> DPHY feature. Therefore, add the RK3588 compatible to allow for
> future differentiation.
>
> Signed-off-by: Michael Riesch <michael.riesch@collabora.com>
> ---
>  Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml b/Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml
> index 2c2bd87582eb..5f8014da31ca 100644
> --- a/Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml
> +++ b/Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml
> @@ -18,6 +18,7 @@ properties:
>    compatible:
>      enum:
>        - rockchip,rk3568-mipi-csi2
> +      - rockchip,rk3588-mipi-csi2

Since driver is exact same as rockchip,rk3568-mipi-csi2, so

oneOf:
  enum
    - rockchip,rk3568-mipi-csi2
  items:
    - enum
        - rockchip,rk3588-mipi-csi2
    - const: rockchip,rk3568-mipi-csi2

So, needn't change drivers.

Frank
>
>    reg:
>      maxItems: 1
>
> --
> 2.39.5
>
>