From patchwork Thu Oct 3 12:57:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 2982691 Return-Path: X-Original-To: patchwork-linux-arm@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 E6744BFF0B for ; Thu, 3 Oct 2013 12:58:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4060F202B4 for ; Thu, 3 Oct 2013 12:58:13 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F19FE20266 for ; Thu, 3 Oct 2013 12:58:07 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRiTg-0005QR-4I; Thu, 03 Oct 2013 12:58:00 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRiTd-0001rM-4D; Thu, 03 Oct 2013 12:57:57 +0000 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRiTa-0001qS-3n for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2013 12:57:54 +0000 Received: from pool-108-39-110-144.nrflva.fios.verizon.net ([108.39.110.144] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1VRiTE-000K3O-Sn; Thu, 03 Oct 2013 12:57:32 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id 33A834B3900; Thu, 3 Oct 2013 08:57:28 -0400 (EDT) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/1muikIJdaAXVfsDWwSZrtF5769j/1abc= Date: Thu, 3 Oct 2013 08:57:28 -0400 From: Jason Cooper To: Luka Perkov Subject: Re: [PATCH] arm: kirkwood: ib62x0: add u-boot environment partition Message-ID: <20131003125728.GW31178@titan.lakedaemon.net> References: <1380769605-2067-1-git-send-email-luka@openwrt.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1380769605-2067-1-git-send-email-luka@openwrt.org> User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131003_085754_175102_AD2D4BCF X-CRM114-Status: GOOD ( 12.01 ) X-Spam-Score: -1.9 (-) Cc: Gregory CLEMENT , Andrew Lunn , Sebastian Hesselbarth , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Luka, On Thu, Oct 03, 2013 at 05:06:45AM +0200, Luka Perkov wrote: > Also, add some trivial cosmetic fixes. > > Signed-off-by: Luka Perkov > --- > arch/arm/boot/dts/kirkwood-ib62x0.dts | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) Thanks for the patch, but don't forget to Cc the maintainers. I almost missed this one. ;-) I reworded this slightly, s/arm/ARM/, s/cosmetic fixes/whitespace cleanup/. Also, it conflicted with: 7045ff5 ARM: kirkwood: Move the nand node under the mbus node currently in mvebu/dt, so I've attached the final version below. Applied to mvebu/dt thx, Jason. --->8---------------- commit 148c274ea64448673c4294e32cfd0d60b524ca9a Author: Luka Perkov Date: Thu Oct 3 05:06:45 2013 +0200 ARM: kirkwood: ib62x0: add u-boot environment partition Also, add some trivial whitespace cleanup. Signed-off-by: Luka Perkov Signed-off-by: Jason Cooper diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index 066f40f..c5fb02f 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts @@ -5,7 +5,7 @@ / { model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)"; - compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood"; memory { device_type = "memory"; @@ -43,6 +43,7 @@ marvell,function = "gpio"; }; }; + serial@12000 { status = "okay"; }; @@ -71,6 +72,7 @@ gpios = <&gpio0 28 1>; }; }; + gpio-leds { compatible = "gpio-leds"; pinctrl-0 = <&pmx_led_os_red &pmx_led_os_green @@ -91,14 +93,13 @@ gpios = <&gpio0 27 0>; }; }; + gpio_poweroff { compatible = "gpio-poweroff"; pinctrl-0 = <&pmx_power_off>; pinctrl-names = "default"; gpios = <&gpio0 24 0>; }; - - }; &nand { @@ -108,7 +109,12 @@ partition@0 { label = "u-boot"; - reg = <0x0000000 0x100000>; + reg = <0x0000000 0xe0000>; + }; + + partition@e0000 { + label = "u-boot environment"; + reg = <0xe0000 0x100000>; }; partition@100000 { @@ -134,6 +140,7 @@ ð0 { status = "okay"; + ethernet0-port@0 { phy-handle = <ðphy0>; };