From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
To: linux-tegra@vger.kernel.org
Cc: Javier Martinez Canillas <javier.martinez@collabora.co.uk>,
Tomeu Vizoso <tomeu.vizoso@collabora.com>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Russell King <linux@arm.linux.org.uk>,
Stephen Warren <swarren@wwwdotorg.org>,
Thierry Reding <thierry.reding@gmail.com>,
Alexandre Courbot <gnurou@gmail.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] ARM: tegra: remove wp-gpios from the generic nyan dtsi
Date: Tue, 6 Jan 2015 11:37:29 +0100 [thread overview]
Message-ID: <1420540653-14816-5-git-send-email-tomeu.vizoso@collabora.com> (raw)
In-Reply-To: <1420540653-14816-1-git-send-email-tomeu.vizoso@collabora.com>
As the nyan-blaze has a micro-sd slot, as opposed to nyan-big, which has a full SD
slot.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
arch/arm/boot/dts/tegra124-nyan-big.dts | 4 ++++
arch/arm/boot/dts/tegra124-nyan.dtsi | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts
index 2041077..598c090 100644
--- a/arch/arm/boot/dts/tegra124-nyan-big.dts
+++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
@@ -6,6 +6,10 @@
model = "Acer Chromebook 13 CB5-311";
compatible = "google,nyan-big", "google,nyan", "nvidia,tegra124";
+ sdhci@0,700b0400 { /* SD Card on this bus */
+ wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
+ };
+
sound {
nvidia,model = "Acer Chromebook 13 CB5-311";
};
diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index 4c68658..12d757e 100644
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -820,7 +820,6 @@
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
- wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
bus-width = <4>;
no-1-8-v;
vqmmc-supply = <&vddio_sdmmc3>;
--
1.9.3
next prev parent reply other threads:[~2015-01-06 10:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-06 10:37 [PATCH 0/4] Add support for nyan-blaze Tomeu Vizoso
2015-01-06 10:37 ` [PATCH 1/4] ARM: tegra: rely on bootloader pinmux programming on nyan-big Tomeu Vizoso
[not found] ` <1420540653-14816-2-git-send-email-tomeu.vizoso-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2015-01-06 17:09 ` Stephen Warren
[not found] ` <54AC16B0.5050703-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2015-01-07 3:37 ` Andrew Bresticker
2015-01-07 8:06 ` Tomeu Vizoso
[not found] ` <CAAObsKB1gMcLZ=n8Mc6JSLQHn5-6VWOhERLgYTdi6nit6yCj5w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-01-07 17:15 ` Stephen Warren
2015-01-06 10:37 ` [PATCH 2/4] ARM: tegra: Move out nyan-generic parts out from the nyan-big DT Tomeu Vizoso
[not found] ` <1420540653-14816-3-git-send-email-tomeu.vizoso-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2015-01-06 13:06 ` Thierry Reding
[not found] ` <20150106130656.GF31830-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2015-01-06 17:30 ` Andrew Bresticker
[not found] ` <CAL1qeaETERAm6aTwWycCat-RzQz8UmixWtc-uK4dFsu7wL8HAg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-01-06 17:40 ` Olof Johansson
2015-01-06 13:24 ` Eduardo Valentin
2015-01-06 17:10 ` Stephen Warren
[not found] ` <1420540653-14816-1-git-send-email-tomeu.vizoso-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2015-01-06 10:37 ` [PATCH 3/4] ARM: tegra: Add DTS for the nyan-blaze board Tomeu Vizoso
2015-01-06 10:37 ` Tomeu Vizoso [this message]
2015-01-06 13:08 ` [PATCH 4/4] ARM: tegra: remove wp-gpios from the generic nyan dtsi Thierry Reding
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=1420540653-14816-5-git-send-email-tomeu.vizoso@collabora.com \
--to=tomeu.vizoso@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gnurou@gmail.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=javier.martinez@collabora.co.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.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).