Skip to content

Commit 02e9552

Browse files
Niklas Söderlundgeertu
authored andcommitted
arm64: dts: renesas: r8a779a0: Add ISP core function block
All ISP instances on V3U have both a channel select and core function block, describe the core region in addition to the existing cs region. The interrupt number already described intended to reflect the cs function but did incorrectly describe the core block. This was not noticed until now as the driver do not make use of the interrupt for the cs block. Signed-off-by: Niklas Söderlund <[email protected]> Reviewed-by: Jacopo Mondi <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent a719915 commit 02e9552

File tree

1 file changed

+44
-16
lines changed

1 file changed

+44
-16
lines changed

arch/arm64/boot/dts/renesas/r8a779a0.dtsi

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,13 +2588,20 @@
25882588
isp0: isp@fed00000 {
25892589
compatible = "renesas,r8a779a0-isp",
25902590
"renesas,rcar-gen4-isp";
2591-
reg = <0 0xfed00000 0 0x10000>;
2592-
interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
2593-
clocks = <&cpg CPG_MOD 612>;
2591+
reg = <0 0xfed00000 0 0x10000>, <0 0xfec00000 0 0x100000>;
2592+
reg-names = "cs", "core";
2593+
interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
2594+
<GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
2595+
interrupt-names = "cs", "core";
2596+
clocks = <&cpg CPG_MOD 612>, <&cpg CPG_MOD 16>;
2597+
clock-names = "cs", "core";
25942598
power-domains = <&sysc R8A779A0_PD_A3ISP01>;
2595-
resets = <&cpg 612>;
2599+
resets = <&cpg 612>, <&cpg 16>;
2600+
reset-names = "cs", "core";
25962601
status = "disabled";
25972602

2603+
renesas,vspx = <&vspx0>;
2604+
25982605
ports {
25992606
#address-cells = <1>;
26002607
#size-cells = <0>;
@@ -2672,13 +2679,20 @@
26722679
isp1: isp@fed20000 {
26732680
compatible = "renesas,r8a779a0-isp",
26742681
"renesas,rcar-gen4-isp";
2675-
reg = <0 0xfed20000 0 0x10000>;
2676-
interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
2677-
clocks = <&cpg CPG_MOD 613>;
2682+
reg = <0 0xfed20000 0 0x10000>, <0 0xfee00000 0 0x100000>;
2683+
reg-names = "cs", "core";
2684+
interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
2685+
<GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
2686+
interrupt-names = "cs", "core";
2687+
clocks = <&cpg CPG_MOD 613>, <&cpg CPG_MOD 17>;
2688+
clock-names = "cs", "core";
26782689
power-domains = <&sysc R8A779A0_PD_A3ISP01>;
2679-
resets = <&cpg 613>;
2690+
resets = <&cpg 613>, <&cpg 17>;
2691+
reset-names = "cs", "core";
26802692
status = "disabled";
26812693

2694+
renesas,vspx = <&vspx1>;
2695+
26822696
ports {
26832697
#address-cells = <1>;
26842698
#size-cells = <0>;
@@ -2756,13 +2770,20 @@
27562770
isp2: isp@fed30000 {
27572771
compatible = "renesas,r8a779a0-isp",
27582772
"renesas,rcar-gen4-isp";
2759-
reg = <0 0xfed30000 0 0x10000>;
2760-
interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
2761-
clocks = <&cpg CPG_MOD 614>;
2773+
reg = <0 0xfed30000 0 0x10000>, <0 0xfef00000 0 0x100000>;
2774+
reg-names = "cs", "core";
2775+
interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>,
2776+
<GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
2777+
interrupt-names = "cs", "core";
2778+
clocks = <&cpg CPG_MOD 614>, <&cpg CPG_MOD 18>;
2779+
clock-names = "cs", "core";
27622780
power-domains = <&sysc R8A779A0_PD_A3ISP23>;
2763-
resets = <&cpg 614>;
2781+
resets = <&cpg 614>, <&cpg 18>;
2782+
reset-names = "cs", "core";
27642783
status = "disabled";
27652784

2785+
renesas,vspx = <&vspx2>;
2786+
27662787
ports {
27672788
#address-cells = <1>;
27682789
#size-cells = <0>;
@@ -2840,13 +2861,20 @@
28402861
isp3: isp@fed40000 {
28412862
compatible = "renesas,r8a779a0-isp",
28422863
"renesas,rcar-gen4-isp";
2843-
reg = <0 0xfed40000 0 0x10000>;
2844-
interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
2845-
clocks = <&cpg CPG_MOD 615>;
2864+
reg = <0 0xfed40000 0 0x10000>, <0 0xfe400000 0 0x100000>;
2865+
reg-names = "cs", "core";
2866+
interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>,
2867+
<GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
2868+
interrupt-names = "cs", "core";
2869+
clocks = <&cpg CPG_MOD 615>, <&cpg CPG_MOD 19>;
2870+
clock-names = "cs", "core";
28462871
power-domains = <&sysc R8A779A0_PD_A3ISP23>;
2847-
resets = <&cpg 615>;
2872+
resets = <&cpg 615>, <&cpg 19>;
2873+
reset-names = "cs", "core";
28482874
status = "disabled";
28492875

2876+
renesas,vspx = <&vspx3>;
2877+
28502878
ports {
28512879
#address-cells = <1>;
28522880
#size-cells = <0>;

0 commit comments

Comments
 (0)