Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932476AbbGGP2l (ORCPT ); Tue, 7 Jul 2015 11:28:41 -0400 Received: from down.free-electrons.com ([37.187.137.238]:55270 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757274AbbGGP1f (ORCPT ); Tue, 7 Jul 2015 11:27:35 -0400 From: Antoine Tenart To: sebastian.hesselbarth@gmail.com, ezequiel.garcia@free-electrons.com, dwmw2@infradead.org, computersforpeace@gmail.com Cc: Antoine Tenart , boris.brezillon@free-electrons.com, zmxu@marvell.com, jszhang@marvell.com, linux-arm-kernel@lists.infradead.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/7] ARM: berlin: enable flash on the BG2Q DMP Date: Tue, 7 Jul 2015 17:27:27 +0200 Message-Id: <1436282847-21137-8-git-send-email-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1436282847-21137-1-git-send-email-antoine.tenart@free-electrons.com> References: <1436282847-21137-1-git-send-email-antoine.tenart@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1362 Lines: 50 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 4a749e5b3b44..0d0146a773c0 100644 --- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts +++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts @@ -140,3 +140,28 @@ &sata_phy { status = "okay"; }; + +&soc_pinctrl { + 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"; +}; -- 2.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/