From patchwork Fri Aug 29 18:16:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 4812101 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 62A1BC0338 for ; Fri, 29 Aug 2014 18:17:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B9432011B for ; Fri, 29 Aug 2014 18:16:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EAADC200F3 for ; Fri, 29 Aug 2014 18:16:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753392AbaH2SQz (ORCPT ); Fri, 29 Aug 2014 14:16:55 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:54156 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752775AbaH2SQy (ORCPT ); Fri, 29 Aug 2014 14:16:54 -0400 Received: by mail-wi0-f174.google.com with SMTP id d1so9558676wiv.1 for ; Fri, 29 Aug 2014 11:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5cqkcVRS42eJZokt9REn3ltv08ecQu9fRSc/iZ8ot20=; b=T2zXwQDYbct+7HH38Aha/BrvnWkWkZb5WpRRaNW+x8qerIqcUQw7At2C2zFFEZLsVn IYz5RkoE1OyuAS7AwkWP4ugduCAV+hf83MwEBDp8YOOTdeDihTpkfO8T7Z85oORQuLnz 0Ek54xP/F1gHXUhBi0rsNsgQ6WgX1Z7p48CwYJvdVdXEXF3EfJ9X+V3b+zcQWST6CDcS BEWUVaNFRi3Hp7ywmkG7VsjvD5b3g2LlxnjBfWAuWs0VMAcTXxh2QRLEb/FHFAhZteIG nGHRDeE/MsRv3JKWNXin2Mk2WO96QSWnZhr7WP3iLSdh371NDyHsTjyu7cop2kCtF+Om 4jcw== X-Received: by 10.195.13.34 with SMTP id ev2mr14680570wjd.55.1409336212793; Fri, 29 Aug 2014 11:16:52 -0700 (PDT) Received: from groucho.site ([91.108.183.74]) by mx.google.com with ESMTPSA id au4sm1708405wjc.15.2014.08.29.11.16.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Aug 2014 11:16:51 -0700 (PDT) From: Ulrich Hecht To: linux-sh@vger.kernel.org Cc: horms@verge.net.au, devicetree@vger.kernel.org, magnus.damm@gmail.com, Ulrich Hecht Subject: [PATCH 1/2] ARM: shmobile: r8a7778 dtsi: sort it Date: Fri, 29 Aug 2014 20:16:40 +0200 Message-Id: <1409336201-708-2-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1409336201-708-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1409336201-708-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SBL, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP - move #include to the top - "compatible" goes first - sort nodes by address Signed-off-by: Ulrich Hecht --- arch/arm/boot/dts/r8a7778.dtsi | 56 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 315ec62..c152877 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi @@ -14,10 +14,10 @@ * kind, whether express or implied. */ -/include/ "skeleton.dtsi" - #include +/include/ "skeleton.dtsi" + / { compatible = "renesas,r8a7778"; interrupt-parent = <&gic>; @@ -27,8 +27,8 @@ #size-cells = <0>; cpu@0 { - device_type = "cpu"; compatible = "arm,cortex-a9"; + device_type = "cpu"; reg = <0>; clock-frequency = <800000000>; }; @@ -121,42 +121,37 @@ interrupt-controller; }; - pfc: pfc@fffc0000 { - compatible = "renesas,pfc-r8a7778"; - reg = <0xfffc0000 0x118>; - }; - i2c0: i2c@ffc70000 { + compatible = "renesas,i2c-r8a7778"; #address-cells = <1>; #size-cells = <0>; - compatible = "renesas,i2c-r8a7778"; reg = <0xffc70000 0x1000>; interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; i2c1: i2c@ffc71000 { + compatible = "renesas,i2c-r8a7778"; #address-cells = <1>; #size-cells = <0>; - compatible = "renesas,i2c-r8a7778"; reg = <0xffc71000 0x1000>; interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; i2c2: i2c@ffc72000 { + compatible = "renesas,i2c-r8a7778"; #address-cells = <1>; #size-cells = <0>; - compatible = "renesas,i2c-r8a7778"; reg = <0xffc72000 0x1000>; interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; i2c3: i2c@ffc73000 { + compatible = "renesas,i2c-r8a7778"; #address-cells = <1>; #size-cells = <0>; - compatible = "renesas,i2c-r8a7778"; reg = <0xffc73000 0x1000>; interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -204,13 +199,6 @@ status = "disabled"; }; - mmcif: mmc@ffe4e000 { - compatible = "renesas,sh-mmcif"; - reg = <0xffe4e000 0x100>; - interrupts = <0 61 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; - }; - sdhi0: sd@ffe4c000 { compatible = "renesas,sdhi-r8a7778"; reg = <0xffe4c000 0x100>; @@ -229,6 +217,13 @@ status = "disabled"; }; + mmcif: mmc@ffe4e000 { + compatible = "renesas,sh-mmcif"; + reg = <0xffe4e000 0x100>; + interrupts = <0 61 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + sdhi2: sd@ffe4f000 { compatible = "renesas,sdhi-r8a7778"; reg = <0xffe4f000 0x100>; @@ -238,28 +233,33 @@ status = "disabled"; }; - hspi0: spi@fffc7000 { + pfc: pfc@fffc0000 { + compatible = "renesas,pfc-r8a7778"; + reg = <0xfffc0000 0x118>; + }; + + hspi2: spi@fffc6000 { compatible = "renesas,hspi-r8a7778", "renesas,hspi"; - reg = <0xfffc7000 0x18>; - interrupts = <0 63 IRQ_TYPE_LEVEL_HIGH>; + reg = <0xfffc6000 0x18>; + interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; }; - hspi1: spi@fffc8000 { + hspi0: spi@fffc7000 { compatible = "renesas,hspi-r8a7778", "renesas,hspi"; - reg = <0xfffc8000 0x18>; - interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>; + reg = <0xfffc7000 0x18>; + interrupts = <0 63 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; }; - hspi2: spi@fffc6000 { + hspi1: spi@fffc8000 { compatible = "renesas,hspi-r8a7778", "renesas,hspi"; - reg = <0xfffc6000 0x18>; - interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>; + reg = <0xfffc8000 0x18>; + interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; status = "disabled";