All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Santosh Shilimkar <santosh.shilimkar@ti.com>,
	arnd@arndb.de, rob.herring@linaro.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 keystone tree with the arm-soc tree
Date: Mon, 30 Oct 2017 12:05:30 +0000	[thread overview]
Message-ID: <20171030120530.rmyan374grqenqyj@sirena.co.uk> (raw)

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

Hi Santosh,

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

  arch/arm/boot/dts/keystone-k2g.dtsi

between commit:

  8dccafaa281aa1d24 ("arm: dts: fix unit-address leading 0s")

from the arm-soc tree and various commits from the keystone 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.

diff --cc arch/arm/boot/dts/keystone-k2g.dtsi
index a1ae69d712f7,6f3521d18125..000000000000
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@@ -133,7 -136,40 +136,40 @@@
  			clocks = <&k2g_clks 0x0009 1>;
  		};
  
+ 		i2c0: i2c@2530000 {
+ 			compatible = "ti,keystone-i2c";
+ 			reg = <0x02530000 0x400>;
+ 			clocks = <&k2g_clks 0x003a 0>;
+ 			power-domains = <&k2g_pds 0x003a>;
+ 			interrupts = <GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "disabled";
+ 		};
+ 
+ 		i2c1: i2c@2530400 {
+ 			compatible = "ti,keystone-i2c";
+ 			reg = <0x02530400 0x400>;
+ 			clocks = <&k2g_clks 0x003b 0>;
+ 			power-domains = <&k2g_pds 0x003b>;
+ 			interrupts = <GIC_SPI 89 IRQ_TYPE_EDGE_RISING>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "disabled";
+ 		};
+ 
+ 		i2c2: i2c@2530800 {
+ 			compatible = "ti,keystone-i2c";
+ 			reg = <0x02530800 0x400>;
+ 			clocks = <&k2g_clks 0x003c 0>;
+ 			power-domains = <&k2g_pds 0x003c>;
+ 			interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "disabled";
+ 		};
+ 
 -		kirq0: keystone_irq@026202a0 {
 +		kirq0: keystone_irq@26202a0 {
  			compatible = "ti,keystone-irq";
  			interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;
  			interrupt-controller;

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

WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org>
To: Santosh Shilimkar <santosh.shilimkar@ti.com>,
	arnd@arndb.de, rob.herring@linaro.org
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the keystone tree with the arm-soc tree
Date: Mon, 30 Oct 2017 12:05:30 +0000	[thread overview]
Message-ID: <20171030120530.rmyan374grqenqyj@sirena.co.uk> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 2062 bytes --]

Hi Santosh,

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

  arch/arm/boot/dts/keystone-k2g.dtsi

between commit:

  8dccafaa281aa1d24 ("arm: dts: fix unit-address leading 0s")

from the arm-soc tree and various commits from the keystone 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.

diff --cc arch/arm/boot/dts/keystone-k2g.dtsi
index a1ae69d712f7,6f3521d18125..000000000000
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@@ -133,7 -136,40 +136,40 @@@
  			clocks = <&k2g_clks 0x0009 1>;
  		};
  
+ 		i2c0: i2c@2530000 {
+ 			compatible = "ti,keystone-i2c";
+ 			reg = <0x02530000 0x400>;
+ 			clocks = <&k2g_clks 0x003a 0>;
+ 			power-domains = <&k2g_pds 0x003a>;
+ 			interrupts = <GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "disabled";
+ 		};
+ 
+ 		i2c1: i2c@2530400 {
+ 			compatible = "ti,keystone-i2c";
+ 			reg = <0x02530400 0x400>;
+ 			clocks = <&k2g_clks 0x003b 0>;
+ 			power-domains = <&k2g_pds 0x003b>;
+ 			interrupts = <GIC_SPI 89 IRQ_TYPE_EDGE_RISING>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "disabled";
+ 		};
+ 
+ 		i2c2: i2c@2530800 {
+ 			compatible = "ti,keystone-i2c";
+ 			reg = <0x02530800 0x400>;
+ 			clocks = <&k2g_clks 0x003c 0>;
+ 			power-domains = <&k2g_pds 0x003c>;
+ 			interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "disabled";
+ 		};
+ 
 -		kirq0: keystone_irq@026202a0 {
 +		kirq0: keystone_irq@26202a0 {
  			compatible = "ti,keystone-irq";
  			interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;
  			interrupt-controller;

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

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: broonie@kernel.org (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the keystone tree with the arm-soc tree
Date: Mon, 30 Oct 2017 12:05:30 +0000	[thread overview]
Message-ID: <20171030120530.rmyan374grqenqyj@sirena.co.uk> (raw)

Hi Santosh,

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

  arch/arm/boot/dts/keystone-k2g.dtsi

between commit:

  8dccafaa281aa1d24 ("arm: dts: fix unit-address leading 0s")

from the arm-soc tree and various commits from the keystone 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.

diff --cc arch/arm/boot/dts/keystone-k2g.dtsi
index a1ae69d712f7,6f3521d18125..000000000000
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@@ -133,7 -136,40 +136,40 @@@
  			clocks = <&k2g_clks 0x0009 1>;
  		};
  
+ 		i2c0: i2c at 2530000 {
+ 			compatible = "ti,keystone-i2c";
+ 			reg = <0x02530000 0x400>;
+ 			clocks = <&k2g_clks 0x003a 0>;
+ 			power-domains = <&k2g_pds 0x003a>;
+ 			interrupts = <GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "disabled";
+ 		};
+ 
+ 		i2c1: i2c at 2530400 {
+ 			compatible = "ti,keystone-i2c";
+ 			reg = <0x02530400 0x400>;
+ 			clocks = <&k2g_clks 0x003b 0>;
+ 			power-domains = <&k2g_pds 0x003b>;
+ 			interrupts = <GIC_SPI 89 IRQ_TYPE_EDGE_RISING>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "disabled";
+ 		};
+ 
+ 		i2c2: i2c at 2530800 {
+ 			compatible = "ti,keystone-i2c";
+ 			reg = <0x02530800 0x400>;
+ 			clocks = <&k2g_clks 0x003c 0>;
+ 			power-domains = <&k2g_pds 0x003c>;
+ 			interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "disabled";
+ 		};
+ 
 -		kirq0: keystone_irq at 026202a0 {
 +		kirq0: keystone_irq at 26202a0 {
  			compatible = "ti,keystone-irq";
  			interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;
  			interrupt-controller;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171030/11bb44c0/attachment.sig>

             reply	other threads:[~2017-10-30 12:06 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-30 12:05 Mark Brown [this message]
2017-10-30 12:05 ` linux-next: manual merge of the keystone tree with the arm-soc tree Mark Brown
2017-10-30 12:05 ` Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2014-03-24 23:55 Stephen Rothwell
2014-03-24 23:55 ` Stephen Rothwell
2014-03-24 23:55 ` Stephen Rothwell
2014-03-25  0:00 ` Santosh Shilimkar
2014-03-25  0:00   ` Santosh Shilimkar
2014-03-25  0:00   ` Santosh Shilimkar
2014-03-25  1:23   ` Felipe Balbi
2014-03-25  1:23     ` Felipe Balbi
2014-03-25  1:23     ` Felipe Balbi
2014-03-25 13:17     ` Santosh Shilimkar
2014-03-25 13:17       ` Santosh Shilimkar
2014-03-25 13:17       ` Santosh Shilimkar

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=20171030120530.rmyan374grqenqyj@sirena.co.uk \
    --to=broonie@kernel.org \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rob.herring@linaro.org \
    --cc=santosh.shilimkar@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.