Habidere,

The Rockchip RK3588 features two MIPI CSI-2 DPHYs (not to be confused with
the two combo MIPI DSI/CSI CPHY/DPHY blocks). The CSI-2 DPHYs can be
supported using the existing phy-rockchip-inno-csidphy driver, the notable
differences being
 - the control bits in the GRF
 - the additional reset line
This patch series adds support for this variant.

As you may have guessed, this is part of the efforts to bring the support
for the RK3588 Video Capture (VICAP) unit mainline.

Looking forward to your comments!

Signed-off-by: Michael Riesch <michael.riesch@collabora.com>
---
Changes in v4:
- fixed commit message "false negatives" -> "false positives"
- fixed mipi csi dphy node addition -> mipidcphy1 remains as-is now
- moved allOf: block after required: block (Krzysztof)
- added remark w.r.t. the description of the original reset (Krzysztof)
- name of the new reset remains "phy" as I didn't find any better
  name. Suggestions welcome! (Krzysztof)
- Link to v3: https://lore.kernel.org/r/20250616-rk3588-csi-dphy-v3-0-a5ccd5f1f438@collabora.com

Changes in v3:
- added if:then: for required 'power-domains' (Krzysztof)
- fixed restriction of resets/reset-names (Rob)
- Link to v2: https://lore.kernel.org/r/20250616-rk3588-csi-dphy-v2-0-7a94f079b712@collabora.com

Changes in v2:
- rebased onto v6.17-rc1
- added patch that makes 'power-domains' non-required (Diederik)
- added patch that allows for different sets of resets (Neil)
- introduced name for additional reset line (Neil)
- fixed example in bindings (Rob, Diederik)
- Link to v1: https://lore.kernel.org/r/20250616-rk3588-csi-dphy-v1-0-84eb3b2a736c@collabora.com

---
Michael Riesch (7):
      dt-bindings: soc: rockchip: add rk3588 csidphy grf syscon
      dt-bindings: phy: rockchip-inno-csi-dphy: make power-domains non-required
      dt-bindings: phy: rockchip-inno-csi-dphy: add rk3588 variant
      phy: rockchip: phy-rockchip-inno-csidphy: allow writes to grf register 0
      phy: rockchip: phy-rockchip-inno-csidphy: allow for different reset lines
      phy: rockchip: phy-rockchip-inno-csidphy: add support for rk3588 variant
      arm64: dts: rockchip: add mipi csi-2 dphy nodes to rk3588

 .../bindings/phy/rockchip-inno-csi-dphy.yaml       | 65 ++++++++++++++++++++-
 .../devicetree/bindings/soc/rockchip/grf.yaml      |  1 +
 arch/arm64/boot/dts/rockchip/rk3588-base.dtsi      | 34 +++++++++++
 drivers/phy/rockchip/phy-rockchip-inno-csidphy.c   | 67 ++++++++++++++++++++--
 4 files changed, 159 insertions(+), 8 deletions(-)
---
base-commit: 8f5ae30d69d7543eee0d70083daf4de8fe15d585
change-id: 20250616-rk3588-csi-dphy-c9ed2ad4cd9f

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

On Wed, 03 Sep 2025 19:04:48 +0200, Michael Riesch wrote:
> Habidere,
> 
> The Rockchip RK3588 features two MIPI CSI-2 DPHYs (not to be confused with
> the two combo MIPI DSI/CSI CPHY/DPHY blocks). The CSI-2 DPHYs can be
> supported using the existing phy-rockchip-inno-csidphy driver, the notable
> differences being
>  - the control bits in the GRF
>  - the additional reset line
> This patch series adds support for this variant.
> 
> [...]

Applied, thanks!

[2/7] dt-bindings: phy: rockchip-inno-csi-dphy: make power-domains non-required
      commit: c254815b02673cc77a84103c4c0d6197bd90c0ef
[3/7] dt-bindings: phy: rockchip-inno-csi-dphy: add rk3588 variant
      commit: 5072b8e98eef4685a5a9a8bae56072cb65a2ef69
[4/7] phy: rockchip: phy-rockchip-inno-csidphy: allow writes to grf register 0
      commit: 8c7c19466c854fa86b82d2148eaa9bf0e6531423
[5/7] phy: rockchip: phy-rockchip-inno-csidphy: allow for different reset lines
      commit: 260435153c90c8e90553e456ec43578834a14a71

Best regards,
-- 
~Vinod

Hi Vinod,

