Add CMM units to Renesas R-Car H3 device tree and reference them from the Display Unit they are connected to.
While at it, re-sort the du device node properties to match the ordering found in other SoCs.
Signed-off-by: Jacopo Mondi jacopo+renesas@jmondi.org --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 36 +++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index 95deff66eeb6..21b4069f07e7 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -2909,6 +2909,38 @@ iommus = <&ipmmu_vi1 10>; };
+ cmm0: cmm@fea40000 { + compatible = "renesas,cmm-r8a7795"; + reg = <0 0xfea40000 0 0x1000>; + clocks = <&cpg CPG_MOD 711>; + power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; + resets = <&cpg 711>; + }; + + cmm1: cmm@fea50000 { + compatible = "renesas,cmm-r8a7795"; + reg = <0 0xfea50000 0 0x1000>; + clocks = <&cpg CPG_MOD 710>; + power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; + resets = <&cpg 710>; + }; + + cmm2: cmm@fea60000 { + compatible = "renesas,cmm-r8a7795"; + reg = <0 0xfea60000 0 0x1000>; + clocks = <&cpg CPG_MOD 709>; + power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; + resets = <&cpg 709>; + }; + + cmm3: cmm@fea70000 { + compatible = "renesas,cmm-r8a7795"; + reg = <0 0xfea70000 0 0x1000>; + clocks = <&cpg CPG_MOD 708>; + power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; + resets = <&cpg 708>; + }; + csi20: csi2@fea80000 { compatible = "renesas,r8a7795-csi2"; reg = <0 0xfea80000 0 0x10000>; @@ -3112,9 +3144,11 @@ <&cpg CPG_MOD 722>, <&cpg CPG_MOD 721>; clock-names = "du.0", "du.1", "du.2", "du.3"; - vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>; status = "disabled";
+ vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>; + cmms = <&cmm0 &cmm1 &cmm2 &cmm3>; + ports { #address-cells = <1>; #size-cells = <0>;