From patchwork Mon Jul 29 14:41:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 262802 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EFFD32C0105 for ; Tue, 30 Jul 2013 00:41:52 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V3odt-0004rT-CA; Mon, 29 Jul 2013 14:41:45 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V3odr-00049n-0q; Mon, 29 Jul 2013 14:41:43 +0000 Received: from [94.23.35.102] (helo=mail.free-electrons.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V3odo-00048M-EI for linux-arm-kernel@lists.infradead.org; Mon, 29 Jul 2013 14:41:41 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id E7EF884F; Mon, 29 Jul 2013 16:41:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost (unknown [190.2.109.247]) by mail.free-electrons.com (Postfix) with ESMTPSA id BF47C76F; Mon, 29 Jul 2013 16:41:16 +0200 (CEST) Date: Mon, 29 Jul 2013 11:41:25 -0300 From: Ezequiel Garcia To: Sebastian Hesselbarth Subject: Re: [PATCH 4/5] ARM: dove: relocate internal registers device nodes Message-ID: <20130729144124.GC2417@localhost> References: <1375101114-28858-1-git-send-email-sebastian.hesselbarth@gmail.com> <1375101114-28858-5-git-send-email-sebastian.hesselbarth@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1375101114-28858-5-git-send-email-sebastian.hesselbarth@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130729_104140_668658_16A9C58C X-CRM114-Status: GOOD ( 14.30 ) X-Spam-Score: -0.4 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS Cc: Thomas Petazzoni , Andrew Lunn , Russell King , Jason Cooper , linux-kernel@vger.kernel.org, Gregory Clement , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Sebastian, On Mon, Jul 29, 2013 at 02:31:53PM +0200, Sebastian Hesselbarth wrote: > With mbus node in place, now relocate all internal device nodes > to internal-regs node with proper address ranges. > > Signed-off-by: Sebastian Hesselbarth > --- > Cc: Russell King > Cc: Jason Cooper > Cc: Andrew Lunn > Cc: Ezequiel Garcia > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > arch/arm/boot/dts/dove.dtsi | 955 +++++++++++++++++++++---------------------- > 1 file changed, 474 insertions(+), 481 deletions(-) > I think you might do this in a slightly different way, and achieve a less intrusive patch (fwiw, i personally try to avoid intrusive changes). Maybe it's just a matter of taste, so it's up to you to decide Anyway, here's my proposal: ----------------------------8<---------------------------------------- ----------------------------------->8----------------------------------- It has a much nicer diffstat: arch/arm/boot/dts/dove.dtsi | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) And in addition, it allows to see some (maybe unrelated?) changes other than the node-relocation. I've seen these kind of things in (e.g.) omap3-igep0020.dts, and it seems to me it could be a cleaner way of doing this relocation. diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index db9ae00..0fbc30e 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -5,6 +5,7 @@ / { compatible = "marvell,dove"; model = "Marvell Armada 88AP510 SoC"; + interrupt-parent = <&intc>; aliases { gpio0 = &gpio0; @@ -41,22 +42,17 @@ MBUS_ID(0x01, 0xfd) 0 0xf8000000 0x8000000 /* BootROM 128M */ MBUS_ID(0x03, 0x01) 0 0xc8000000 0x0100000 /* CESA SRAM 1M */ MBUS_ID(0x0d, 0x00) 0 0xf0000000 0x0100000>; /* PMU SRAM 1M */ - }; +}; - soc@f1000000 { +mbus { + internal-regs { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - interrupt-parent = <&intc>; - - ranges = <0xc8000000 0xc8000000 0x0100000 /* CESA SRAM 1M */ - 0xe0000000 0xe0000000 0x8000000 /* PCIe0 Mem 128M */ - 0xe8000000 0xe8000000 0x8000000 /* PCIe1 Mem 128M */ - 0xf0000000 0xf0000000 0x0100000 /* ScratchPad 1M */ - 0x00000000 0xf1000000 0x1000000 /* SB/NB regs 16M */ - 0xf2000000 0xf2000000 0x0100000 /* PCIe0 I/O 1M */ - 0xf2100000 0xf2100000 0x0100000 /* PCIe0 I/O 1M */ - 0xf8000000 0xf8000000 0x8000000>; /* BootROM 128M */ + ranges = <0x00000000 MBUS_ID(0xf0, 0x01) 0 0x0100000 /* MBUS regs 1M */ + 0x00800000 MBUS_ID(0xf0, 0x02) 0 0x1000000 /* AXI regs 16M */ + 0xffffe000 MBUS_ID(0x03, 0x01) 0 0x0000800 /* CESA SRAM 2k */ + 0xfffff000 MBUS_ID(0x0d, 0x00) 0 0x0000800>; /* PMU SRAM 2k */ mbusc: mbus-ctrl@20000 { compatible = "marvell,mbus-controller"; @@ -443,7 +439,7 @@ crypto: crypto-engine@30000 { compatible = "marvell,orion-crypto"; reg = <0x30000 0x10000>, - <0xc8000000 0x800>; + <0xffffe000 0x800>; reg-names = "regs", "sram"; interrupts = <31>; clocks = <&gate_clk 15>; @@ -465,7 +461,6 @@ channel1 { interrupts = <40>; - dmacap,memset; dmacap,memcpy; dmacap,xor; }; @@ -486,7 +481,6 @@ channel1 { interrupts = <43>; - dmacap,memset; dmacap,memcpy; dmacap,xor; };