Am Mittwoch, 10. September 2025, 18:47:32 Mitteleuropäische Sommerzeit schrieb Vinod Koul:
> 
> On Wed, 03 Sep 2025 19:04:48 +0200, Michael Riesch wrote:
> > Habidere,
> > 
> > The Rockchip RK3588 features two MIPI CSI-2 DPHYs (not to be confused with
> > the two combo MIPI DSI/CSI CPHY/DPHY blocks). The CSI-2 DPHYs can be
> > supported using the existing phy-rockchip-inno-csidphy driver, the notable
> > differences being
> >  - the control bits in the GRF
> >  - the additional reset line
> > This patch series adds support for this variant.
> > 
> > [...]
> 
> Applied, thanks!
> 
> [2/7] dt-bindings: phy: rockchip-inno-csi-dphy: make power-domains non-required
>       commit: c254815b02673cc77a84103c4c0d6197bd90c0ef
> [3/7] dt-bindings: phy: rockchip-inno-csi-dphy: add rk3588 variant
>       commit: 5072b8e98eef4685a5a9a8bae56072cb65a2ef69
> [4/7] phy: rockchip: phy-rockchip-inno-csidphy: allow writes to grf register 0
>       commit: 8c7c19466c854fa86b82d2148eaa9bf0e6531423
> [5/7] phy: rockchip: phy-rockchip-inno-csidphy: allow for different reset lines
>       commit: 260435153c90c8e90553e456ec43578834a14a71

question, what happened to patch 6?
  [PATCH v4 6/7] phy: rockchip: phy-rockchip-inno-csidphy: add support for rk3588 variant

or is it just missing from this mail?

Thanks
Heiko

Hi Heiko,

On 10-09-25, 21:21, Heiko Stübner wrote:
> Hi Vinod,
> 
> Am Mittwoch, 10. September 2025, 18:47:32 Mitteleuropäische Sommerzeit schrieb Vinod Koul:
> > 
> > On Wed, 03 Sep 2025 19:04:48 +0200, Michael Riesch wrote:
> > > Habidere,
> > > 
> > > The Rockchip RK3588 features two MIPI CSI-2 DPHYs (not to be confused with
> > > the two combo MIPI DSI/CSI CPHY/DPHY blocks). The CSI-2 DPHYs can be
> > > supported using the existing phy-rockchip-inno-csidphy driver, the notable
> > > differences being
> > >  - the control bits in the GRF
> > >  - the additional reset line
> > > This patch series adds support for this variant.
> > > 
> > > [...]
> > 
> > Applied, thanks!
> > 
> > [2/7] dt-bindings: phy: rockchip-inno-csi-dphy: make power-domains non-required
> >       commit: c254815b02673cc77a84103c4c0d6197bd90c0ef
> > [3/7] dt-bindings: phy: rockchip-inno-csi-dphy: add rk3588 variant
> >       commit: 5072b8e98eef4685a5a9a8bae56072cb65a2ef69
> > [4/7] phy: rockchip: phy-rockchip-inno-csidphy: allow writes to grf register 0
> >       commit: 8c7c19466c854fa86b82d2148eaa9bf0e6531423
> > [5/7] phy: rockchip: phy-rockchip-inno-csidphy: allow for different reset lines
> >       commit: 260435153c90c8e90553e456ec43578834a14a71
> 
> question, what happened to patch 6?
>   [PATCH v4 6/7] phy: rockchip: phy-rockchip-inno-csidphy: add support for rk3588 variant
> 
> or is it just missing from this mail?

Looks like I missed, picked now

-- 
~Vinod

On Wed, 03 Sep 2025 19:04:48 +0200, Michael Riesch wrote:
> Habidere,
> 
> The Rockchip RK3588 features two MIPI CSI-2 DPHYs (not to be confused with
> the two combo MIPI DSI/CSI CPHY/DPHY blocks). The CSI-2 DPHYs can be
> supported using the existing phy-rockchip-inno-csidphy driver, the notable
> differences being
>  - the control bits in the GRF
>  - the additional reset line
> This patch series adds support for this variant.
> 
> [...]

Applied, thanks!

[6/7] phy: rockchip: phy-rockchip-inno-csidphy: add support for rk3588 variant
      commit: bdb978979ed133c47e19099ff2a4ae51e515452b

Best regards,
-- 
~Vinod

On Wed, 03 Sep 2025 19:04:48 +0200, Michael Riesch wrote:
> Habidere,
> 
> The Rockchip RK3588 features two MIPI CSI-2 DPHYs (not to be confused with
> the two combo MIPI DSI/CSI CPHY/DPHY blocks). The CSI-2 DPHYs can be
> supported using the existing phy-rockchip-inno-csidphy driver, the notable
> differences being
>  - the control bits in the GRF
>  - the additional reset line
> This patch series adds support for this variant.
> 
> [...]

Applied, thanks!

[1/7] dt-bindings: soc: rockchip: add rk3588 csidphy grf syscon
      commit: 92f96706947e902fd9156cdcdd61c9a44b4b186c
[7/7] arm64: dts: rockchip: add mipi csi-2 dphy nodes to rk3588
      commit: 871b0391ccf3feb831e233ba3e972663c057b946

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>