From 1c1bf62c5892b1db1da8d385018c712e3d845e03 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 13 Apr 2015 10:37:39 +0200 Subject: dts: update to v4.0-rc4 Signed-off-by: Sascha Hauer --- dts/src/arm/dra7-evm.dts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'dts/src/arm/dra7-evm.dts') diff --git a/dts/src/arm/dra7-evm.dts b/dts/src/arm/dra7-evm.dts index 3290a96ba5..7563d7ce01 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 */ >; }; }; -- cgit v1.2.3