devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Doug Anderson <dianders@chromium.org>
To: Heiko Stuebner <heiko@sntech.de>,
	Seungwon Jeon <tgih.jun@samsung.com>,
	Jaehoon Chung <jh80.chung@samsung.com>,
	Chris Ball <chris@printf.net>,
	Ulf Hansson <ulf.hansson@linaro.org>
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
	Addy Ke <addy.ke@rock-chips.com>,
	linux@arm.linux.org.uk, pawel.moll@arm.com,
	Arnd Bergmann <arnd@arndb.de>,
	ijc+devicetree@hellion.org.uk, linux-kernel@vger.kernel.org,
	linux-mmc@vger.kernel.org, Kever Yang <kever.yang@rock-chips.com>,
	Doug Anderson <dianders@chromium.org>,
	robh+dt@kernel.org, galak@codeaurora.org,
	Sonny Rao <sonnyrao@chromium.org>,
	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@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@0 {
-		reg = <0>;
-		disable-wp;		/* wp not hooked up */
-	};
 };
 
 &i2c0 {
-- 
2.0.0.526.g5318336

  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
     [not found]         ` <CAPz6YkX2ht62Swzepd=g6bBy6w2+SJ2C2M4xvBmWbtAjRHEocg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
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=addy.ke@rock-chips.com \
    --cc=arnd@arndb.de \
    --cc=chris@printf.net \
    --cc=devicetree@vger.kernel.org \
    --cc=galak@codeaurora.org \
    --cc=heiko@sntech.de \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=jh80.chung@samsung.com \
    --cc=kever.yang@rock-chips.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@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=sonnyrao@chromium.org \
    --cc=tgih.jun@samsung.com \
    --cc=ulf.hansson@linaro.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).