From patchwork Sun Jul 24 12:11:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 9244873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0317060487 for ; Sun, 24 Jul 2016 12:12:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7FE726C72 for ; Sun, 24 Jul 2016 12:12:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA08828066; Sun, 24 Jul 2016 12:12:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8019F26C72 for ; Sun, 24 Jul 2016 12:12:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752492AbcGXMMM (ORCPT ); Sun, 24 Jul 2016 08:12:12 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34497 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752391AbcGXMLx (ORCPT ); Sun, 24 Jul 2016 08:11:53 -0400 Received: by mail-lf0-f65.google.com with SMTP id l69so9811554lfg.1; Sun, 24 Jul 2016 05:11:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=iu/i3L7p8nzkAVUVGvLi3NKaZNiIMgS4vEc5116NziM=; b=gj9w3hFq/S0xmW75A7YtPTGbgH0behjRHelHYtGS64hxh50i9oHM2pk3XbT0sLIlSP lLCkMiVNzzfxTEM0zqraCPY4e9RjXEKeyvBoCfYYvkhlnQPMYr2xFAr4UjsrrmUE71h0 fJvoE1YM4YMjyw5sKjdmw6J7zRiMBCgJXxYsPfNaJfDUrD5hSWYV5MkqAjSyMl7PtoJP lMEM6A8TkHeZ7hBbpSE1hBDxcksJmJmBXmqYSg8T1qBnPMvgpi8BMEXEPeDQ7Rt/i0XK DM9aslSfiiFlB4UR4TQa/lx15uumXmp71Q4jN9FHaj5vaGp/O/F4fn6U5qE593OJlqup cWyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=iu/i3L7p8nzkAVUVGvLi3NKaZNiIMgS4vEc5116NziM=; b=iakzkLHGCjJyEqrMAghUDxIg6Z22/zYLLDX//aLRfPoYAgcxBdDmh8olkowbkD/KZ5 35HmMgvhg/1fBomMbN4Qp5lEHYk0zbGhIwGfSZXJ+/8KXSiw/9aHbbDpAht98bwgin+F 4WM1n96FGWjQTfr69wTwAC3GOkjYSfp5uheXmrq1VjtmBY5SbRv8HDMhwPa7rS/4H2If vqBIg56O5EjzxMhBzSS6moP9j92eif/TDT6Gog+y8BXAB03zSzPRpG0/KfFff+CCHJPv p+4D1s7tVYTcmA+yxHnOXVxQtt7FPpppqXpWLOb01nvvCRxhrjwIgI4GAkXV91K1bsxZ LeRQ== X-Gm-Message-State: AEkoouuofxZ6UcWYNuLJCZtFPpIH3VO+ZjvvR0zAFamAZCMtszgnFn5MQpltIkJolD9pfw== X-Received: by 10.25.133.212 with SMTP id h203mr6117475lfd.28.1469362311075; Sun, 24 Jul 2016 05:11:51 -0700 (PDT) Received: from xi.terra ([84.216.67.69]) by smtp.gmail.com with ESMTPSA id p102sm4555434lfi.9.2016.07.24.05.11.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jul 2016 05:11:49 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1bRIGA-0005Ec-Sy; Sun, 24 Jul 2016 14:11:54 +0200 From: Johan Hovold To: Tony Lindgren Cc: =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Rob Herring , Mark Rutland , Russell King , Roger Quadros , linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Johan Hovold Subject: [PATCH 3/3] ARM: dts: overo: fix gpmc nand on boards with ethernet Date: Sun, 24 Jul 2016 14:11:00 +0200 Message-Id: <1469362260-20066-4-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1469362260-20066-1-git-send-email-johan@kernel.org> References: <1469362260-20066-1-git-send-email-johan@kernel.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The gpmc ranges property for NAND at CS0 was being overridden by later includes that defined gpmc ethernet nodes, effectively breaking NAND on these systems: omap-gpmc 6e000000.gpmc: /ocp/gpmc@6e000000/nand@0,0 has malformed 'reg' property Instead of redefining the NAND range in every such dtsi, define all currently used ranges in omap3-overo-base.dtsi. Fixes: 98ce6007efb4 ("ARM: dts: overo: Support PoP NAND") Cc: stable # 4.3 Signed-off-by: Johan Hovold --- arch/arm/boot/dts/omap3-overo-base.dtsi | 4 +++- arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi | 2 -- arch/arm/boot/dts/omap3-overo-tobi-common.dtsi | 2 -- arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 3 --- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi index b15c435439fb..3e946cac55f3 100644 --- a/arch/arm/boot/dts/omap3-overo-base.dtsi +++ b/arch/arm/boot/dts/omap3-overo-base.dtsi @@ -223,7 +223,9 @@ }; &gpmc { - ranges = <0 0 0x30000000 0x1000000>; /* CS0 */ + ranges = <0 0 0x30000000 0x1000000>, /* CS0 */ + <4 0 0x2b000000 0x1000000>, /* CS4 */ + <5 0 0x2c000000 0x1000000>; /* CS5 */ nand@0,0 { compatible = "ti,omap2-nand"; diff --git a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi index 7df27926ead2..4f4c6efbd518 100644 --- a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi +++ b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi @@ -55,8 +55,6 @@ #include "omap-gpmc-smsc9221.dtsi" &gpmc { - ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ - ethernet@gpmc { reg = <5 0 0xff>; interrupt-parent = <&gpio6>; diff --git a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi index 9e24b6a1d07b..1b304e2f1bd2 100644 --- a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi +++ b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi @@ -27,8 +27,6 @@ #include "omap-gpmc-smsc9221.dtsi" &gpmc { - ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ - ethernet@gpmc { reg = <5 0 0xff>; interrupt-parent = <&gpio6>; diff --git a/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi b/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi index 334109e14613..82e98ee3023a 100644 --- a/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi +++ b/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi @@ -15,9 +15,6 @@ #include "omap-gpmc-smsc9221.dtsi" &gpmc { - ranges = <4 0 0x2b000000 0x1000000>, /* CS4 */ - <5 0 0x2c000000 0x1000000>; /* CS5 */ - smsc1: ethernet@gpmc { reg = <5 0 0xff>; interrupt-parent = <&gpio6>;