Skip to content

L
linux
Commit 948c59dd authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Geert Uytterhoeven
Browse files
Options

arm64: dts: renesas: rcar-gen3: Add CMM units 

Add CMM units to Renesas R-Car Gen3 SoC that support it, and reference them
from the Display Unit they are connected to.

Sort the 'vsps', 'renesas,cmm' and 'status' properties in the DU unit
consistently in all the involved DTS.
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Link: https://lore.kernel.org/r/20191016085548.105703-8-jacopo+renesas@jmondi.orgSigned-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent bf216639
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 2 deletions
arch/arm64/boot/dts/renesas/r8a7795.dtsi
View file @ 948c59dd
...@@ -2943,6 +2943,42 @@ fcpvd2: fcp@fea37000 { ...@@ -2943,6 +2943,42 @@ fcpvd2: fcp@fea37000 {
iommus = <&ipmmu_vi1 10>; iommus = <&ipmmu_vi1 10>;
}; };
cmm0: cmm@fea40000 {
compatible = "renesas,r8a7795-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea40000 0 0x1000>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 711>;
resets = <&cpg 711>;
};
cmm1: cmm@fea50000 {
compatible = "renesas,r8a7795-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea50000 0 0x1000>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 710>;
resets = <&cpg 710>;
};
cmm2: cmm@fea60000 {
compatible = "renesas,r8a7795-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea60000 0 0x1000>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 709>;
resets = <&cpg 709>;
};
cmm3: cmm@fea70000 {
compatible = "renesas,r8a7795-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea70000 0 0x1000>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 708>;
resets = <&cpg 708>;
};
csi20: csi2@fea80000 { csi20: csi2@fea80000 {
compatible = "renesas,r8a7795-csi2"; compatible = "renesas,r8a7795-csi2";
reg = <0 0xfea80000 0 0x10000>; reg = <0 0xfea80000 0 0x10000>;
...@@ -3146,7 +3182,10 @@ du: display@feb00000 { ...@@ -3146,7 +3182,10 @@ du: display@feb00000 {
<&cpg CPG_MOD 722>, <&cpg CPG_MOD 722>,
<&cpg CPG_MOD 721>; <&cpg CPG_MOD 721>;
clock-names = "du.0", "du.1", "du.2", "du.3"; clock-names = "du.0", "du.1", "du.2", "du.3";
renesas,cmms = <&cmm0>, <&cmm1>, <&cmm2>, <&cmm3>;
vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>; vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>;
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm64/boot/dts/renesas/r8a7796.dtsi
View file @ 948c59dd
...@@ -2645,6 +2645,33 @@ vspi0: vsp@fe9a0000 { ...@@ -2645,6 +2645,33 @@ vspi0: vsp@fe9a0000 {
renesas,fcp = <&fcpvi0>; renesas,fcp = <&fcpvi0>;
}; };
cmm0: cmm@fea40000 {
compatible = "renesas,r8a7796-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea40000 0 0x1000>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 711>;
resets = <&cpg 711>;
};
cmm1: cmm@fea50000 {
compatible = "renesas,r8a7796-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea50000 0 0x1000>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 710>;
resets = <&cpg 710>;
};
cmm2: cmm@fea60000 {
compatible = "renesas,r8a7796-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea60000 0 0x1000>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 709>;
resets = <&cpg 709>;
};
csi20: csi2@fea80000 { csi20: csi2@fea80000 {
compatible = "renesas,r8a7796-csi2"; compatible = "renesas,r8a7796-csi2";
reg = <0 0xfea80000 0 0x10000>; reg = <0 0xfea80000 0 0x10000>;
...@@ -2795,10 +2822,12 @@ du: display@feb00000 { ...@@ -2795,10 +2822,12 @@ du: display@feb00000 {
<&cpg CPG_MOD 723>, <&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>; <&cpg CPG_MOD 722>;
clock-names = "du.0", "du.1", "du.2"; clock-names = "du.0", "du.1", "du.2";
status = "disabled";
renesas,cmms = <&cmm0>, <&cmm1>, <&cmm2>;
vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>; vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>;
status = "disabled";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
arch/arm64/boot/dts/renesas/r8a77965.dtsi
View file @ 948c59dd
...@@ -2324,6 +2324,33 @@ fcpvi0: fcp@fe9af000 { ...@@ -2324,6 +2324,33 @@ fcpvi0: fcp@fe9af000 {
resets = <&cpg 611>; resets = <&cpg 611>;
}; };
cmm0: cmm@fea40000 {
compatible = "renesas,r8a77965-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea40000 0 0x1000>;
power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 711>;
resets = <&cpg 711>;
};
cmm1: cmm@fea50000 {
compatible = "renesas,r8a77965-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea50000 0 0x1000>;
power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 710>;
resets = <&cpg 710>;
};
cmm3: cmm@fea70000 {
compatible = "renesas,r8a77965-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea70000 0 0x1000>;
power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 708>;
resets = <&cpg 708>;
};
csi20: csi2@fea80000 { csi20: csi2@fea80000 {
compatible = "renesas,r8a77965-csi2"; compatible = "renesas,r8a77965-csi2";
reg = <0 0xfea80000 0 0x10000>; reg = <0 0xfea80000 0 0x10000>;
...@@ -2471,10 +2498,12 @@ du: display@feb00000 { ...@@ -2471,10 +2498,12 @@ du: display@feb00000 {
<&cpg CPG_MOD 723>, <&cpg CPG_MOD 723>,
<&cpg CPG_MOD 721>; <&cpg CPG_MOD 721>;
clock-names = "du.0", "du.1", "du.3"; clock-names = "du.0", "du.1", "du.3";
status = "disabled";
renesas,cmms = <&cmm0>, <&cmm1>, <&cmm3>;
vsps = <&vspd0 0>, <&vspd1 0>, <&vspd0 1>; vsps = <&vspd0 0>, <&vspd1 0>, <&vspd0 1>;
status = "disabled";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
arch/arm64/boot/dts/renesas/r8a77990.dtsi
View file @ 948c59dd
...@@ -1730,6 +1730,24 @@ fcpvd1: fcp@fea2f000 { ...@@ -1730,6 +1730,24 @@ fcpvd1: fcp@fea2f000 {
iommus = <&ipmmu_vi0 9>; iommus = <&ipmmu_vi0 9>;
}; };
cmm0: cmm@fea40000 {
compatible = "renesas,r8a77990-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea40000 0 0x1000>;
power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 711>;
resets = <&cpg 711>;
};
cmm1: cmm@fea50000 {
compatible = "renesas,r8a77990-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea50000 0 0x1000>;
power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 710>;
resets = <&cpg 710>;
};
csi40: csi2@feaa0000 { csi40: csi2@feaa0000 {
compatible = "renesas,r8a77990-csi2"; compatible = "renesas,r8a77990-csi2";
reg = <0 0xfeaa0000 0 0x10000>; reg = <0 0xfeaa0000 0 0x10000>;
...@@ -1771,7 +1789,10 @@ du: display@feb00000 { ...@@ -1771,7 +1789,10 @@ du: display@feb00000 {
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>; resets = <&cpg 724>;
reset-names = "du.0"; reset-names = "du.0";
renesas,cmms = <&cmm0>, <&cmm1>;
vsps = <&vspd0 0>, <&vspd1 0>; vsps = <&vspd0 0>, <&vspd1 0>;
status = "disabled"; status = "disabled";
ports { ports {
......
arch/arm64/boot/dts/renesas/r8a77995.dtsi
View file @ 948c59dd
...@@ -994,6 +994,24 @@ fcpvd1: fcp@fea2f000 { ...@@ -994,6 +994,24 @@ fcpvd1: fcp@fea2f000 {
iommus = <&ipmmu_vi0 9>; iommus = <&ipmmu_vi0 9>;
}; };
cmm0: cmm@fea40000 {
compatible = "renesas,r8a77995-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea40000 0 0x1000>;
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 711>;
resets = <&cpg 711>;
};
cmm1: cmm@fea50000 {
compatible = "renesas,r8a77995-cmm",
"renesas,rcar-gen3-cmm";
reg = <0 0xfea50000 0 0x1000>;
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
clocks = <&cpg CPG_MOD 710>;
resets = <&cpg 710>;
};
du: display@feb00000 { du: display@feb00000 {
compatible = "renesas,du-r8a77995"; compatible = "renesas,du-r8a77995";
reg = <0 0xfeb00000 0 0x40000>; reg = <0 0xfeb00000 0 0x40000>;
...@@ -1004,7 +1022,10 @@ du: display@feb00000 { ...@@ -1004,7 +1022,10 @@ du: display@feb00000 {
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>; resets = <&cpg 724>;
reset-names = "du.0"; reset-names = "du.0";
renesas,cmms = <&cmm0>, <&cmm1>;
vsps = <&vspd0 0>, <&vspd1 0>; vsps = <&vspd0 0>, <&vspd1 0>;
status = "disabled"; status = "disabled";
ports { ports {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7