* [PATCH 0/2] ARM: dts: dra7x-evm: DCAN pinmux fixes
@ 2015-03-05 13:32 Roger Quadros
2015-03-05 13:32 ` [PATCH 1/2] ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl Roger Quadros
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Roger Quadros @ 2015-03-05 13:32 UTC (permalink / raw)
To: tony; +Cc: nm, nsekhar, lokeshvutla, linux-omap, Roger Quadros
Hi Tony,
These are some fixes to the DCAN pinmux.
cheers,
-roger
Roger Quadros (2):
ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl
ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN
lines
arch/arm/boot/dts/dra7-evm.dts | 10 ++++------
arch/arm/boot/dts/dra72-evm.dts | 10 ++++------
2 files changed, 8 insertions(+), 12 deletions(-)
--
2.1.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl
2015-03-05 13:32 [PATCH 0/2] ARM: dts: dra7x-evm: DCAN pinmux fixes Roger Quadros
@ 2015-03-05 13:32 ` Roger Quadros
2015-03-05 13:32 ` [PATCH 2/2] ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN lines Roger Quadros
2015-03-06 17:16 ` [PATCH 0/2] ARM: dts: dra7x-evm: DCAN pinmux fixes Tony Lindgren
2 siblings, 0 replies; 4+ messages in thread
From: Roger Quadros @ 2015-03-05 13:32 UTC (permalink / raw)
To: tony; +Cc: nm, nsekhar, lokeshvutla, linux-omap, Roger Quadros
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>
---
arch/arm/boot/dts/dra7-evm.dts | 2 --
arch/arm/boot/dts/dra72-evm.dts | 2 --
2 files changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 3290a96..ddef593 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -264,7 +264,6 @@
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 */
>;
};
@@ -272,7 +271,6 @@
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 */
>;
};
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index e0264d0..42ee09a 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -120,7 +120,6 @@
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 */
>;
};
@@ -128,7 +127,6 @@
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 */
>;
};
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN lines
2015-03-05 13:32 [PATCH 0/2] ARM: dts: dra7x-evm: DCAN pinmux fixes Roger Quadros
2015-03-05 13:32 ` [PATCH 1/2] ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl Roger Quadros
@ 2015-03-05 13:32 ` Roger Quadros
2015-03-06 17:16 ` [PATCH 0/2] ARM: dts: dra7x-evm: DCAN pinmux fixes Tony Lindgren
2 siblings, 0 replies; 4+ messages in thread
From: Roger Quadros @ 2015-03-05 13:32 UTC (permalink / raw)
To: tony; +Cc: nm, nsekhar, lokeshvutla, linux-omap, Roger Quadros
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>
---
arch/arm/boot/dts/dra7-evm.dts | 8 ++++----
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 ddef593..7563d7c 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -263,15 +263,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 */
>;
};
};
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index 42ee09a..40ed539 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 */
>;
};
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] ARM: dts: dra7x-evm: DCAN pinmux fixes
2015-03-05 13:32 [PATCH 0/2] ARM: dts: dra7x-evm: DCAN pinmux fixes Roger Quadros
2015-03-05 13:32 ` [PATCH 1/2] ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl Roger Quadros
2015-03-05 13:32 ` [PATCH 2/2] ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN lines Roger Quadros
@ 2015-03-06 17:16 ` Tony Lindgren
2 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2015-03-06 17:16 UTC (permalink / raw)
To: Roger Quadros; +Cc: nm, nsekhar, lokeshvutla, linux-omap
* Roger Quadros <rogerq@ti.com> [150305 05:34]:
> Hi Tony,
>
> These are some fixes to the DCAN pinmux.
>
> cheers,
> -roger
>
> Roger Quadros (2):
> ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl
> ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN
> lines
>
> arch/arm/boot/dts/dra7-evm.dts | 10 ++++------
> arch/arm/boot/dts/dra72-evm.dts | 10 ++++------
> 2 files changed, 8 insertions(+), 12 deletions(-)
Applying both into omap-for-v4.0/fixes thanks.
Tony
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-06 17:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-05 13:32 [PATCH 0/2] ARM: dts: dra7x-evm: DCAN pinmux fixes Roger Quadros
2015-03-05 13:32 ` [PATCH 1/2] ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl Roger Quadros
2015-03-05 13:32 ` [PATCH 2/2] ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN lines Roger Quadros
2015-03-06 17:16 ` [PATCH 0/2] ARM: dts: dra7x-evm: DCAN pinmux fixes Tony Lindgren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.