diff options
| author | Roger Quadros <rogerq@ti.com> | 2015-03-05 08:32:43 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-03-06 12:22:27 -0500 |
| commit | d80d581bf307397dfa11454c1e26d5798f9edd0c (patch) | |
| tree | 22bf43d5d0adfb098b95f5928ea6f4de320675e3 /arch | |
| parent | 9b5580854fd75614f817773e96977d07fee8fc4b (diff) | |
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')
| -rw-r--r-- | arch/arm/boot/dts/dra7-evm.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dra72-evm.dts | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts index ddef593c380b..7563d7ce01bb 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts | |||
| @@ -263,15 +263,15 @@ | |||
| 263 | 263 | ||
| 264 | dcan1_pins_default: dcan1_pins_default { | 264 | dcan1_pins_default: dcan1_pins_default { |
| 265 | pinctrl-single,pins = < | 265 | pinctrl-single,pins = < |
| 266 | 0x3d0 (PIN_OUTPUT | MUX_MODE0) /* dcan1_tx */ | 266 | 0x3d0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */ |
| 267 | 0x418 (PULL_DIS | MUX_MODE1) /* wakeup0.dcan1_rx */ | 267 | 0x418 (PULL_UP | MUX_MODE1) /* wakeup0.dcan1_rx */ |
| 268 | >; | 268 | >; |
| 269 | }; | 269 | }; |
| 270 | 270 | ||
| 271 | dcan1_pins_sleep: dcan1_pins_sleep { | 271 | dcan1_pins_sleep: dcan1_pins_sleep { |
| 272 | pinctrl-single,pins = < | 272 | pinctrl-single,pins = < |
| 273 | 0x3d0 (MUX_MODE15) /* dcan1_tx.off */ | 273 | 0x3d0 (MUX_MODE15 | PULL_UP) /* dcan1_tx.off */ |
| 274 | 0x418 (MUX_MODE15) /* wakeup0.off */ | 274 | 0x418 (MUX_MODE15 | PULL_UP) /* wakeup0.off */ |
| 275 | >; | 275 | >; |
| 276 | }; | 276 | }; |
| 277 | }; | 277 | }; |
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 @@ | |||
| 119 | 119 | ||
| 120 | dcan1_pins_default: dcan1_pins_default { | 120 | dcan1_pins_default: dcan1_pins_default { |
| 121 | pinctrl-single,pins = < | 121 | pinctrl-single,pins = < |
| 122 | 0x3d0 (PIN_OUTPUT | MUX_MODE0) /* dcan1_tx */ | 122 | 0x3d0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */ |
| 123 | 0x418 (PULL_DIS | MUX_MODE1) /* wakeup0.dcan1_rx */ | 123 | 0x418 (PULL_UP | MUX_MODE1) /* wakeup0.dcan1_rx */ |
| 124 | >; | 124 | >; |
| 125 | }; | 125 | }; |
| 126 | 126 | ||
| 127 | dcan1_pins_sleep: dcan1_pins_sleep { | 127 | dcan1_pins_sleep: dcan1_pins_sleep { |
| 128 | pinctrl-single,pins = < | 128 | pinctrl-single,pins = < |
| 129 | 0x3d0 (MUX_MODE15) /* dcan1_tx.off */ | 129 | 0x3d0 (MUX_MODE15 | PULL_UP) /* dcan1_tx.off */ |
| 130 | 0x418 (MUX_MODE15) /* wakeup0.off */ | 130 | 0x418 (MUX_MODE15 | PULL_UP) /* wakeup0.off */ |
| 131 | >; | 131 | >; |
| 132 | }; | 132 | }; |
| 133 | 133 | ||