From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vinod.koul@intel.com>, Shawn Guo <shawn.guo@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicolin Chen <b42378@freescale.com>,
Lucas Stach <l.stach@pengutronix.de>
Subject: linux-next: manual merge of the slave-dma tree with the imx-mxs tree
Date: Fri, 29 Nov 2013 11:32:01 +1100 [thread overview]
Message-ID: <20131129113201.ed4d0e254c20bcaac82c822f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/boot/dts/imx53.dtsi between commit a0cd556100d0 ("ARM: imx53:
use clock defines in DTS files") from the imx-mxs tree and commit
786f0db6d439 ("ARM: dts: imx: use dual-fifo sdma script for ssi") from
the slave-dma 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/imx53.dtsi
index 4b2053b585d1,7208fde9bc16..000000000000
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@@ -173,9 -152,9 +173,9 @@@
compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
reg = <0x50014000 0x4000>;
interrupts = <30>;
- clocks = <&clks 49>;
+ clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
- dmas = <&sdma 24 1 0>,
- <&sdma 25 1 0>;
+ dmas = <&sdma 24 22 0>,
+ <&sdma 25 22 0>;
dma-names = "rx", "tx";
fsl,fifo-depth = <15>;
fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-11-29 0:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-29 0:32 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-11-29 0:30 linux-next: manual merge of the slave-dma tree with the imx-mxs tree Stephen Rothwell
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=20131129113201.ed4d0e254c20bcaac82c822f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=b42378@freescale.com \
--cc=l.stach@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shawn.guo@linaro.org \
--cc=vinod.koul@intel.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).