linux-next: manual merge of the keystone tree with the arm-soc tree

[Mark Brown]

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: signature.asc
Description: PGP signature