From patchwork Fri Dec 6 23:13:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 3302671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 27EDD9F37A for ; Fri, 6 Dec 2013 23:14:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FE56203A7 for ; Fri, 6 Dec 2013 23:14:54 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39F5D202FE for ; Fri, 6 Dec 2013 23:14:53 +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 1Vp4az-0006mi-HW; Fri, 06 Dec 2013 23:14:06 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vp4am-0005IM-H5; Fri, 06 Dec 2013 23:13:52 +0000 Received: from [2a01:e35:139b:9f90:221:70ff:fe55:8f78] (helo=smtp.natisbad.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vp4ai-0005Fi-Bj; Fri, 06 Dec 2013 23:13:49 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id 3960F2C0911; Sat, 7 Dec 2013 00:13:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1386371605; bh=v1OWOnRwWkupjPtZ42e3M9UBdF1uauRQEbbMfvEhhnM=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=Bm39wuhVM9rhlN+76C2019onXN4NiyMlpRQ8FX29CVPlLbEv6tr3Yo10eIEaN7ksi 6vutWdiyxS/QuLDMshRyG5m2Co62OUlHfRXx2Vuh3h6cloWBO9YmVsyQ+BLsbhEnn4 I4y1qFM5UHG6Q5Fc519DAK6SA9Yndp3wGwUEJZ8Y= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from small (localhost [127.0.0.1]) by smtp.natisbad.org (Postfix) with ESMTP id B9D4A2C00B1; Sat, 7 Dec 2013 00:13:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1386371598; bh=v1OWOnRwWkupjPtZ42e3M9UBdF1uauRQEbbMfvEhhnM=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=hxc0DCGUBEwgVPu/LbHvB3JYI+bcq0i1wm+kNinBprSvJrn+kfniManbr+hj6KvuY 2t6ye+BJnkO3PlKIkAB5W+JO2F5lNekvNxi9XyYBE3ZfZHcKxdfS1kKaiIy23HdPz+ D5bW3tJAajBrZ+H5IfzPk8IA733UqESdhdpvYfw0= X-Hashcash: 1:20:131206:jason@lakedaemon.net::k+ZrbTklsiYWJ1JI:000000000000000000000000000000000000000001vCV X-Hashcash: 1:20:131206:andrew@lunn.ch::sOw0Cv1x9GzQoKUV:0006eAZ X-Hashcash: 1:20:131206:gregory.clement@free-electrons.com::sEO73kMQBN+o0cLm:000000000000000000000000000ASUK X-Hashcash: 1:20:131206:sebastian.hesselbarth@gmail.com::MpJU0OWFfvurR8oy:000000000000000000000000000000Cgfm X-Hashcash: 1:20:131206:ezequiel.garcia@free-electrons.com::zFbqUJoN+BVh0xH9:0000000000000000000000000008s5E X-Hashcash: 1:20:131206:linux@arm.linux.org.uk::AHUEsNHvWpgHCzga:0000000000000000000000000000000000000002jpp X-Hashcash: 1:20:131206:linux-arm-kernel@lists.infradead.org::LsRCuTttsZOa65Xk:00000000000000000000000001jKV X-Hashcash: 1:20:131206:rob.herring@calxeda.com::b1a0HsasxOf0Atxl:000000000000000000000000000000000000006vlf X-Hashcash: 1:20:131206:pawel.moll@arm.com::94Nuh+jwLd/QAE99:00000000000000000000000000000000000000000004DJs X-Hashcash: 1:20:131206:mark.rutland@arm.com::oKzW0nzS9kJHsllU:0000000000000000000000000000000000000000027t4 X-Hashcash: 1:20:131206:swarren@wwwdotorg.org::5tgIiyAMsyIDpcgh:00000000000000000000000000000000000000001MiZ X-Hashcash: 1:20:131206:ijc+devicetree@hellion.org.uk::mc7eLipG3RlDlzVt:000000000000000000000000000000001jkX X-Hashcash: 1:20:131206:devicetree@vger.kernel.org::YVhMwSWKDz0liMUK:0000000000000000000000000000000000059kk X-Hashcash: 1:20:131206:computersforpeace@gmail.com::TrLuBiflH2fA7InW:00000000000000000000000000000000004qOX X-Hashcash: 1:20:131206:thomas.petazzoni@free-electrons.com::98c7CUrID6E8+KwB:000000000000000000000000002Ejy X-Hashcash: 1:20:131206:olof@lixom.net::IpVU9emWA2Wt/Eqx:0000r25 X-Hashcash: 1:20:131206:alior@marvell.com::mXWILtR+uNkfV+Jj:000000000000000000000000000000000000000000002wTP X-Hashcash: 1:20:131206:linux-mtd@lists.infradead.org::kc2W6B7X25aVDNxF:000000000000000000000000000000000awi From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ezequiel Garcia Subject: [PATCHv0 2/3] ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file In-Reply-To: References: Message-Id: <654ea0d84013c473797c0902c75d3ac5d9c01981.1386370808.git.arno@natisbad.org> Date: Sat, 07 Dec 2013 00:13:18 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131206_181348_953827_A313CF00 X-CRM114-Status: GOOD ( 10.51 ) X-Spam-Score: -1.2 (-) Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Stephen Warren , Ian Campbell , Rob Herring , Lior Amsalem , Andrew Lunn , Olof Johansson , linux-mtd@lists.infradead.org, Brian Norris , Thomas Petazzoni , 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-Virus-Scanned: ClamAV using ClamSMTP Now that NAND controller support is available for Armada 370 (cb28e2537a6f: ARM: mvebu: Add support for NAND controller in Armada 370/XP), this patch enables support for ReadyNAS 104 and defines default partition layout as delivered by NETGEAR. As described in similar commits 2be2bc39c6f0 (ARM: mvebu: Enable NAND controller in Armada XP GP board) and d8c552dddfbf (ARM: mvebu: Enable NAND controller in Armada 370 Mirabox), "marvell,keep-config" parameter is used as current support does not allow for setting of timing parameters yet. Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-370-netgear-rn104.dts | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts index e48e5fb..272e2e2 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts @@ -133,6 +133,42 @@ reg = <0x23>; }; }; + + nand@d0000 { + status = "okay"; + num-cs = <1>; + marvell,nand-keep-config; + marvell,nand-enable-arbiter; + nand-on-flash-bbt; + + partition@0 { + label = "u-boot"; + reg = <0x0000000 0x180000>; /* 1.5MB */ + read-only; + }; + + partition@180000 { + label = "u-boot-env"; + reg = <0x180000 0x20000>; /* 128KB */ + read-only; + }; + + partition@200000 { + label = "uImage"; + reg = <0x0200000 0x600000>; /* 6MB */ + }; + + partition@800000 { + label = "minirootfs"; + reg = <0x0800000 0x400000>; /* 4MB */ + }; + + /* Last MB is for the BBT, i.e. not writable */ + partition@c00000 { + label = "ubifs"; + reg = <0x0c00000 0x7400000>; /* 116MB */ + }; + }; }; };