linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: "Guido Günther" <agx@sigxcpu.org>,
	"Angus Ainslie" <angus@akkea.ca>,
	"Shawn Guo" <shawnguo@kernel.org>, "Li Yang" <leoyang.li@nxp.com>,
	"Horia Geantă" <horia.geanta@nxp.com>,
	"Andrey Smirnov" <andrew.smirnov@gmail.com>,
	arm@kernel.org, soc@kernel.org,
	"Herbert Xu" <herbert@gondor.apana.org.au>,
	"Linux Crypto List" <linux-crypto@vger.kernel.org>
Cc: "linux-arm-kernel@lists.infradead.org Linux Next Mailing List" 
	<linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the crypto tree with the arm-soc tree
Date: Sun, 15 Sep 2019 21:55:02 +0100	[thread overview]
Message-ID: <20190915205502.GF4352@sirena.co.uk> (raw)

[-- Attachment #1: Type: text/plain, Size: 2478 bytes --]

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  arch/arm64/boot/dts/freescale/imx8mq.dtsi

between commit:

  a99b26b14bea506 ("arm64: dts: imx8mq: Add MIPI D-PHY")

from the arm-soc tree and commit:

  007b3cf0af8cb7d ("arm64: dts: imx8mq: Add CAAM node")

from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts (generally DTS updates go through arm-soc).

diff --cc arch/arm64/boot/dts/freescale/imx8mq.dtsi
index 046a0c8c8dd56,752d5a61878cb..0000000000000
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@@ -743,19 -728,36 +743,49 @@@
  				status = "disabled";
  			};
  
 +			dphy: dphy@30a00300 {
 +				compatible = "fsl,imx8mq-mipi-dphy";
 +				reg = <0x30a00300 0x100>;
 +				clocks = <&clk IMX8MQ_CLK_DSI_PHY_REF>;
 +				clock-names = "phy_ref";
 +				assigned-clocks = <&clk IMX8MQ_CLK_DSI_PHY_REF>;
 +				assigned-clock-parents = <&clk IMX8MQ_VIDEO_PLL1_OUT>;
 +				assigned-clock-rates = <24000000>;
 +				#phy-cells = <0>;
 +				power-domains = <&pgc_mipi>;
 +				status = "disabled";
 +			};
 +
+ 			crypto: crypto@30900000 {
+ 				compatible = "fsl,sec-v4.0";
+ 				#address-cells = <1>;
+ 				#size-cells = <1>;
+ 				reg = <0x30900000 0x40000>;
+ 				ranges = <0 0x30900000 0x40000>;
+ 				interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+ 				clocks = <&clk IMX8MQ_CLK_AHB>,
+ 					 <&clk IMX8MQ_CLK_IPG_ROOT>;
+ 				clock-names = "aclk", "ipg";
+ 
+ 				sec_jr0: jr@1000 {
+ 					compatible = "fsl,sec-v4.0-job-ring";
+ 					reg = <0x1000 0x1000>;
+ 					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+ 				};
+ 
+ 				sec_jr1: jr@2000 {
+ 					compatible = "fsl,sec-v4.0-job-ring";
+ 					reg = <0x2000 0x1000>;
+ 					interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+ 				};
+ 
+ 				sec_jr2: jr@3000 {
+ 					compatible = "fsl,sec-v4.0-job-ring";
+ 					reg = <0x3000 0x1000>;
+ 					interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+ 				};
+ 			};
+ 
  			i2c1: i2c@30a20000 {
  				compatible = "fsl,imx8mq-i2c", "fsl,imx21-i2c";
  				reg = <0x30a20000 0x10000>;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2019-09-15 20:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-15 20:55 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-04-20  1:23 Stephen Rothwell
2014-02-26  4:01 Stephen Rothwell
2014-02-26 19:15 ` Kumar Gala
2014-02-26 21:58   ` Herbert Xu

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=20190915205502.GF4352@sirena.co.uk \
    --to=broonie@kernel.org \
    --cc=agx@sigxcpu.org \
    --cc=andrew.smirnov@gmail.com \
    --cc=angus@akkea.ca \
    --cc=arm@kernel.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=horia.geanta@nxp.com \
    --cc=leoyang.li@nxp.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=shawnguo@kernel.org \
    --cc=soc@kernel.org \
    --subject='Re: linux-next: manual merge of the crypto tree with the arm-soc tree' \
    /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

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).