From: Olof Johansson <olof@lixom.net>
Date: Sat, 1 Jun 2013 07:38:04 +0000 (-0700)
Subject: Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fc20c6ffdd9875c42c9ff0d4233ed8960165633b;p=deliverable%2Flinux.git

Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre:

Big DT-centric update for AT91:
- Calao boards update, removal of one board C file and
  associated defconfig, Kconfig Makefile lines
- several Acme boards updates
- addition of watchdog, uart and pinctrl descriptions for
  several products
- modification of RTC compatible string for 9x5 family

* tag 'at91-dt' of git://github.com/at91linux/linux-at91: (21 commits)
  ARM: at91/dt: add pinctrl definition for at91 tc blocks
  ARM: at91/dts: add the watchdog nodes for at91 boards
  ARM: at91/dtsi: add the watchdog nodes for at91 SoC
  ARM: at91: drop non DT: Calao USB-A96x
  ARM: at91: dt: add Calao USB-A9G20 low power version
  ARM: at91: dt: usb-a9263: add dataflash support
  ARM: at91: dt: usb-a9263: update shutdown controller
  ARM: at91: dt: usb-a9260: update shutdown controller
  ARM: at91: dt: sam9260: add i2c gpio pinctrl
  ARM: at91: switch Fox G20 board .dts to pre-processor defines
  ARM: at91: add Acme Systems Fox G20 board
  ARM: at91/at91-ariag25.dts: UART0/1 nodes are disabled
  ARM: at91/at91sam9x5.dtsi: add UART0/1 nodes
  ARM: at91/at91-ariag25.dts: add RTC node
  ARM: at91: at91sam9x5 RTC is not compatible with at91rm9200 one
  ARM: at91: udpate defconfigs
  ARM: at91: dt: switch to standard IRQ flag defines
  ARM: at91: dt: switch to pinctrl to pre-processor
  ARM: at91: dt: add pinctrl pre-processor define
  ARM: at91: dt: switch to standard GPIO flag defines.
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
---

fc20c6ffdd9875c42c9ff0d4233ed8960165633b
diff --cc arch/arm/boot/dts/at91sam9260.dtsi
index 84c4bef2d726,899a7cf4e5c4..cae3ba5d18c7
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@@ -262,14 -269,14 +269,14 @@@
  
  					pinctrl_macb_rmii_mii_alt: macb_rmii_mii-1 {
  						atmel,pins =
- 							<0 10 0x2 0x0	/* PA10 periph B */
- 							 0 11 0x2 0x0	/* PA11 periph B */
- 							 0 22 0x2 0x0	/* PA22 periph B */
- 							 0 25 0x2 0x0	/* PA25 periph B */
- 							 0 26 0x2 0x0	/* PA26 periph B */
- 							 0 27 0x2 0x0	/* PA27 periph B */
- 							 0 28 0x2 0x0	/* PA28 periph B */
- 							 0 29 0x2 0x0>;	/* PA29 periph B */
+ 							<AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PA10 periph B */
+ 							 AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PA11 periph B */
 -							 AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PA24 periph B */
++							 AT91_PIOA 22 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PA22 periph B */
+ 							 AT91_PIOA 25 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PA25 periph B */
+ 							 AT91_PIOA 26 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PA26 periph B */
+ 							 AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PA27 periph B */
+ 							 AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PA28 periph B */
+ 							 AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PA29 periph B */
  					};
  				};
  
diff --cc arch/arm/boot/dts/at91sam9x25ek.dts
index 315250b4995e,8ddbce0f49f6..494864836e83
--- a/arch/arm/boot/dts/at91sam9x25ek.dts
+++ b/arch/arm/boot/dts/at91sam9x25ek.dts
@@@ -7,11 -7,11 +7,11 @@@
   * Licensed under GPLv2 or later.
   */
  /dts-v1/;
- /include/ "at91sam9x25.dtsi"
- /include/ "at91sam9x5ek.dtsi"
+ #include "at91sam9x25.dtsi"
+ #include "at91sam9x5ek.dtsi"
  
  / {
 -	model = "Atmel AT91SAM9G25-EK";
 +	model = "Atmel AT91SAM9X25-EK";
  	compatible = "atmel,at91sam9x25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
  
  	ahb {
diff --cc arch/arm/boot/dts/sama5d3.dtsi
index 5000e0d42849,c00e15872594..d5922935523f
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@@ -74,7 -77,12 +77,7 @@@
  				#size-cells = <0>;
  				compatible = "atmel,at91sam9x5-spi";
  				reg = <0xf0004000 0x100>;
- 				interrupts = <24 4 3>;
+ 				interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
 -				cs-gpios = <&pioD 13 0
 -					    &pioD 14 0 /* conflicts with SCK0 and CANRX0 */
 -					    &pioD 15 0 /* conflicts with CTS0 and CANTX0 */
 -					    &pioD 16 0 /* conflicts with RTS0 and PWMFI3 */
 -					   >;
  				pinctrl-names = "default";
  				pinctrl-0 = <&pinctrl_spi0>;
  				status = "disabled";
@@@ -151,9 -159,9 +154,9 @@@
  			};
  
  			macb0: ethernet@f0028000 {
 -				compatible = "cnds,pc302-gem", "cdns,gem";
 +				compatible = "cdns,pc302-gem", "cdns,gem";
  				reg = <0xf0028000 0x100>;
- 				interrupts = <34 4 3>;
+ 				interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
  				pinctrl-names = "default";
  				pinctrl-0 = <&pinctrl_macb0_data_rgmii &pinctrl_macb0_signal_rgmii>;
  				status = "disabled";
@@@ -197,7 -205,12 +200,7 @@@
  				#size-cells = <0>;
  				compatible = "atmel,at91sam9x5-spi";
  				reg = <0xf8008000 0x100>;
- 				interrupts = <25 4 3>;
+ 				interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
 -				cs-gpios = <&pioC 25 0
 -					    &pioC 26 0 /* conflitcs with TWD1 and ISI_D11 */
 -					    &pioC 27 0 /* conflitcs with TWCK1 and ISI_D10 */
 -					    &pioC 28 0 /* conflitcs with PWMFI0 and ISI_D9 */
 -					   >;
  				pinctrl-names = "default";
  				pinctrl-0 = <&pinctrl_spi1>;
  				status = "disabled";