From patchwork Fri Sep 18 14:53:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 53911 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id AB8C4218E3 for ; Fri, 18 Sep 2015 14:58:01 +0000 (UTC) Received: by lagj9 with SMTP id j9sf20740602lag.0 for ; Fri, 18 Sep 2015 07:58:00 -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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=fwx8FszJGxmsDW6k2wS8hO0cfSRz0Op9sqQHSoMyuxo=; b=JUFxnfcy25KFUm9Zr48WXR1LZl+8zTEz0PaWBuk6NOLaVBN9Uwrt4J3TWtVNu526E+ YVk3e+PwidBX3eHbGZh8+c8pt8XljvuLYNIup46Y/ohCPISYTw/CVb+5V2zCyPE6oeQ9 yfjJ86XfOp3SbYjUZe2yXVv0vqG+oHxNlOrIIrAbsM4rUFwxzkdB8Dot+SrNK7IoZ14h DPTe4d9H25xJBR/cEFNpTaCmWzTfq0RFRZQNvC7dh23en6XDWQbHP6UOs3CqyeOVpSz+ Caaqryzex1NHPZGeJ4noWaNAmTvEQ8Nff0HqXTOXX/Us1ks929DzNf4VtaVWHOKmGn4y iBfg== X-Gm-Message-State: ALoCoQl6Rk223NEfz6AtkqDh/JbFgwb/hdB4WQwF0zm8GDFWmUprUycp5rwUn3d4kNAJ55DOoa+Z X-Received: by 10.112.199.8 with SMTP id jg8mr513955lbc.10.1442588280688; Fri, 18 Sep 2015 07:58:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.138 with SMTP id y10ls236944laj.35.gmail; Fri, 18 Sep 2015 07:58:00 -0700 (PDT) X-Received: by 10.152.3.136 with SMTP id c8mr3402107lac.7.1442588280521; Fri, 18 Sep 2015 07:58:00 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id sr10si6240327lbb.118.2015.09.18.07.58.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Sep 2015 07:58:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by lamp12 with SMTP id p12so31510284lam.0 for ; Fri, 18 Sep 2015 07:58:00 -0700 (PDT) X-Received: by 10.152.37.162 with SMTP id z2mr3253939laj.117.1442588280350; Fri, 18 Sep 2015 07:58:00 -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.112.59.35 with SMTP id w3csp345673lbq; Fri, 18 Sep 2015 07:57:59 -0700 (PDT) X-Received: by 10.107.137.144 with SMTP id t16mr14524616ioi.102.1442588279316; Fri, 18 Sep 2015 07:57:59 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q132si7115965ioe.135.2015.09.18.07.57.58; Fri, 18 Sep 2015 07:57:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754583AbbIRO54 (ORCPT + 30 others); Fri, 18 Sep 2015 10:57:56 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:39624 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751527AbbIRO4X (ORCPT ); Fri, 18 Sep 2015 10:56:23 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8IEu16Y001188; Fri, 18 Sep 2015 09:56:01 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8IEu1oo010158; Fri, 18 Sep 2015 09:56:01 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.224.2; Fri, 18 Sep 2015 09:56:01 -0500 Received: from rockdesk.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8IEseAe002598; Fri, 18 Sep 2015 09:55:58 -0500 From: Roger Quadros To: CC: , , , , , , , , , , Roger Quadros Subject: [PATCH v3 24/27] ARM: dts: am335x: Fix NAND device nodes Date: Fri, 18 Sep 2015 17:53:46 +0300 Message-ID: <1442588029-13769-25-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1442588029-13769-1-git-send-email-rogerq@ti.com> References: <1442588029-13769-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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.215.41 as permitted sender) smtp.mailfrom=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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add compatible id, GPMC register resource and interrupt resource to NAND controller nodes. The GPMC driver now implements gpiochip and irqchip so enable gpio-controller and interrupt-controller properties. With this the interrupt parent of NAND node changes so fix it accordingly. Signed-off-by: Roger Quadros --- arch/arm/boot/dts/am335x-chilisom.dtsi | 3 +++ arch/arm/boot/dts/am335x-evm.dts | 3 +++ arch/arm/boot/dts/am335x-igep0033.dtsi | 3 +++ arch/arm/boot/dts/am33xx.dtsi | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/am335x-chilisom.dtsi b/arch/arm/boot/dts/am335x-chilisom.dtsi index 7e9a34d..e2b5e22 100644 --- a/arch/arm/boot/dts/am335x-chilisom.dtsi +++ b/arch/arm/boot/dts/am335x-chilisom.dtsi @@ -208,7 +208,10 @@ pinctrl-0 = <&nandflash_pins>; ranges = <0 0 0x08000000 0x01000000>; /* CS0 0 @addr 0x08000000, size 0x01000000 */ nand@0,0 { + compatible = "ti,omap2-nand"; reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ + interrupt-parent = <&intc>; + interrupts = <100>; ti,nand-ecc-opt = "bch8"; ti,elm-id = <&elm>; nand-bus-width = <8>; diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 1942a5c..bea36e1 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -519,7 +519,10 @@ pinctrl-0 = <&nandflash_pins_s0>; ranges = <0 0 0x08000000 0x1000000>; /* CS0: 16MB for NAND */ nand@0,0 { + compatible = "ti,omap2-nand"; reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ + interrupt-parent = <&intc>; + 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 c0e1135..9252ff1 100644 --- a/arch/arm/boot/dts/am335x-igep0033.dtsi +++ b/arch/arm/boot/dts/am335x-igep0033.dtsi @@ -129,7 +129,10 @@ ranges = <0 0 0x08000000 0x1000000>; /* CS0: 16MB for NAND */ nand@0,0 { + compatible = "ti,omap2-nand"; reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ + interrupt-parent = <&intc>; + interrupts = <100>; nand-bus-width = <8>; ti,nand-ecc-opt = "bch8"; gpmc,device-width = <1>; diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index d23e252..e065f21 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -823,6 +823,10 @@ gpmc,num-waitpins = <2>; #address-cells = <2>; #size-cells = <1>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; status = "disabled"; };