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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
arch/arm/boot/dts/at91sam9g25ek.dts between commit fbc1871511ed ("ARM:
dts: add twi nodes for atmel boards") from Linus' tree and commit
77ccddbdc0c9 ("arm: at91: dt: at91sam9 add serial pinctrl support") from
the pinctrl tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/boot/dts/at91sam9g25ek.dts
index 877c08f,c5ab16f..0000000
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
@@@ -13,49 -13,4 +13,20 @@@
  / {
  	model = "Atmel AT91SAM9G25-EK";
  	compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
 +
- 	chosen {
- 		bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";
- 	};
- 
 +	ahb {
 +		apb {
- 			dbgu: serial@fffff200 {
- 				status = "okay";
- 			};
- 
- 			usart0: serial@f801c000 {
- 				status = "okay";
- 			};
- 
- 			macb0: ethernet@f802c000 {
- 				phy-mode = "rmii";
- 				status = "okay";
- 			};
- 
 +			i2c0: i2c@f8010000 {
 +				status = "okay";
 +			};
 +
 +			i2c1: i2c@f8014000 {
 +				status = "okay";
 +			};
 +
 +			i2c2: i2c@f8018000 {
 +				status = "okay";
 +			};
 +		};
- 
- 		usb0: ohci@00600000 {
- 			status = "okay";
- 			num-ports = <2>;
- 			atmel,vbus-gpio = <&pioD 19 1
- 					   &pioD 20 1
- 					  >;
- 		};
- 
- 		usb1: ehci@00700000 {
- 			status = "okay";
- 		};
 +	};
  };

Attachment: pgpuCR64iiZDo.pgp
Description: PGP signature