diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-15 01:58:28 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-15 01:58:28 (GMT) |
| commit | 1247034ea6515d25a80220915820aa61891a78a1 (patch) | |
| tree | 4cb5a05462bc5ef4c36ca8ef154673e3a7d22198 /arch/arm/boot/dts/sama5d3xcm.dtsi | |
| parent | 38d77ff90a47d198d2fd3ebd766ee84eaa71a0d2 (diff) | |
| parent | 4a3ae9324ebeb9715369d2bca799bfd7dcff6dd7 (diff) | |
| download | linux-fsl-qoriq-1247034ea6515d25a80220915820aa61891a78a1.tar.xz | |
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
Diffstat (limited to 'arch/arm/boot/dts/sama5d3xcm.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sama5d3xcm.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi index b336e77..1f80508 100644 --- a/arch/arm/boot/dts/sama5d3xcm.dtsi +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi @@ -6,7 +6,7 @@ * * Licensed under GPLv2 or later. */ -/include/ "sama5d3.dtsi" +#include "sama5d3.dtsi" / { compatible = "atmel,samad3xcm", "atmel,sama5d3", "atmel,sama5"; @@ -89,7 +89,7 @@ d2 { label = "d2"; - gpios = <&pioE 25 1>; /* PE25, conflicts with A25, RXD2 */ + gpios = <&pioE 25 GPIO_ACTIVE_LOW>; /* PE25, conflicts with A25, RXD2 */ }; }; }; |