diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-27 22:36:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-27 22:43:36 -0700 |
| commit | b891e30e55c4d47d6b3c4de1b4f89e7683104c93 (patch) | |
| tree | ff32f9e6f7e5b687706d6c7906fd8649994c2727 /arch/arm/boot/dts/sama5d3xcm.dtsi | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
| parent | b3f442b0eedbc20b5ce3f4a96530588d14901199 (diff) | |
| download | blackbird-op-linux-b891e30e55c4d47d6b3c4de1b4f89e7683104c93.tar.gz blackbird-op-linux-b891e30e55c4d47d6b3c4de1b4f89e7683104c93.zip | |
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
From Nicolas Ferre:
Big update converting pinctrl to use macros and header files. Increases
readability and avoids typos.
Update of AT91 defconfigs and merge of defconfigs for the similar SoCs
sam9260/9g20 and sam9261/9g10.
* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
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>
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 b336e7787cb3..1f8050813a54 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 */ }; }; }; |
