From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Felipe Balbi <balbi@ti.com>, Matt Porter <mporter@ti.com>,
Benoit Cousson <bcousson@baylibre.com>,
Joel Fernandes <joelf@ti.com>
Subject: linux-next: manual merge of the input tree with Linus' tree
Date: Tue, 12 Nov 2013 12:58:42 +1100 [thread overview]
Message-ID: <20131112125842.0f7b06add01d795cbcdce5bf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1492 bytes --]
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in
arch/arm/boot/dts/am335x-evmsk.dts between commit 55b4452b4b70 ("ARM:
dts: AM33XX: Add MMC support and documentation") (and others) from Linus'
tree and commit 2c027b7c48a8 ("arm: dts: am335x sk: add touchscreen
support") from the input 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/am335x-evmsk.dts
index 03febf85fd2f,d7c2c0c58437..000000000000
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@@ -452,36 -420,12 +452,46 @@@
phy-mode = "rgmii-txid";
};
+&mmc1 {
+ status = "okay";
+ vmmc-supply = <&vmmc_reg>;
+ bus-width = <4>;
+};
+
+&sham {
+ status = "okay";
+};
+
+&aes {
+ status = "okay";
+};
+
+&gpio0 {
+ ti,no-reset-on-init;
+};
+
+&mcasp1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcasp1_pins>;
+
+ status = "okay";
+
+ op-mode = <0>; /* MCASP_IIS_MODE */
+ tdm-slots = <2>;
+ /* 4 serializers */
+ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
+ 0 0 1 2
+ >;
+ tx-num-evt = <1>;
+ rx-num-evt = <1>;
+};
++
+ &tscadc {
+ status = "okay";
+ tsc {
+ ti,wires = <4>;
+ ti,x-plate-resistance = <200>;
+ ti,coordinate-readouts = <5>;
+ ti,wire-config = <0x00 0x11 0x22 0x33>;
+ };
+ };
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-11-12 1:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-12 1:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-01-09 23:53 linux-next: manual merge of the input tree with Linus' tree Stephen Rothwell
2021-11-03 23:21 Stephen Rothwell
2020-07-22 4:49 Stephen Rothwell
2012-03-27 1:16 Stephen Rothwell
2012-03-27 7:33 ` Dmitry Torokhov
2010-12-14 2:26 Stephen Rothwell
2010-12-14 18:40 ` Dmitry Torokhov
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=20131112125842.0f7b06add01d795cbcdce5bf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=dmitry.torokhov@gmail.com \
--cc=joelf@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mporter@ti.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).