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: 9244877 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 1520760487 for ; Sun, 24 Jul 2016 12:14:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0549F26C72 for ; Sun, 24 Jul 2016 12:14:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE17028066; Sun, 24 Jul 2016 12:14:03 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8458326C72 for ; Sun, 24 Jul 2016 12:14:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bRIGp-00036G-9h; Sun, 24 Jul 2016 12:12:35 +0000 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bRIGT-0002x0-AY for linux-arm-kernel@lists.infradead.org; Sun, 24 Jul 2016 12:12:15 +0000 Received: by mail-lf0-x241.google.com with SMTP id l69so9811553lfg.1 for ; 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=OR1nIWSR77KTSJEVeknsOrZ1PA9PP+G2gxaazMU4YtRi0ueWjfZUSTuWZXOn+qspTq OsQIyhdiSH23vxqjK3DdwBQwy99rbodErWmKajRV2fbq/xzanDORliPfj8Bn/QQq71ib vxdyzkkwNNcIkuC9fXgGw5XteN9Tvh5rEg8MTKz1ubmvCAF2FSI6sy016UdLDlufdATA HLHEiKh3fBQLktQhbWxD0tu/DnIXcf0EZfIkrjb/FVciVdY2MGuOB5Dipsj+psgIzufz sng2cjlGzSo/xNkF9QDmcJXLuty817VLVBr60PRmdIEiayRV4jGTbA4Bgm7HGEh1YOQX ulxQ== X-Gm-Message-State: AEkooussyHHFhZc7MtIjS9kzfTNZHHJ3rUsyHoHScqv79Ep36XrSyxARbIGAJL9frmK4kA== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160724_051213_687760_090E27EF X-CRM114-Status: GOOD ( 11.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , stable@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Johan Hovold , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Roger Quadros MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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>;