Commit f14bfabc authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Simon Horman
Browse files

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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 18048556

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

+63 −63
Original line number Diff line number Diff line
@@ -462,69 +462,6 @@ 
			};

		};



		ipmmu_ds1: mmu@e7740000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe7740000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 0>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vip0: mmu@e7b00000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe7b00000 0 0x1000>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vip1: mmu@e7960000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe7960000 0 0x1000>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_ir: mmu@ff8b0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xff8b0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 3>;

			power-domains = <&sysc R8A77980_PD_A3IR>;

			#iommu-cells = <1>;

		};



		ipmmu_mm: mmu@e67b0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe67b0000 0 0x1000>;

			interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_rt: mmu@ffc80000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xffc80000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 10>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vc0: mmu@fe6b0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xfe6b0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 12>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vi0: mmu@febd0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xfebd0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 14>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		avb: ethernet@e6800000 {

			compatible = "renesas,etheravb-r8a77980",

				     "renesas,etheravb-rcar-gen3";
@@ -722,6 +659,69 @@ 
			status = "disabled";

		};



		ipmmu_ds1: mmu@e7740000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe7740000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 0>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_ir: mmu@ff8b0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xff8b0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 3>;

			power-domains = <&sysc R8A77980_PD_A3IR>;

			#iommu-cells = <1>;

		};



		ipmmu_mm: mmu@e67b0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe67b0000 0 0x1000>;

			interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_rt: mmu@ffc80000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xffc80000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 10>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vc0: mmu@fe6b0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xfe6b0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 12>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vi0: mmu@febd0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xfebd0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 14>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vip0: mmu@e7b00000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe7b00000 0 0x1000>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vip1: mmu@e7960000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe7960000 0 0x1000>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		mmc0: mmc@ee140000 {

			compatible = "renesas,sdhi-r8a77980",

				     "renesas,rcar-gen3-sdhi";

CRA Git | Maintained and supported by SUSTech CRA and CCSE