From patchwork Thu Jan 9 12:31:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Jacques Hiblot X-Patchwork-Id: 3460171 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 C200C9F384 for ; Thu, 9 Jan 2014 13:17:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A767B2012F for ; Thu, 9 Jan 2014 13:17:53 +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 D4D7120121 for ; Thu, 9 Jan 2014 13:17:48 +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 1W1EsG-0003f9-BS; Thu, 09 Jan 2014 12:38:13 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W1ErK-000476-5l; Thu, 09 Jan 2014 12:37:14 +0000 Received: from mail-wg0-f41.google.com ([74.125.82.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W1Epn-0003tq-AS for linux-arm-kernel@lists.infradead.org; Thu, 09 Jan 2014 12:35:43 +0000 Received: by mail-wg0-f41.google.com with SMTP id y10so5892000wgg.2 for ; Thu, 09 Jan 2014 04:35:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=j/0/vUVqteXhpEs3mR1302EspBcUvxsloymW78DPabY=; b=ah+kIF2HoGTwf/BM6iUn31qgyd4kJ4PE1IFvbv9QYLWNeAE4JjYQ4UanH+lzqe24YZ 0SUfUPzY2LF1JjoumVIb+nhuXkgquIFJottdp3nXJPnNeqrlM1HD4owkmM23eqoi9DLE BJbEi4CvxiG5kgDp77Hm5Le3LzE1NfrATIhxFmT/aktBuKpIgUL0HLCyCgI12m7tl0RD vb5UGTynkJV2npCs908oBAgye08a1Bj7eKhvMF+mZ2D2bHn8jzD89IQH9MpuZ4QTEZLP xwZ1E9VFflwRdXp2GdQmycSqcZoM5FFxAFB66+JVD96TiULChACplRx36E9wB3qB7taN 64VA== X-Received: by 10.195.13.113 with SMTP id ex17mr2827379wjd.0.1389270916657; Thu, 09 Jan 2014 04:35:16 -0800 (PST) Received: from stedf17-labo202.ds.jdsu.net. (4-161.80-90.static-ip.oleane.fr. [90.80.161.4]) by mx.google.com with ESMTPSA id t10sm7454854wia.6.2014.01.09.04.35.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jan 2014 04:35:15 -0800 (PST) From: Jean-Jacques Hiblot To: nicolas.ferre@atmel.com, b.brezillon@overkiz.com, arnd@arndb.de Subject: [PATCH v2 11/12] at91: dt: sam9261: moved the NAND under the smc node Date: Thu, 9 Jan 2014 13:31:48 +0100 Message-Id: <1389270709-32662-12-git-send-email-jjhiblot@traphandler.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1389270709-32662-1-git-send-email-jjhiblot@traphandler.com> References: <1389270709-32662-1-git-send-email-jjhiblot@traphandler.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140109_073539_549654_8411501E X-CRM114-Status: UNSURE ( 8.21 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Jean-Jacques Hiblot , linux-kernel@vger.kernel.org, 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: , MIME-Version: 1.0 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.2 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 Signed-off-by: Jean-Jacques Hiblot --- arch/arm/boot/dts/at91sam9261.dtsi | 35 ++++++++++++++------------- arch/arm/boot/dts/at91sam9261ek.dts | 48 ++++++++++++++++++++++++++++--------- 2 files changed, 55 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi index 6c90790..c558918 100644 --- a/arch/arm/boot/dts/at91sam9261.dtsi +++ b/arch/arm/boot/dts/at91sam9261.dtsi @@ -525,23 +525,6 @@ status = "disabled"; }; - nand0: nand@40000000 { - compatible = "atmel,at91rm9200-nand"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x40000000 0x10000000>; - atmel,nand-addr-offset = <22>; - atmel,nand-cmd-offset = <21>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_nand>; - - gpios = <&pioC 15 GPIO_ACTIVE_HIGH - &pioC 14 GPIO_ACTIVE_HIGH - 0 - >; - status = "disabled"; - }; - smc: smc@ffffec00 { #address-cells = <2>; #size-cells = <1>; @@ -588,6 +571,24 @@ ranges = <0 3 0x00000000 0x10000000>; smc,cs = <3>; status = "disabled"; + + nand0: nand@3,0 { + compatible = "atmel,at91rm9200-nand"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0 0x10000000>; + atmel,nand-addr-offset = <22>; + atmel,nand-cmd-offset = <21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nand>, <&pinctrl_smc_nandoe>, <&pinctrl_smc_nandwe>; + smc,cs = <3>; + + gpios = <&pioC 15 GPIO_ACTIVE_HIGH + &pioC 14 GPIO_ACTIVE_HIGH + 0 + >; + status = "disabled"; + }; }; ebi_cs4@4,0 { #address-cells = <1>; diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts index 03c05fc..e92cb8e 100644 --- a/arch/arm/boot/dts/at91sam9261ek.dts +++ b/arch/arm/boot/dts/at91sam9261ek.dts @@ -42,17 +42,6 @@ }; }; - nand0: nand@40000000 { - nand-bus-width = <8>; - nand-ecc-mode = "soft"; - nand-on-flash-bbt = <1>; - status = "okay"; - at91bootstrap@0 { - label = "at91bootstrap"; - reg = <0x0 0x20000>; - }; - }; - fb0: fb@0x00600000 { display = <&display0>; status = "okay"; @@ -83,6 +72,43 @@ }; }; }; + + smc: smc@ffffec00 { + status = "okay"; + + ebi_cs3@3,0 { + status = "okay"; + smc,ncs_read_setup = <0>; + smc,nrd_setup = <1>; + smc,ncs_write_setup = <0>; + smc,nwe_setup = <1>; + smc,ncs_read_pulse = <3>; + smc,nrd_pulse = <3>; + smc,ncs_write_pulse = <3>; + smc,nwe_pulse = <3>; + smc,read_cycle = <5>; + smc,write_cycle = <5>; + smc,tdf_cycles = <2>; + smc,tdf_optimized = <0>; + smc,page_size = <0>; + smc,byte_access_type = <0>; + smc,bus_width = <0>; + smc,nwait_mode = <0>; + smc,read_mode = <1>; + smc,write_mode = <1>; + + nand0: nand@3,0 { + nand-bus-width = <8>; + nand-ecc-mode = "soft"; + nand-on-flash-bbt = <1>; + status = "okay"; + at91bootstrap@0 { + label = "at91bootstrap"; + reg = <0x0 0x20000>; + }; + }; + }; + }; }; leds {