summaryrefslogtreecommitdiffstats
path: root/dts/src/arm/dra7-evm.dts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-04-13 10:37:39 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-04-13 10:37:39 +0200
commit1c1bf62c5892b1db1da8d385018c712e3d845e03 (patch)
treed839ef4277ef9a9811d69b80fdaebf21520b42e2 /dts/src/arm/dra7-evm.dts
parent38504401dae231611f489b10734d9e9ab34082d5 (diff)
downloadbarebox-1c1bf62c5892b1db1da8d385018c712e3d845e03.tar.gz
dts: update to v4.0-rc4
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm/dra7-evm.dts')
-rw-r--r--dts/src/arm/dra7-evm.dts10
1 files changed, 4 insertions, 6 deletions
diff --git a/dts/src/arm/dra7-evm.dts b/dts/src/arm/dra7-evm.dts
index 3290a96..7563d7c 100644
--- a/dts/src/arm/dra7-evm.dts
+++ b/dts/src/arm/dra7-evm.dts
@@ -263,17 +263,15 @@
dcan1_pins_default: dcan1_pins_default {
pinctrl-single,pins = <
- 0x3d0 (PIN_OUTPUT | MUX_MODE0) /* dcan1_tx */
- 0x3d4 (MUX_MODE15) /* dcan1_rx.off */
- 0x418 (PULL_DIS | MUX_MODE1) /* wakeup0.dcan1_rx */
+ 0x3d0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */
+ 0x418 (PULL_UP | MUX_MODE1) /* wakeup0.dcan1_rx */
>;
};
dcan1_pins_sleep: dcan1_pins_sleep {
pinctrl-single,pins = <
- 0x3d0 (MUX_MODE15) /* dcan1_tx.off */
- 0x3d4 (MUX_MODE15) /* dcan1_rx.off */
- 0x418 (MUX_MODE15) /* wakeup0.off */
+ 0x3d0 (MUX_MODE15 | PULL_UP) /* dcan1_tx.off */
+ 0x418 (MUX_MODE15 | PULL_UP) /* wakeup0.off */
>;
};
};