• Olof Johansson's avatar
    Merge tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers · 1247034e
    Olof Johansson authored
    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: default avatarOlof Johansson <olof@lixom.net>
    
    Conflicts:
    	arch/arm/boot/dts/at91sam9260.dtsi
    	arch/arm/boot/dts/sama5d3.dtsi
    1247034e
atmel_usba_udc.c 50.7 KB