From: dianders@chromium.org (Doug Anderson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 3/4] ARM: dts: Take the mmc slot node out of rk3288-evb
Date: Wed, 6 Aug 2014 10:09:43 -0700 [thread overview]
Message-ID: <1407344984-14176-4-git-send-email-dianders@chromium.org> (raw)
In-Reply-To: <1407344984-14176-1-git-send-email-dianders@chromium.org>
In Jaehoon's (mmc: dw_mmc: Slot quirk "disable-wp" is deprecated) the
slot node is no longer used. Remove it.
Note that if Jaehoon's patch lands before my (ARM: dts: Enable emmc
and sdmmc on the rk3288-evb boards) then this could be squashed into
the later.
Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
Changes in v3: None
Changes in v2:
- Refer to the new title of Jaehoon's patch
arch/arm/boot/dts/rk3288-evb.dtsi | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index c2cf72f..ebce49a 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -53,16 +53,12 @@
broken-cd;
bus-width = <8>;
cap-mmc-highspeed;
+ disable-wp;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
status = "okay";
-
- slot at 0 {
- reg = <0>;
- disable-wp;
- };
};
&sdmmc {
@@ -70,15 +66,11 @@
cap-mmc-highspeed;
cap-sd-highspeed;
card-detect-delay = <200>;
+ disable-wp; /* wp not hooked up */
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
status = "okay";
-
- slot at 0 {
- reg = <0>;
- disable-wp; /* wp not hooked up */
- };
};
&i2c0 {
--
2.0.0.526.g5318336
next prev parent reply other threads:[~2014-08-06 17:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-06 17:09 [PATCH v3 0/4] Add eMMC and SD card support for rk3288-evb Doug Anderson
2014-08-06 17:09 ` [PATCH v3 1/4] ARM: dts: Add emmc and sdmmc to the rk3288 device tree Doug Anderson
2014-08-12 21:06 ` Doug Anderson
2014-08-12 22:07 ` Heiko Stübner
2014-08-12 22:11 ` Sonny Rao
2014-08-12 23:24 ` Doug Anderson
2014-08-06 17:09 ` [PATCH v3 2/4] ARM: dts: Enable emmc and sdmmc on the rk3288-evb boards Doug Anderson
2014-08-06 17:09 ` Doug Anderson [this message]
2014-08-06 17:09 ` [PATCH v3 4/4] ARM: dts: mmc slot node gone on rk3288 => no more address / size cells Doug Anderson
2014-08-07 8:24 ` [PATCH v3 0/4] Add eMMC and SD card support for rk3288-evb Jaehoon Chung
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=1407344984-14176-4-git-send-email-dianders@chromium.org \
--to=dianders@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).