From patchwork Tue Dec 31 16:32:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Jacques Hiblot X-Patchwork-Id: 3422121 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 D94F59F295 for ; Tue, 31 Dec 2013 16:38:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E94252011E for ; Tue, 31 Dec 2013 16:38:57 +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 EC7B22011D for ; Tue, 31 Dec 2013 16:38:56 +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 1Vy2Jo-0008KE-Ci; Tue, 31 Dec 2013 16:37:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vy2JQ-0003G0-Q8; Tue, 31 Dec 2013 16:37:00 +0000 Received: from mail-wi0-f174.google.com ([209.85.212.174]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vy2Im-0003AK-W7 for linux-arm-kernel@lists.infradead.org; Tue, 31 Dec 2013 16:36:22 +0000 Received: by mail-wi0-f174.google.com with SMTP id z2so17384395wiv.1 for ; Tue, 31 Dec 2013 08:35:59 -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=SNe8S0yZKgi2m3OLTL10VMLUbIFw3FHZ0vu0SDHlsXE=; b=NHRxZa4ekbuTq7bW2El3uhyexAjHqglikE3HCzqh0iV2tbgQ/oR9MC+NmiQJ1LArgY gLR8WC/HJGinGWaxWy0/C/jOXLZedf7GvATc8+4LcQq2ItNoLS0VKtMXymIgb4RFSgYF S5vI55pATZbYFVJgsJzyOU9hxjOjP7mdxXKleh/+KQqqKt9hOBrs3bvbXkFzjAzNM+Bd Y7+v3aYy/z+M9046wwPT8RVtgOC4LRJLzJplNvmhpRUcpGG+RkITS0DvUp2xZC93uC1/ iM57QQMxt2YXa7hxHrAxYxt0b8VoaWCjq3NAUqwEiXnt0Sty1qS4ium1FvzH7jWDFQng IYTg== X-Received: by 10.180.91.11 with SMTP id ca11mr48508655wib.39.1388507759001; Tue, 31 Dec 2013 08:35:59 -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 fj8sm76137500wib.1.2013.12.31.08.35.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2013 08:35:58 -0800 (PST) From: jjhiblot@traphandler.com To: nicolas.ferre@atmel.com Subject: [PATCH 5/6] at91: dt: sam9261: Add an entry in the DT for the SMC/EBI bus driver. Date: Tue, 31 Dec 2013 17:32:13 +0100 Message-Id: <1388507534-10570-6-git-send-email-jjhiblot@traphandler.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1388507534-10570-1-git-send-email-jjhiblot@traphandler.com> References: <1388507534-10570-1-git-send-email-jjhiblot@traphandler.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131231_113621_194696_8932CA36 X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: jean-jacques hiblot , 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.3 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 From: jean-jacques hiblot This patch creates a new entry in the device tree for the 9261 under which should be the devices attached to the EBI. It also moves the NAND DT entries under this new bus. Signed-off-by: Jean-Jacques Hiblot --- arch/arm/boot/dts/at91sam9261.dtsi | 32 +++++++++++++++++--------- arch/arm/boot/dts/at91sam9261ek.dts | 46 ++++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi index 925f9ad..acd19b4 100644 --- a/arch/arm/boot/dts/at91sam9261.dtsi +++ b/arch/arm/boot/dts/at91sam9261.dtsi @@ -525,21 +525,31 @@ status = "disabled"; }; - nand0: nand@40000000 { - compatible = "atmel,at91rm9200-nand"; + smc: smc@ffffec00 { #address-cells = <1>; #size-cells = <1>; - reg = <0x40000000 0x10000000>; - atmel,nand-addr-offset = <22>; - atmel,nand-cmd-offset = <21>; + compatible = "atmel,at91sam9261-smc"; + reg = <0xffffec00 0x80>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_nand>; - - gpios = <&pioC 15 GPIO_ACTIVE_HIGH - &pioC 14 GPIO_ACTIVE_HIGH - 0 - >; status = "disabled"; + ranges = < >; + 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>, <&pinctrl_smc_nandoe>, <&pinctrl_smc_nandwe>; + smc,cs = <3>; + + gpios = <&pioC 15 GPIO_ACTIVE_HIGH + &pioC 14 GPIO_ACTIVE_HIGH + 0 + >; + status = "disabled"; + }; }; usb0: ohci@00500000 { diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts index 03c05fc..11cf619 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,41 @@ }; }; }; + + smc: smc@ffffec00 { + status = "okay"; + + nand0: nand@40000000 { + nand-bus-width = <8>; + nand-ecc-mode = "soft"; + nand-on-flash-bbt = <1>; + 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>; + + at91bootstrap@0 { + label = "at91bootstrap"; + reg = <0x0 0x20000>; + }; + }; + }; }; leds {