From patchwork Wed Apr 15 17:24:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 6222231 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5A88FBF4A6 for ; Wed, 15 Apr 2015 17:33:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8840C201CE for ; Wed, 15 Apr 2015 17:33:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 AD5D22015A for ; Wed, 15 Apr 2015 17:33:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YiR9A-00027y-I5; Wed, 15 Apr 2015 17:30:44 +0000 Received: from down.free-electrons.com ([37.187.137.238] helo=mail.free-electrons.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YiR3X-0004Td-Kd; Wed, 15 Apr 2015 17:24:56 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 30855C8A; Wed, 15 Apr 2015 19:24:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost (vpn.foo.tf [195.154.43.236]) by mail.free-electrons.com (Postfix) with ESMTPSA id 49713C8A; Wed, 15 Apr 2015 19:24:24 +0200 (CEST) From: Antoine Tenart To: sebastian.hesselbarth@gmail.com, ezequiel.garcia@free-electrons.com, dwmw2@infradead.org, computersforpeace@gmail.com Subject: [PATCH v4 10/10] ARM: berlin: enable flash on the BG2Q DMP Date: Wed, 15 Apr 2015 19:24:08 +0200 Message-Id: <1429118648-19416-11-git-send-email-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1429118648-19416-1-git-send-email-antoine.tenart@free-electrons.com> References: <1429118648-19416-1-git-send-email-antoine.tenart@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150415_102455_860061_FEC31D1A X-CRM114-Status: UNSURE ( 9.15 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: zmxu@marvell.com, boris.brezillon@free-electrons.com, Antoine Tenart , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, jszhang@marvell.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 The BG2Q DMP has a nand controller. Add the corresponding node, but do not enable it by default because the nand is only available on some BG2Q DMP. Signed-off-by: Antoine Tenart --- arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts index a98ac1bd8f65..4157258a6fb0 100644 --- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts +++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts @@ -112,3 +112,28 @@ &sata_phy { status = "okay"; }; + +&chip { + nand_pmux: nand-pmux { + groups = "G0", "G1"; + function = "nand"; + }; +}; + +&nand0 { + pinctrl-0 = <&nand_pmux>; + pinctrl-names = "default"; + + marvell,nand-enable-arbiter; + nand-ecc-strength = <48>; + nand-ecc-step-size = <1024>; + + num-cs = <1>; + + /* + * Two kinds of BG2Q DMP are available: one with emmc and + * one with a nand. The latter is not widespread. Because + * of this, disable the nand by default. + */ + status = "disabled"; +};