From patchwork Tue Sep 2 13:57:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 36491 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8DEF2203BE for ; Tue, 2 Sep 2014 13:57:28 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id eb12sf38668542oac.1 for ; Tue, 02 Sep 2014 06:57:28 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=MZrSnHbIUGHKL8qF/bK09UnVkE8yQCmBjDRJ3hC+xOw=; b=f0cH7jxV+Lyata8UUtOnVMB8zrP0IaHq1UhV+cfDvYFuxygerUfFL9JdkGPcxdVRUX REOoYm1Nhy1j9hEkUe/bqPDOIrhBGBi9lu2+WWTadXy+0ChQlcrJ2UOjz2hWw6n4aWs6 PX5kfk+Q/i39R39b7Fs0+6ZiXkXrQacuVLY3+3LDHbT/U2qkZO7uwTzAglw5r4+UAnCI 5DeFTQ7hYeIS2dU17eXUZq5WkgZtBijY2Z/0ub1hfZG4YS92LdOyYyGS4D7FT/LEikis H9p3VrmCwZXNHyj5p/8bTiUZtX9JxWNwOwrWhieKItBgxUiQTe713SkEpzvSJAm/NRh0 AkDg== X-Gm-Message-State: ALoCoQmsadOKMB6fGGjjt5jEswvFFDYpCuOWa+dBuxXZBULqKlYIe5rc75ZIkpCS5syVWG7E9Za7 X-Received: by 10.50.153.98 with SMTP id vf2mr14813198igb.5.1409666248084; Tue, 02 Sep 2014 06:57:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.47 with SMTP id k44ls2334354qgd.73.gmail; Tue, 02 Sep 2014 06:57:28 -0700 (PDT) X-Received: by 10.52.234.228 with SMTP id uh4mr1494424vdc.34.1409666247960; Tue, 02 Sep 2014 06:57:27 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id n5si2327950vcz.59.2014.09.02.06.57.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Sep 2014 06:57:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so6943021vcb.21 for ; Tue, 02 Sep 2014 06:57:27 -0700 (PDT) X-Received: by 10.220.110.77 with SMTP id m13mr949279vcp.35.1409666247873; Tue, 02 Sep 2014 06:57:27 -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.45.67 with SMTP id uj3csp532041vcb; Tue, 2 Sep 2014 06:57:27 -0700 (PDT) X-Received: by 10.68.134.104 with SMTP id pj8mr20316420pbb.124.1409666246975; Tue, 02 Sep 2014 06:57:26 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t1si3479062pdr.206.2014.09.02.06.57.26 for ; Tue, 02 Sep 2014 06:57:26 -0700 (PDT) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754001AbaIBN5Z (ORCPT + 5 others); Tue, 2 Sep 2014 09:57:25 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:49577 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753979AbaIBN5X (ORCPT ); Tue, 2 Sep 2014 09:57:23 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s82DvM10018004; Tue, 2 Sep 2014 08:57:22 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s82DvMMP028559; Tue, 2 Sep 2014 08:57:22 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Tue, 2 Sep 2014 08:57:23 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s82DvAU4003715; Tue, 2 Sep 2014 08:57:21 -0500 From: Roger Quadros To: CC: , , Roger Quadros , Sourav Poddar Subject: [PATCH 6/6] ARM: dts: am43x-epos-evm: Disable QSPI to prevent conflict with GPMC-NAND Date: Tue, 2 Sep 2014 16:57:07 +0300 Message-ID: <1409666227-20622-7-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1409666227-20622-1-git-send-email-rogerq@ti.com> References: <1409666227-20622-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@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.220.176 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Both QSPI and GPMC-NAND share the same Pin (A8) from the SoC for Chip Select functionality. So both can't be enabled simultaneously. Disable QSPI node to prevent the pin conflict as well as be similar to 3.12 release. CC: Sourav Poddar Signed-off-by: Roger Quadros --- arch/arm/boot/dts/am43x-epos-evm.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts index b489b27..ac3e485 100644 --- a/arch/arm/boot/dts/am43x-epos-evm.dts +++ b/arch/arm/boot/dts/am43x-epos-evm.dts @@ -435,7 +435,7 @@ }; &gpmc { - status = "okay"; + status = "okay"; /* Disable QSPI when enabling GPMC (NAND) */ pinctrl-names = "default"; pinctrl-0 = <&nand_flash_x8>; ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */ @@ -556,7 +556,7 @@ }; &qspi { - status = "okay"; + status = "disabled"; /* Disable GPMC (NAND) when enabling QSPI */ pinctrl-names = "default"; pinctrl-0 = <&qspi1_default>;