summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/at91sam9x5cm.dtsi
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-04-24 02:34:25 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-05-17 12:11:39 +0200
commitc9d0f317c6dc45f84888bc11947bc10e6c547dc3 (patch)
treeef4d865a48a66b378917b101c85eb011f5ca624b /arch/arm/boot/dts/at91sam9x5cm.dtsi
parentARM: at91: dt: add pinctrl pre-processor define (diff)
downloadlinux-c9d0f317c6dc45f84888bc11947bc10e6c547dc3.tar.xz
linux-c9d0f317c6dc45f84888bc11947bc10e6c547dc3.zip
ARM: at91: dt: switch to pinctrl to pre-processor
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x5cm.dtsi')
-rw-r--r--arch/arm/boot/dts/at91sam9x5cm.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi b/arch/arm/boot/dts/at91sam9x5cm.dtsi
index 94723c30e99b..4a5ee5cc115a 100644
--- a/arch/arm/boot/dts/at91sam9x5cm.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi
@@ -28,7 +28,7 @@
pinctrl@fffff400 {
1wire_cm {
pinctrl_1wire_cm: 1wire_cm-0 {
- atmel,pins = <1 18 0x0 0x2>; /* PB18 multidrive, conflicts with led */
+ atmel,pins = <AT91_PIOB 18 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PB18 multidrive, conflicts with led */
};
};
};