devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Teresa Remmet <t.remmet@phytec.de>
To: linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Cc: "Tony Lindgren" <tony@atomide.com>,
	"Mark Rutland" <mark.rutland@arm.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Daniel Schultz" <d.schultz@phytec.de>,
	"Benoît Cousson" <bcousson@baylibre.com>
Subject: [PATCH 4/7] ARM: dts: am335x-phycore-som: Enable gpmc node in dts files
Date: Fri, 24 May 2019 15:20:00 +0200	[thread overview]
Message-ID: <1558704003-393769-5-git-send-email-t.remmet@phytec.de> (raw)
In-Reply-To: <1558704003-393769-1-git-send-email-t.remmet@phytec.de>

As nand flash is not always the primary storage device any more
disable it in the phycore-som include file. Enable it the device tree
files where it is populated.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/boot/dts/am335x-phycore-rdk.dts  | 4 ++++
 arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +-
 arch/arm/boot/dts/am335x-wega-rdk.dts     | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/am335x-phycore-rdk.dts b/arch/arm/boot/dts/am335x-phycore-rdk.dts
index 305f0b35d6ea..d674d91e18c7 100644
--- a/arch/arm/boot/dts/am335x-phycore-rdk.dts
+++ b/arch/arm/boot/dts/am335x-phycore-rdk.dts
@@ -13,6 +13,10 @@
 #include "am335x-pcm-953.dtsi"
 
 /* SoM */
+&gpmc {
+	status = "okay";
+};
+
 &i2c_eeprom {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 2bc2265534e1..adf04dbefe28 100644
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -190,7 +190,7 @@
 };
 
 &gpmc {
-	status = "okay";
+	status = "disabled";
 	pinctrl-names = "default";
 	pinctrl-0 = <&nandflash_pins>;
 	ranges = <0 0 0x08000000 0x1000000>;   /* CS0: NAND */
diff --git a/arch/arm/boot/dts/am335x-wega-rdk.dts b/arch/arm/boot/dts/am335x-wega-rdk.dts
index 6431b7db8109..fd8a844ba780 100644
--- a/arch/arm/boot/dts/am335x-wega-rdk.dts
+++ b/arch/arm/boot/dts/am335x-wega-rdk.dts
@@ -13,6 +13,10 @@
 #include "am335x-wega.dtsi"
 
 /* SoM */
+&gpmc {
+	status = "okay";
+};
+
 &i2c_eeprom {
 	status = "okay";
 };
-- 
2.7.4

  parent reply	other threads:[~2019-05-24 13:20 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-24 13:19 [PATCH 0/7] AM335x Phytec boards update Teresa Remmet
2019-05-24 13:19 ` [PATCH 1/7] ARM: dts: am335x phytec boards: Fix cd-gpios active level Teresa Remmet
2019-06-10  7:07   ` Tony Lindgren
2019-06-10 12:10     ` Tony Lindgren
2019-05-24 13:19 ` [PATCH 2/7] ARM: dts: am335x phytec boards: Remove regulator node Teresa Remmet
2019-05-24 13:19 ` [PATCH 3/7] ARM: dts: am335x-phycore-som: Add emmc node Teresa Remmet
2019-05-24 13:20 ` Teresa Remmet [this message]
2019-05-24 13:20 ` [PATCH 5/7] ARM: dts: am335x-pcm-953: Update user led names Teresa Remmet
2019-05-24 13:20 ` [PATCH 6/7] ARM: dts: am335x-pcm-953: Remove eth phy delay Teresa Remmet
2019-05-24 13:20 ` [PATCH 7/7] ARM: dts: Add support for phyBOARD-REGOR-AM335x Teresa Remmet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1558704003-393769-5-git-send-email-t.remmet@phytec.de \
    --to=t.remmet@phytec.de \
    --cc=bcousson@baylibre.com \
    --cc=d.schultz@phytec.de \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).