From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> To: Simon Horman <horms@verge.net.au>, linux-renesas-soc@vger.kernel.org, Rob Herring <robh+dt@kernel.org>, devicetree@vger.kernel.org, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Cc: Mark Rutland <mark.rutland@arm.com>, Magnus Damm <magnus.damm@gmail.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: dts: renesas: r8a77980: move IPMMU nodes Date: Thu, 26 Jul 2018 21:51:18 +0300 [thread overview] Message-ID: <5f7daa87-b0b3-faa7-0331-640c39961b4a@cogentembedded.com> (raw) In-Reply-To: <2368353.xfo5beGC5E@wasted.cogentembedded.com> 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> --- The patch is against the 'renesas-devel-20180726-v4.18-rc6' tag of Simon Horman's 'renesas.git' repo. arch/arm64/boot/dts/renesas/r8a77980.dtsi | 126 +++++++++++++++--------------- 1 file changed, 63 insertions(+), 63 deletions(-) Index: renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi =================================================================== --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980.dtsi +++ renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi @@ -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";
WARNING: multiple messages have this Message-ID (diff)
From: sergei.shtylyov@cogentembedded.com (Sergei Shtylyov) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: dts: renesas: r8a77980: move IPMMU nodes Date: Thu, 26 Jul 2018 21:51:18 +0300 [thread overview] Message-ID: <5f7daa87-b0b3-faa7-0331-640c39961b4a@cogentembedded.com> (raw) In-Reply-To: <2368353.xfo5beGC5E@wasted.cogentembedded.com> 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> --- The patch is against the 'renesas-devel-20180726-v4.18-rc6' tag of Simon Horman's 'renesas.git' repo. arch/arm64/boot/dts/renesas/r8a77980.dtsi | 126 +++++++++++++++--------------- 1 file changed, 63 insertions(+), 63 deletions(-) Index: renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi =================================================================== --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980.dtsi +++ renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi @@ -462,69 +462,6 @@ }; }; - ipmmu_ds1: mmu at 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 at e7b00000 { - compatible = "renesas,ipmmu-r8a77980"; - reg = <0 0xe7b00000 0 0x1000>; - power-domains = <&sysc R8A77980_PD_ALWAYS_ON>; - #iommu-cells = <1>; - }; - - ipmmu_vip1: mmu at e7960000 { - compatible = "renesas,ipmmu-r8a77980"; - reg = <0 0xe7960000 0 0x1000>; - power-domains = <&sysc R8A77980_PD_ALWAYS_ON>; - #iommu-cells = <1>; - }; - - ipmmu_ir: mmu at 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 at 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 at 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 at 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 at 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 at e6800000 { compatible = "renesas,etheravb-r8a77980", "renesas,etheravb-rcar-gen3"; @@ -722,6 +659,69 @@ status = "disabled"; }; + ipmmu_ds1: mmu at 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 at 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 at 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 at 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 at 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 at 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 at e7b00000 { + compatible = "renesas,ipmmu-r8a77980"; + reg = <0 0xe7b00000 0 0x1000>; + power-domains = <&sysc R8A77980_PD_ALWAYS_ON>; + #iommu-cells = <1>; + }; + + ipmmu_vip1: mmu at e7960000 { + compatible = "renesas,ipmmu-r8a77980"; + reg = <0 0xe7960000 0 0x1000>; + power-domains = <&sysc R8A77980_PD_ALWAYS_ON>; + #iommu-cells = <1>; + }; + mmc0: mmc at ee140000 { compatible = "renesas,sdhi-r8a77980", "renesas,rcar-gen3-sdhi";
next prev parent reply other threads:[~2018-07-26 18:51 UTC|newest] Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-04 21:42 [PATCH v2 0/11] Add R8A7745/SK-RZG1E board support Sergei Shtylyov 2016-11-04 21:42 ` Sergei Shtylyov 2016-11-04 21:46 ` [PATCH v2 02/11] soc: renesas: rcar-sysc: add R8A7745 support Sergei Shtylyov 2016-11-14 15:54 ` Rob Herring 2016-11-04 21:53 ` [PATCH v2 04/11] ARM: dts: r8a7745: initial SoC device tree Sergei Shtylyov 2016-11-04 21:53 ` Sergei Shtylyov 2016-11-04 21:54 ` [PATCH v2 05/11] ARM: dts: r8a7745: add SYS-DMAC support Sergei Shtylyov 2016-11-04 21:54 ` Sergei Shtylyov 2016-11-04 21:55 ` [PATCH v2 06/11] ARM: dts: r8a7745: add [H]SCIF{|A|B} support Sergei Shtylyov 2016-11-04 21:55 ` Sergei Shtylyov 2016-11-04 21:57 ` [PATCH v2 07/11] ARM: dts: r8a7745: add Ether support Sergei Shtylyov 2016-11-04 21:57 ` Sergei Shtylyov [not found] ` <2368353.xfo5beGC5E-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org> 2016-11-04 21:44 ` [PATCH v2 01/11] ARM: shmobile: r8a7745: add power domain index macros Sergei Shtylyov 2016-11-04 21:44 ` Sergei Shtylyov 2016-11-04 21:49 ` [PATCH v2 03/11] ARM: shmobile: r8a7745: basic SoC support Sergei Shtylyov 2016-11-04 21:49 ` Sergei Shtylyov 2016-11-04 21:49 ` Sergei Shtylyov [not found] ` <1611958.qRQu5pdJd3-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org> 2016-11-14 15:55 ` Rob Herring 2016-11-14 15:55 ` Rob Herring 2016-11-14 15:55 ` Rob Herring 2016-11-04 21:59 ` [PATCH v2 08/11] ARM: dts: r8a7745: add IRQC support Sergei Shtylyov 2016-11-04 21:59 ` Sergei Shtylyov 2016-11-04 21:59 ` Sergei Shtylyov 2016-11-04 22:02 ` [PATCH v2 09/11] ARM: shmobile: document SK-RZG1E board Sergei Shtylyov 2016-11-14 15:56 ` Rob Herring 2016-11-04 22:04 ` [PATCH v2 10/11] ARM: dts: sk-rzg1e: initial device tree Sergei Shtylyov 2016-11-04 22:04 ` Sergei Shtylyov 2016-11-04 22:05 ` [PATCH v2 11/11] ARM: dts: sk-rzg1e: add Ether support Sergei Shtylyov 2016-11-04 22:05 ` Sergei Shtylyov 2016-11-15 17:55 ` [PATCH v2 0/11] Add R8A7745/SK-RZG1E board support Simon Horman 2016-11-15 17:55 ` Simon Horman 2018-07-17 20:08 ` [PATCH] arm64: dts: renesas: r8a77980: add INTC-EX support Sergei Shtylyov 2018-07-17 20:08 ` Sergei Shtylyov 2018-07-17 20:08 ` Sergei Shtylyov 2018-07-18 8:55 ` Geert Uytterhoeven 2018-07-18 8:55 ` Geert Uytterhoeven 2018-07-18 8:55 ` Geert Uytterhoeven 2018-07-18 9:51 ` Simon Horman 2018-07-18 9:51 ` Simon Horman 2018-07-18 9:51 ` Simon Horman 2018-07-20 19:21 ` [PATCH] arm64: dts: renesas: r8a77980: add RWDT support Sergei Shtylyov 2018-07-20 19:21 ` Sergei Shtylyov 2018-07-20 19:21 ` Sergei Shtylyov 2018-07-23 16:08 ` Simon Horman 2018-07-23 16:08 ` Simon Horman 2018-07-23 16:08 ` Simon Horman 2018-07-23 16:14 ` Sergei Shtylyov 2018-07-23 16:14 ` Sergei Shtylyov 2018-07-23 16:14 ` Sergei Shtylyov 2018-07-24 11:45 ` Simon Horman 2018-07-24 11:45 ` Simon Horman 2018-07-24 11:45 ` Simon Horman 2018-07-25 15:08 ` Sergei Shtylyov 2018-07-25 15:08 ` Sergei Shtylyov 2018-07-25 15:08 ` Sergei Shtylyov 2018-07-25 16:08 ` Simon Horman 2018-07-25 16:08 ` Simon Horman 2018-07-25 16:08 ` Simon Horman 2018-07-24 7:01 ` Geert Uytterhoeven 2018-07-24 7:01 ` Geert Uytterhoeven 2018-07-24 7:01 ` Geert Uytterhoeven 2018-07-25 16:43 ` [PATCH] arm64: dts: renesas: r8a77980: add Cortex-A53 PMU support Sergei Shtylyov 2018-07-25 16:43 ` Sergei Shtylyov 2018-07-25 17:34 ` Geert Uytterhoeven 2018-07-25 17:34 ` Geert Uytterhoeven 2018-07-25 17:34 ` Geert Uytterhoeven 2018-07-26 12:33 ` Geert Uytterhoeven 2018-07-26 12:33 ` Geert Uytterhoeven 2018-07-26 12:33 ` Geert Uytterhoeven 2018-07-26 13:53 ` Simon Horman 2018-07-26 13:53 ` Simon Horman 2018-07-26 13:53 ` Simon Horman 2018-07-26 18:51 ` Sergei Shtylyov [this message] 2018-07-26 18:51 ` [PATCH] arm64: dts: renesas: r8a77980: move IPMMU nodes Sergei Shtylyov 2018-07-31 10:24 ` Simon Horman 2018-07-31 10:24 ` Simon Horman 2018-07-31 10:24 ` Simon Horman 2018-07-30 18:22 ` [PATCH] arm64: dts: renesas: r8a779{7|8}0: move CAN clock node Sergei Shtylyov 2018-07-30 18:22 ` Sergei Shtylyov 2018-07-31 6:45 ` Geert Uytterhoeven 2018-07-31 6:45 ` Geert Uytterhoeven 2018-07-31 6:45 ` Geert Uytterhoeven 2018-07-31 10:25 ` Simon Horman 2018-07-31 10:25 ` Simon Horman 2018-07-31 10:25 ` Simon Horman 2018-08-06 19:55 ` [PATCH] arm64: dts: renesas: r8a77980: add CSI2/VIN support Sergei Shtylyov 2018-08-06 19:55 ` Sergei Shtylyov 2018-08-06 19:55 ` Sergei Shtylyov 2018-08-09 13:08 ` Simon Horman 2018-08-09 13:08 ` Simon Horman 2018-08-09 13:08 ` Simon Horman 2018-08-10 15:53 ` Sergei Shtylyov 2018-08-10 15:53 ` Sergei Shtylyov 2018-08-10 15:53 ` Sergei Shtylyov 2018-08-17 8:51 ` Simon Horman 2018-08-17 8:51 ` Simon Horman 2018-08-17 8:51 ` Simon Horman 2018-08-17 11:13 ` Sergei Shtylyov 2018-08-17 11:13 ` Sergei Shtylyov 2018-08-17 11:13 ` Sergei Shtylyov 2018-08-22 10:00 ` Simon Horman 2018-08-22 10:00 ` Simon Horman 2018-08-22 10:00 ` Simon Horman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=5f7daa87-b0b3-faa7-0331-640c39961b4a@cogentembedded.com \ --to=sergei.shtylyov@cogentembedded.com \ --cc=catalin.marinas@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=horms@verge.net.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=mark.rutland@arm.com \ --cc=robh+dt@kernel.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.