Skip to content

Commit f14bfab

Browse files
Sergei Shtylyovhorms
Sergei Shtylyov
authored and
horms
committed
arm64: dts: renesas: r8a77980: move IPMMU nodes
The IPMMU nodes should follow the GEther node, not the CAN-FD node, according to the <unit-address> part of the startng IPMMU-DS1 node. While moving the nodes, also do sort them by label alphanumerically... Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
1 parent 1804855 commit f14bfab

File tree

1 file changed

+63
-63
lines changed

1 file changed

+63
-63
lines changed

‎arch/arm64/boot/dts/renesas/r8a77980.dtsi

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -462,69 +462,6 @@
462462
};
463463
};
464464

465-
ipmmu_ds1: mmu@e7740000 {
466-
compatible = "renesas,ipmmu-r8a77980";
467-
reg = <0 0xe7740000 0 0x1000>;
468-
renesas,ipmmu-main = <&ipmmu_mm 0>;
469-
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
470-
#iommu-cells = <1>;
471-
};
472-
473-
ipmmu_vip0: mmu@e7b00000 {
474-
compatible = "renesas,ipmmu-r8a77980";
475-
reg = <0 0xe7b00000 0 0x1000>;
476-
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
477-
#iommu-cells = <1>;
478-
};
479-
480-
ipmmu_vip1: mmu@e7960000 {
481-
compatible = "renesas,ipmmu-r8a77980";
482-
reg = <0 0xe7960000 0 0x1000>;
483-
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
484-
#iommu-cells = <1>;
485-
};
486-
487-
ipmmu_ir: mmu@ff8b0000 {
488-
compatible = "renesas,ipmmu-r8a77980";
489-
reg = <0 0xff8b0000 0 0x1000>;
490-
renesas,ipmmu-main = <&ipmmu_mm 3>;
491-
power-domains = <&sysc R8A77980_PD_A3IR>;
492-
#iommu-cells = <1>;
493-
};
494-
495-
ipmmu_mm: mmu@e67b0000 {
496-
compatible = "renesas,ipmmu-r8a77980";
497-
reg = <0 0xe67b0000 0 0x1000>;
498-
interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
499-
<GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
500-
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
501-
#iommu-cells = <1>;
502-
};
503-
504-
ipmmu_rt: mmu@ffc80000 {
505-
compatible = "renesas,ipmmu-r8a77980";
506-
reg = <0 0xffc80000 0 0x1000>;
507-
renesas,ipmmu-main = <&ipmmu_mm 10>;
508-
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
509-
#iommu-cells = <1>;
510-
};
511-
512-
ipmmu_vc0: mmu@fe6b0000 {
513-
compatible = "renesas,ipmmu-r8a77980";
514-
reg = <0 0xfe6b0000 0 0x1000>;
515-
renesas,ipmmu-main = <&ipmmu_mm 12>;
516-
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
517-
#iommu-cells = <1>;
518-
};
519-
520-
ipmmu_vi0: mmu@febd0000 {
521-
compatible = "renesas,ipmmu-r8a77980";
522-
reg = <0 0xfebd0000 0 0x1000>;
523-
renesas,ipmmu-main = <&ipmmu_mm 14>;
524-
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
525-
#iommu-cells = <1>;
526-
};
527-
528465
avb: ethernet@e6800000 {
529466
compatible = "renesas,etheravb-r8a77980",
530467
"renesas,etheravb-rcar-gen3";
@@ -722,6 +659,69 @@
722659
status = "disabled";
723660
};
724661

662+
ipmmu_ds1: mmu@e7740000 {
663+
compatible = "renesas,ipmmu-r8a77980";
664+
reg = <0 0xe7740000 0 0x1000>;
665+
renesas,ipmmu-main = <&ipmmu_mm 0>;
666+
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
667+
#iommu-cells = <1>;
668+
};
669+
670+
ipmmu_ir: mmu@ff8b0000 {
671+
compatible = "renesas,ipmmu-r8a77980";
672+
reg = <0 0xff8b0000 0 0x1000>;
673+
renesas,ipmmu-main = <&ipmmu_mm 3>;
674+
power-domains = <&sysc R8A77980_PD_A3IR>;
675+
#iommu-cells = <1>;
676+
};
677+
678+
ipmmu_mm: mmu@e67b0000 {
679+
compatible = "renesas,ipmmu-r8a77980";
680+
reg = <0 0xe67b0000 0 0x1000>;
681+
interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
682+
<GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
683+
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
684+
#iommu-cells = <1>;
685+
};
686+
687+
ipmmu_rt: mmu@ffc80000 {
688+
compatible = "renesas,ipmmu-r8a77980";
689+
reg = <0 0xffc80000 0 0x1000>;
690+
renesas,ipmmu-main = <&ipmmu_mm 10>;
691+
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
692+
#iommu-cells = <1>;
693+
};
694+
695+
ipmmu_vc0: mmu@fe6b0000 {
696+
compatible = "renesas,ipmmu-r8a77980";
697+
reg = <0 0xfe6b0000 0 0x1000>;
698+
renesas,ipmmu-main = <&ipmmu_mm 12>;
699+
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
700+
#iommu-cells = <1>;
701+
};
702+
703+
ipmmu_vi0: mmu@febd0000 {
704+
compatible = "renesas,ipmmu-r8a77980";
705+
reg = <0 0xfebd0000 0 0x1000>;
706+
renesas,ipmmu-main = <&ipmmu_mm 14>;
707+
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
708+
#iommu-cells = <1>;
709+
};
710+
711+
ipmmu_vip0: mmu@e7b00000 {
712+
compatible = "renesas,ipmmu-r8a77980";
713+
reg = <0 0xe7b00000 0 0x1000>;
714+
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
715+
#iommu-cells = <1>;
716+
};
717+
718+
ipmmu_vip1: mmu@e7960000 {
719+
compatible = "renesas,ipmmu-r8a77980";
720+
reg = <0 0xe7960000 0 0x1000>;
721+
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
722+
#iommu-cells = <1>;
723+
};
724+
725725
mmc0: mmc@ee140000 {
726726
compatible = "renesas,sdhi-r8a77980",
727727
"renesas,rcar-gen3-sdhi";

0 commit comments

Comments
 (0)