From: Olof Johansson <olof@lixom.net>
Date: Sat, 15 Jun 2013 01:58:28 +0000 (-0700)
Subject: Merge tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1247034ea6515d25a80220915820aa61891a78a1;p=linux-beck.git

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

From Nicolas Ferre:
Adding the DT support to USB gadget High-Speed aka usba.

* tag 'at91-drivers' of git://github.com/at91linux/linux-at91:
  USB: gadget: atmel_usba: add DT support
  USB: gadget: atmel_usba: allow multi instance
  USB: gadget: atmel_usba: move global struct usba_ep usba_ep to struct usba_udc
  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.
  ARM: at91: dt: use #include for all device trees

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

Conflicts:
	arch/arm/boot/dts/at91sam9260.dtsi
	arch/arm/boot/dts/sama5d3.dtsi
---

1247034ea6515d25a80220915820aa61891a78a1
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";