From: Vivek Gautam <gautam.vivek@samsung.com>
To: linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: kgene.kim@samsung.com, dianders@chromium.org,
jh80.chung@samsung.com, tgih.jun@samsung.com,
javier.martinez@collabora.co.uk, khilman@linaro.org,
Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Subject: [PATCH RESEND] ARM: DTS: correct the capability string for mmc0
Date: Tue, 16 Sep 2014 14:20:09 +0530 [thread overview]
Message-ID: <1410857409-24767-1-git-send-email-gautam.vivek@samsung.com> (raw)
From: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
MMC capability for HS200 is parsed in mmc/core/host.c as
dts string "mmc-hs200-1_8v".
This patch corrects the dts string for Exynos5420 based peach-pit
and Exynos5800 based peach-pi boards.
Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
---
Hi Kukjin,
As commented by Doug earlier for this patch, the two patches required
-- mmc: dw_mmc: Make sure we don't get stuck when we get an error
-- mmc: dw_mmc: change to use recommended reset procedure
are now merged in upstream.
So you can go ahead and pick this change.
arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 9a23382..e52ed04 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -560,7 +560,7 @@
status = "okay";
num-slots = <1>;
broken-cd;
- caps2-mmc-hs200-1_8v;
+ mmc-hs200-1_8v;
cap-mmc-highspeed;
non-removable;
card-detect-delay = <200>;
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 1d31c81..8616fbd 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -548,7 +548,7 @@
status = "okay";
num-slots = <1>;
broken-cd;
- caps2-mmc-hs200-1_8v;
+ mmc-hs200-1_8v;
cap-mmc-highspeed;
non-removable;
card-detect-delay = <200>;
--
1.7.10.4
next reply other threads:[~2014-09-16 8:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-16 8:50 Vivek Gautam [this message]
2014-09-16 15:58 ` [PATCH RESEND] ARM: DTS: correct the capability string for mmc0 Doug Anderson
2014-09-17 12:09 ` Kukjin Kim
2014-09-17 12:13 ` Vivek Gautam
2014-09-17 12:19 ` Vivek Gautam
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=1410857409-24767-1-git-send-email-gautam.vivek@samsung.com \
--to=gautam.vivek@samsung.com \
--cc=ch.naveen@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=javier.martinez@collabora.co.uk \
--cc=jh80.chung@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=khilman@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=tgih.jun@samsung.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).