From patchwork Wed Jun 11 08:56:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 31733 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3EA01203C2 for ; Wed, 11 Jun 2014 08:59:46 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id uy5sf8530798obc.1 for ; Wed, 11 Jun 2014 01:59:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=y5L/a2fI1YnMPWNAx3nTSlDLDKhQ/1NhoO4SY8dAxkY=; b=d+Z0frXJIikAVDb+2IlJiGigpMH+Jk6oUVeytt8S0BUxmBCoI4NgQpaIfhv3sajWFU mPpROiCjSKqwn25o9rCsz+f9PfDMxHdgk79nF3+w9XGxiJ5IJCoNW6c4EoDxjKdtJOd2 kTNdbtTymj3UQ4pvYAXJ1dsiy3tO6Y39xrL7rL+JyB6vUuLm3DHQPOyLY2QiSBYgT05j XbljQiD6GWUbBt6MLBzv+9G9gdqw9b5WeskjRX+DO1T6L1ftZP7hV8LUZfQ7lmK86Afv 6+ZzgU638pJdQPwySHnsJoh6NeJqvX0CiuB1pmh9evEanxVCY7/9MXDL+51W4h48ZbES 4D3A== X-Gm-Message-State: ALoCoQn6JpZqWhxqtGLbUpta3oTAjeL+BPdWvNcsluJuGZipA96zucMNWvHzGZYgqQr7IeeFw94D X-Received: by 10.182.227.131 with SMTP id sa3mr19228391obc.38.1402477185894; Wed, 11 Jun 2014 01:59:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.145 with SMTP id g17ls2353233qge.76.gmail; Wed, 11 Jun 2014 01:59:45 -0700 (PDT) X-Received: by 10.58.126.135 with SMTP id my7mr38826524veb.27.1402477185782; Wed, 11 Jun 2014 01:59:45 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id b8si12771649vcf.7.2014.06.11.01.59.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Jun 2014 01:59:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id sa20so10265794veb.37 for ; Wed, 11 Jun 2014 01:59:45 -0700 (PDT) X-Received: by 10.220.59.65 with SMTP id k1mr37390164vch.22.1402477185705; Wed, 11 Jun 2014 01:59:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp286522vcb; Wed, 11 Jun 2014 01:59:45 -0700 (PDT) X-Received: by 10.140.104.204 with SMTP id a70mr45713724qgf.91.1402477185170; Wed, 11 Jun 2014 01:59:45 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id s5si30594646qas.87.2014.06.11.01.59.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jun 2014 01:59:45 -0700 (PDT) Received-SPF: none (google.com: linux-mtd-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1WueM8-00029x-Sn; Wed, 11 Jun 2014 08:58:04 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WueLq-0001l6-Lw; Wed, 11 Jun 2014 08:57:47 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5B8vO8m004378; Wed, 11 Jun 2014 03:57:24 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5B8vOIH020895; Wed, 11 Jun 2014 03:57:24 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Wed, 11 Jun 2014 03:57:24 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5B8uiSi020510; Wed, 11 Jun 2014 03:57:21 -0500 From: Roger Quadros To: , , Subject: [PATCH 10/36] ARM: dts: OMAP2+: Fix NAND device nodes Date: Wed, 11 Jun 2014 11:56:15 +0300 Message-ID: <1402477001-31132-11-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402477001-31132-1-git-send-email-rogerq@ti.com> References: <1402477001-31132-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140611_015746_873201_7810AEC1 X-CRM114-Status: UNSURE ( 9.16 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.7 (-----) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-5.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [192.94.94.40 listed in wl.mailspike.net] -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [192.94.94.40 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: devicetree@vger.kernel.org, nsekhar@ti.com, linux-kernel@vger.kernel.org, kyungmin.park@samsung.com, linux-mtd@lists.infradead.org, pekon@ti.com, ezequiel.garcia@free-electrons.com, javier@dowhile0.org, linux-omap@vger.kernel.org, Roger Quadros X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Add compatible id, GPMC register resource and interrupt resource to NAND controller nodes. Signed-off-by: Roger Quadros --- arch/arm/boot/dts/am335x-evm.dts | 8 ++++++-- arch/arm/boot/dts/am335x-igep0033.dtsi | 8 ++++++-- arch/arm/boot/dts/am43x-epos-evm.dts | 8 ++++++-- arch/arm/boot/dts/omap3-devkit8000.dts | 9 +++++++-- arch/arm/boot/dts/omap3-evm-37xx.dts | 10 +++++++--- arch/arm/boot/dts/omap3-igep0020.dts | 10 +++++++--- arch/arm/boot/dts/omap3-igep0030.dts | 8 ++++++-- arch/arm/boot/dts/omap3-ldp.dts | 10 +++++++--- arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 10 +++++++--- arch/arm/boot/dts/omap3-lilly-dbb056.dts | 7 ++++--- arch/arm/boot/dts/omap3430-sdp.dts | 8 ++++++-- 11 files changed, 69 insertions(+), 27 deletions(-) diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 6028217..fa25f2b 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -437,9 +437,13 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&nandflash_pins_s0>; - ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */ + ranges = <0 0 0x08000000 0x10000000 /* CS0 space, 16MB */ + 255 0 0x50000000 0x36c>; /* GPMC reg */ nand@0,0 { - reg = <0 0 0>; /* CS0, offset 0 */ + compatible = "ti,omap2-nand"; + reg = <0 0 4 /* CS0, I/O window 4 bytes */ + 255 0 0x36c>; /* GPMC reg */ + interrupts = <100>; ti,nand-ecc-opt = "bch8"; ti,elm-id = <&elm>; nand-bus-width = <8>; diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi index 9f22c18..4c3f21f 100644 --- a/arch/arm/boot/dts/am335x-igep0033.dtsi +++ b/arch/arm/boot/dts/am335x-igep0033.dtsi @@ -112,10 +112,14 @@ pinctrl-names = "default"; pinctrl-0 = <&nandflash_pins>; - ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */ + ranges = <0 0 0x08000000 0x10000000 /* CS0 space, 16MB */ + 255 0 0x50000000 0x36c>; /* GPMC reg */ nand@0,0 { - reg = <0 0 0>; /* CS0, offset 0 */ + compatible = "ti,omap2-nand"; + reg = <0 0 4 /* CS0, I/O window 4 bytes */ + 255 0 0x36c>; /* GPMC reg */ + interrupts = <100>; nand-bus-width = <8>; ti,nand-ecc-opt = "bch8"; gpmc,device-width = <1>; diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts index 167dbc8..d757134 100644 --- a/arch/arm/boot/dts/am43x-epos-evm.dts +++ b/arch/arm/boot/dts/am43x-epos-evm.dts @@ -268,9 +268,13 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&nand_flash_x8>; - ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */ + ranges = <0 0 0x08000000 0x10000000 /* CS0 space, 16MB */ + 255 0 0x50000000 0x36c>; /* GPMC reg */ nand@0,0 { - reg = <0 0 0>; /* CS0, offset 0 */ + compatible = "ti,omap2-nand"; + reg = <0 0 4 /* CS0, I/O window 4 bytes */ + 255 0 0x36c>; /* GPMC reg */ + interrupts = ; ti,nand-ecc-opt = "bch8"; ti,elm-id = <&elm>; nand-bus-width = <8>; diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts index da402f0..c5c7bbd 100644 --- a/arch/arm/boot/dts/omap3-devkit8000.dts +++ b/arch/arm/boot/dts/omap3-devkit8000.dts @@ -106,10 +106,15 @@ }; &gpmc { - ranges = <0 0 0x30000000 0x04>; /* CS0: NAND */ + ranges = <0 0 0x30000000 0x1000000 /* CS0 space, 16MB */ + 255 0 0x6e000000 0x02d4>; /* register space */ + /* Chip select 0 */ nand@0,0 { - reg = <0 0 0>; /* CS0, offset 0 */ + compatible = "ti,omap2-nand"; + reg = <0 0 4 /* NAND I/O window, 4 bytes */ + 255 0 0x02d4>; /* GPMC register space */ + interrupts = <20>; nand-bus-width = <16>; gpmc,sync-clk-ps = <0>; diff --git a/arch/arm/boot/dts/omap3-evm-37xx.dts b/arch/arm/boot/dts/omap3-evm-37xx.dts index 4df68ad..7b2b3f4 100644 --- a/arch/arm/boot/dts/omap3-evm-37xx.dts +++ b/arch/arm/boot/dts/omap3-evm-37xx.dts @@ -95,12 +95,16 @@ }; &gpmc { - ranges = <0 0 0x00000000 0x20000000>, - <5 0 0x2c000000 0x01000000>; + ranges = <0 0 0x00000000 0x1000000 /* CS0 space, 16MB */ + 5 0 0x2c000000 0x1000000 /* CS5 space, 16MB */ + 255 0 0x6e000000 0x02d4>; /* GPMC reg */ nand@0,0 { + compatible = "ti,omap2-nand"; + reg = <0 0 4 /* CS0, I/O window, 4 bytes */ + 255 0 0x02d4>; /* GPMC reg */ + interrupts = <20>; linux,mtd-name= "hynix,h8kds0un0mer-4em"; - reg = <0 0 0>; nand-bus-width = <16>; ti,nand-ecc-opt = "bch8"; diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts index b22caaa..9bd1362 100644 --- a/arch/arm/boot/dts/omap3-igep0020.dts +++ b/arch/arm/boot/dts/omap3-igep0020.dts @@ -197,12 +197,16 @@ }; &gpmc { - ranges = <0 0 0x00000000 0x20000000>, - <5 0 0x2c000000 0x01000000>; + ranges = <0 0 0x00000000 0x1000000 /* CS0 space, 16MB */ + 5 0 0x2c000000 0x1000000 /* CS5 space, 16MB */ + 255 0 0x6e000000 0x02d4>; /* GPMC reg */ nand@0,0 { + compatible = "ti,omap2-nand"; + reg = <0 0 4 /* CS0, I/O window, 4 bytes */ + 255 0 0x02d4>; /* GPMC reg */ + interrupts = <20>; linux,mtd-name= "micron,mt29c4g96maz"; - reg = <0 0 0>; nand-bus-width = <16>; ti,nand-ecc-opt = "bch8"; diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts index 2793749..1508154 100644 --- a/arch/arm/boot/dts/omap3-igep0030.dts +++ b/arch/arm/boot/dts/omap3-igep0030.dts @@ -55,11 +55,15 @@ }; &gpmc { - ranges = <0 0 0x00000000 0x20000000>; + ranges = <0 0 0x00000000 0x1000000 /* CS0 space, 16MB */ + 255 0 0x6e000000 0x02d4>; /* GPMC reg */ nand@0,0 { + compatible = "ti,omap2-nand"; + reg = <0 0 4 /* CS0, I/O window, 4 bytes */ + 255 0 0x02d4>; /* GPMC reg */ + interrupts = <20>; linux,mtd-name= "micron,mt29c4g96maz"; - reg = <0 0 0>; nand-bus-width = <16>; ti,nand-ecc-opt = "bch8"; diff --git a/arch/arm/boot/dts/omap3-ldp.dts b/arch/arm/boot/dts/omap3-ldp.dts index 0abe986..a219e11 100644 --- a/arch/arm/boot/dts/omap3-ldp.dts +++ b/arch/arm/boot/dts/omap3-ldp.dts @@ -96,12 +96,16 @@ }; &gpmc { - ranges = <0 0 0x00000000 0x01000000>, - <1 0 0x08000000 0x01000000>; + ranges = <0 0 0x00000000 0x1000000 /* CS0 space, 16MB */ + 1 0 0x08000000 0x1000000 /* CS1 space, 16MB */ + 255 0 0x6e000000 0x02d4>; /* GPMC reg */ nand@0,0 { + compatible = "ti,omap2-nand"; + reg = <0 0 4 /* CS0, I/O window, 4 bytes */ + 255 0 0x02d4>; /* GPMC reg */ + interrupts = <20>; linux,mtd-name= "micron,nand"; - reg = <0 0 0>; nand-bus-width = <16>; ti,nand-ecc-opt = "bch8"; diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi index cc1dce6..d0b64e7 100644 --- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi +++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi @@ -358,11 +358,15 @@ }; &gpmc { - ranges = <0 0 0x30000000 0x1000000>, - <7 0 0x15000000 0x01000000>; + ranges = <0 0 0x30000000 0x1000000 + 7 0 0x15000000 0x1000000 + 255 0 0x6e000000 0x02d4>; /* GPMC reg */ nand@0,0 { - reg = <0 0 0x1000000>; + compatible = "ti,omap2-nand"; + reg = <0 0 4 /* CS0, I/O window, 4 bytes */ + 255 0 0x02d4>; /* GPMC reg */ + interrupts = <20>; nand-bus-width = <16>; ti,nand-ecc-opt = "bch8"; /* no elm on omap3 */ diff --git a/arch/arm/boot/dts/omap3-lilly-dbb056.dts b/arch/arm/boot/dts/omap3-lilly-dbb056.dts index 834f7c6..3e09634 100644 --- a/arch/arm/boot/dts/omap3-lilly-dbb056.dts +++ b/arch/arm/boot/dts/omap3-lilly-dbb056.dts @@ -128,9 +128,10 @@ }; &gpmc { - ranges = <0 0 0x30000000 0x1000000>, /* nand assigned by COM a83x */ - <4 0 0x20000000 0x01000000>, - <7 0 0x15000000 0x01000000>; /* eth assigend by COM a83x */ + ranges = <0 0 0x30000000 0x1000000 /* nand assigned by COM a83x */ + 4 0 0x20000000 0x1000000 + 7 0 0x15000000 0x1000000 /* eth assigend by COM a83x */ + 255 0 0x6e000000 0x02d4>; /* GPMC reg */ ethernet@4,0 { compatible = "smsc,lan9117", "smsc,lan9115"; diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts index 02f69f4..bf5f8b9 100644 --- a/arch/arm/boot/dts/omap3430-sdp.dts +++ b/arch/arm/boot/dts/omap3430-sdp.dts @@ -52,7 +52,8 @@ &gpmc { ranges = <0 0 0x10000000 0x08000000>, <1 0 0x28000000 0x08000000>, - <2 0 0x20000000 0x10000000>; + <2 0 0x20000000 0x10000000>, + <255 0 0x6e000000 0x02d4>; /* GPMC reg */ nor@0,0 { compatible = "cfi-flash"; @@ -103,10 +104,13 @@ }; nand@1,0 { + compatible = "ti,omap2-nand"; + reg = <1 0 4 /* CS1, I/O window, 4 bytes */ + 255 0 0x02d4>; /* GPMC reg */ + interrupts = <20>; linux,mtd-name= "micron,mt29f1g08abb"; #address-cells = <1>; #size-cells = <1>; - reg = <1 0 0x08000000>; ti,nand-ecc-opt = "ham1"; nand-bus-width = <8>; gpmc,cs-on-ns = <0>;