diff options
| author | Roger Quadros <rogerq@ti.com> | 2015-03-05 14:32:43 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-03-06 18:22:27 +0100 |
| commit | d80d581bf307397dfa11454c1e26d5798f9edd0c (patch) | |
| tree | 22bf43d5d0adfb098b95f5928ea6f4de320675e3 /arch/arm/boot/dts/dra72-evm.dts | |
| parent | ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl (diff) | |
| download | linux-d80d581bf307397dfa11454c1e26d5798f9edd0c.tar.xz linux-d80d581bf307397dfa11454c1e26d5798f9edd0c.zip | |
ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN lines
DCAN1 RX and TX lines are internally pulled high according to [1].
While muxing between DCAN mode and SAFE mode we make sure
that the same pull direction is set to minimize opposite
pull contention during the switching window.
[1] in DRA7 data manual, Ball characteristics table 4-2, DSIS colum shows
the state driven to the peripheral input while in the deselcted mode.
DSIS - De-Selected Input State.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/boot/dts/dra72-evm.dts')
| -rw-r--r-- | arch/arm/boot/dts/dra72-evm.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts index 42ee09ae4d79..40ed539ce474 100644 --- a/arch/arm/boot/dts/dra72-evm.dts +++ b/arch/arm/boot/dts/dra72-evm.dts @@ -119,15 +119,15 @@ dcan1_pins_default: dcan1_pins_default { pinctrl-single,pins = < - 0x3d0 (PIN_OUTPUT | MUX_MODE0) /* dcan1_tx */ - 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 */ - 0x418 (MUX_MODE15) /* wakeup0.off */ + 0x3d0 (MUX_MODE15 | PULL_UP) /* dcan1_tx.off */ + 0x418 (MUX_MODE15 | PULL_UP) /* wakeup0.off */ >; }; |