diff options
| author | Roger Quadros <rogerq@ti.com> | 2015-03-05 08:32:42 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-03-06 12:22:27 -0500 |
| commit | 9b5580854fd75614f817773e96977d07fee8fc4b (patch) | |
| tree | c49f8277e32f3b1ecfe4e605513f086ba7d678e2 | |
| parent | 10b218551444934b3ed864ec9eb81332d68d21ed (diff) | |
ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl
Rev.F onwards ball G19 (dcan1_rx) is used as a GPIO for some other
function so don't include it in DCAN pinctrl node.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/boot/dts/dra7-evm.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dra72-evm.dts | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts index 3290a96ba586..ddef593c380b 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts | |||
| @@ -264,7 +264,6 @@ | |||
| 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 | MUX_MODE0) /* dcan1_tx */ |
| 267 | 0x3d4 (MUX_MODE15) /* dcan1_rx.off */ | ||
| 268 | 0x418 (PULL_DIS | MUX_MODE1) /* wakeup0.dcan1_rx */ | 267 | 0x418 (PULL_DIS | MUX_MODE1) /* wakeup0.dcan1_rx */ |
| 269 | >; | 268 | >; |
| 270 | }; | 269 | }; |
| @@ -272,7 +271,6 @@ | |||
| 272 | dcan1_pins_sleep: dcan1_pins_sleep { | 271 | dcan1_pins_sleep: dcan1_pins_sleep { |
| 273 | pinctrl-single,pins = < | 272 | pinctrl-single,pins = < |
| 274 | 0x3d0 (MUX_MODE15) /* dcan1_tx.off */ | 273 | 0x3d0 (MUX_MODE15) /* dcan1_tx.off */ |
| 275 | 0x3d4 (MUX_MODE15) /* dcan1_rx.off */ | ||
| 276 | 0x418 (MUX_MODE15) /* wakeup0.off */ | 274 | 0x418 (MUX_MODE15) /* wakeup0.off */ |
| 277 | >; | 275 | >; |
| 278 | }; | 276 | }; |
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts index e0264d0bf7b9..42ee09ae4d79 100644 --- a/arch/arm/boot/dts/dra72-evm.dts +++ b/arch/arm/boot/dts/dra72-evm.dts | |||
| @@ -120,7 +120,6 @@ | |||
| 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 | MUX_MODE0) /* dcan1_tx */ |
| 123 | 0x3d4 (MUX_MODE15) /* dcan1_rx.off */ | ||
| 124 | 0x418 (PULL_DIS | MUX_MODE1) /* wakeup0.dcan1_rx */ | 123 | 0x418 (PULL_DIS | MUX_MODE1) /* wakeup0.dcan1_rx */ |
| 125 | >; | 124 | >; |
| 126 | }; | 125 | }; |
| @@ -128,7 +127,6 @@ | |||
| 128 | dcan1_pins_sleep: dcan1_pins_sleep { | 127 | dcan1_pins_sleep: dcan1_pins_sleep { |
| 129 | pinctrl-single,pins = < | 128 | pinctrl-single,pins = < |
| 130 | 0x3d0 (MUX_MODE15) /* dcan1_tx.off */ | 129 | 0x3d0 (MUX_MODE15) /* dcan1_tx.off */ |
| 131 | 0x3d4 (MUX_MODE15) /* dcan1_rx.off */ | ||
| 132 | 0x418 (MUX_MODE15) /* wakeup0.off */ | 130 | 0x418 (MUX_MODE15) /* wakeup0.off */ |
| 133 | >; | 131 | >; |
| 134 | }; | 132 | }; |