From patchwork Thu Jul 26 18:51:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 10546317 X-Patchwork-Delegate: horms@verge.net.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2966C112E for ; Thu, 26 Jul 2018 18:51:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10E3B2BC75 for ; Thu, 26 Jul 2018 18:51:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 007A52BC7D; Thu, 26 Jul 2018 18:51:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D0412BC75 for ; Thu, 26 Jul 2018 18:51:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730399AbeGZUJ2 (ORCPT ); Thu, 26 Jul 2018 16:09:28 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:45036 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730106AbeGZUJ2 (ORCPT ); Thu, 26 Jul 2018 16:09:28 -0400 Received: by mail-lj1-f194.google.com with SMTP id q127-v6so2357378ljq.11 for ; Thu, 26 Jul 2018 11:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:cc:references:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=MFVCZRpOMTVsuDjUihVtabDxHPNAP1b+cTQjc8GCnIY=; b=eeRVRgGYv5M9/WAZw65OYr8iuZGVKGEjpEsje5/n/ZEF5w64jp77LD2Mgcez3aRoyn N5ubLlG+LSKIn4/l3ZFsu/CS/khxxarmJkqxs9DfzpWabmfJDBR+mhtT1rImxxd2MPv1 085ke4PLDvO6MAFos/WkE7TbASHX4DHwkV1ZXwnBBBVeUqyT3zyzYgbfhRZOYvDE/PDE eky/pzo7uT8QEJCByq2GCKcUMF3pSYyMde0DC8P5fOL/gjw2UKGfM7F7HD58PkWrkzx+ AcBE4wwCHhx9OFft/gB3MVFuTKq9qbbbRqxFMMkpOi42d966iV023KzObW7+urwtp1Ux xWlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=MFVCZRpOMTVsuDjUihVtabDxHPNAP1b+cTQjc8GCnIY=; b=Lx4MLaESnDNxuv8qjfr5PMkCSvqHNcqQ31qe4ZyGnKUprk/rNZNM3KhZGUHsq9Rb4O J5Bjp3CkKOAE3wv9oopvQrLYVQrnVC6zrd0M2jDiGnHQ9Hx4GURPWS7Q57NgP/pocST8 rPx+dPRbPly745C66af6Nql//d8yXUHCP/26BFAqmiq50R3/g7JweuXF0A5n5DzH4Z6M Dsw52Y93HolQ3cMU/vD9zhx3F4mxrA+Z52+Q2q51k6UJYr9C4HjcW1EIKtV3kkAPWER1 Uc/omudgMAcmCkrHBr7IoWELTLuzMY/dGi8hwgvvFknwX5c13oeVOaoYSjfUb2O2Y1LD Ym1A== X-Gm-Message-State: AOUpUlFblwPJU65KH/6kdgeK/RtalzaNgxbeboFs3o++Z3MKHN3mcYFO 3hmLJdPIes2QAI2DyBY2iK/h3w== X-Google-Smtp-Source: AAOMgpepMtMf8EJOUagavYZcvKgdRFnGSa0wcuhOTvRBSfxfZ54oBFcSH3WW4IO/My6nEI3FiuCiUA== X-Received: by 2002:a2e:5bc8:: with SMTP id m69-v6mr2730960lje.115.1532631080051; Thu, 26 Jul 2018 11:51:20 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.86.211]) by smtp.gmail.com with ESMTPSA id b22-v6sm325267ljj.93.2018.07.26.11.51.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 11:51:19 -0700 (PDT) From: Sergei Shtylyov Subject: [PATCH] arm64: dts: renesas: r8a77980: move IPMMU nodes To: Simon Horman , linux-renesas-soc@vger.kernel.org, Rob Herring , devicetree@vger.kernel.org, Catalin Marinas , Will Deacon Cc: Mark Rutland , Magnus Damm , linux-arm-kernel@lists.infradead.org References: <2368353.xfo5beGC5E@wasted.cogentembedded.com> Organization: Cogent Embedded Message-ID: <5f7daa87-b0b3-faa7-0331-640c39961b4a@cogentembedded.com> Date: Thu, 26 Jul 2018 21:51:18 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <2368353.xfo5beGC5E@wasted.cogentembedded.com> Content-Language: en-MW Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The IPMMU nodes should follow the GEther node, not the CAN-FD node, according to the part of the startng IPMMU-DS1 node. While moving the nodes, also do sort them by label alphanumerically... Signed-off-by: Sergei Shtylyov --- 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 = , - ; - 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 = , + ; + 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";