From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung•com>,
Jaehoon Chung <jh80.chung@samsung•com>,
Kukjin Kim <kgene.kim@samsung•com>
Subject: linux-next: manual merge of the mmc-uh tree with Linus' tree
Date: Fri, 10 Oct 2014 12:58:09 +1100 [thread overview]
Message-ID: <20141010125809.54245801@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1160 bytes --]
Hi Ulf,
Today's linux-next merge of the mmc-uh tree got a conflict in
arch/arm/boot/dts/exynos5420-arndale-octa.dts between commit
aaa25a5a33cb ("ARM: dts: unuse the slot-node and deprecate the
supports-highspeed for dw-mmc in exynos") from Linus' tree and commit
583f958b8a23 ("ARM: dts: fix MMC2 regulators for Exynos5420 Arndale
Octa board") from the mmc-uh tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 75080996ec76,1255d833d576..000000000000
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@@ -69,9 -74,13 +69,10 @@@
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
- vmmc-supply = <&ldo10_reg>;
+ vmmc-supply = <&ldo19_reg>;
+ vqmmc-supply = <&ldo13_reg>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-sd-highspeed;
};
hsi2c_4: i2c@12CA0000 {
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-10-10 1:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20141010125809.54245801@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=b.zolnierkie@samsung$(echo .)com \
--cc=jh80.chung@samsung$(echo .)com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ulf.hansson@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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