linux-next: manual merge of the at91 tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/arm/boot/dts/sama7g5.dtsi

between commit:

  6f3466228451 ("ARM: dts: at91: sama7g5: add chipid")

from Linus' tree and commit:

  9430ff34385e ("ARM: dts: at91: sama7g5: add tcb nodes")

from the at91 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/boot/dts/sama7g5.dtsi
index f98977f3980d,c75c7d7c2842..000000000000
--- a/arch/arm/boot/dts/sama7g5.dtsi
+++ b/arch/arm/boot/dts/sama7g5.dtsi
@@@ -159,11 -144,16 +166,21 @@@
  			clocks = <&clk32k 0>;
  		};
  
 +		chipid@e0020000 {
 +			compatible = "microchip,sama7g5-chipid";
 +			reg = <0xe0020000 0x8>;
 +		};
 +
+ 		tcb1: timer@e0800000 {
+ 			compatible = "atmel,sama5d2-tcb", "simple-mfd", "syscon";
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			reg = <0xe0800000 0x100>;
+ 			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&pmc PMC_TYPE_PERIPHERAL 91>, <&pmc PMC_TYPE_PERIPHERAL 92>, <&pmc PMC_TYPE_PERIPHERAL 93>, <&clk32k 1>;
+ 			clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";
+ 		};
+ 
  		adc: adc@e1000000 {
  			compatible = "microchip,sama7g5-adc";
  			reg = <0xe1000000 0x200>;

Attachment: pgpq_zqDQe8wL.pgp
Description: OpenPGP digital signature