Skip to contentSkip to conversation

board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM

PATCH Superseded Faiz Abbas 3 participants 4 messages Dec 12, 2017 – Jan 19, 2018 Arm (32-bit)

lore
Share & tools
lore

Faiz Abbas

author
#0 lore raw

PATCH v2 1/1 board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM

From: Vignesh R <[email protected]>

MCAN can be accessed via DCAN1 or DCAN2. Determining which DCAN instance to use if any at all is done through CTRL_CORE_CONTROL_SPARE_RW.SEL_ALT_MCAN. Since general pinmuxing is handled in U-boot. Handle this additional pinmuxing requirement in U-boot to ensure that MCAN is used by default via the DCAN1 pins.

Signed-off-by Vignesh R <[email protected]>
[fcooper at ti.com: Update commit message and use DCAN1 not DCAN2 for MCAN]
Signed-off-by Franklin S Cooper Jr <[email protected]>
Signed-off-by Lokesh Vutla <[email protected]>
Signed-off-by Faiz Abbas <[email protected]>
---
 arch/arm/include/asm/arch-omap5/mux_dra7xx.h | 3 +++
 board/ti/dra7xx/evm.c                        | 5 +++++
 2 files changed, 8 insertions(+)
arch/arm/include/asm/arch-omap5/mux_dra7xx.h +3 -0
index 55f49c7..dc2eb60 100644
@@ -351,4 +351,7 @@
 #define NMIN_DSP	0x460
 #define RSTOUTN		0x464
 
+#define MCAN_SEL_ALT_MASK	0x6000
+#define MCAN_SEL		0x2000
+
 #endif /* _MUX_DRA7XX_H_ */
board/ti/dra7xx/evm.c +5 -0
index 6bcfa48..ddcbe31 100644
@@ -823,6 +823,11 @@ void recalibrate_iodelay(void)
 		do_set_mux32((*ctrl)->control_padconf_core_base,
 			     delta_pads, delta_npads);
 
+	if (is_dra76x())
+		/* Set mux for MCAN instead of DCAN1 */
+		clrsetbits_le32((*ctrl)->control_core_control_spare_rw,
+				MCAN_SEL_ALT_MASK, MCAN_SEL);
+
 	/* Setup IOdelay configuration */
 	ret = do_set_iodelay((*ctrl)->iodelay_config_base, iodelay, niodelays);
 err:
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v2 1/1 board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM

Hi,

Quoted 38 lines · Faiz Abbas

From: Vignesh R <[email protected]>

MCAN can be accessed via DCAN1 or DCAN2. Determining which DCAN instance to use if any at all is done through CTRL_CORE_CONTROL_SPARE_RW.SEL_ALT_MCAN. Since general pinmuxing is handled in U-boot. Handle this additional pinmuxing requirement in U-boot to ensure that MCAN is used by default via the DCAN1 pins.

Signed-off-by Vignesh R <[email protected]>
[fcooper at ti.com: Update commit message and use DCAN1 not DCAN2 for MCAN]
Signed-off-by Franklin S Cooper Jr <[email protected]>
Signed-off-by Lokesh Vutla <[email protected]>
Signed-off-by Faiz Abbas <[email protected]>
---
 arch/arm/include/asm/arch-omap5/mux_dra7xx.h | 3 +++
 board/ti/dra7xx/evm.c                        | 5 +++++
 2 files changed, 8 insertions(+)
arch/arm/include/asm/arch-omap5/mux_dra7xx.h +3 -0
index 55f49c7..dc2eb60 100644
@@ -351,4 +351,7 @@
 #define NMIN_DSP	0x460
 #define RSTOUTN		0x464
 
+#define MCAN_SEL_ALT_MASK	0x6000
+#define MCAN_SEL		0x2000
+
 #endif /* _MUX_DRA7XX_H_ */
board/ti/dra7xx/evm.c +0 -0
index 6bcfa48..ddcbe31 100644
@@ -823,6 +823,11 @@ void recalibrate_iodelay(void)
 		do_set_mux32((*ctrl)->control_padconf_core_base,

board/ti/dra7xx/evm.c void recalibrate_iodelay(void) · line 833

Quoted 10 lines
board/ti/dra7xx/evm.c +5 -0
 			     delta_pads, delta_npads);
 
+	if (is_dra76x())
+		/* Set mux for MCAN instead of DCAN1 */
+		clrsetbits_le32((*ctrl)->control_core_control_spare_rw,
+				MCAN_SEL_ALT_MASK, MCAN_SEL);
+
 	/* Setup IOdelay configuration */
 	ret = do_set_iodelay((*ctrl)->iodelay_config_base, iodelay, niodelays);
 err:

Gentle Ping

Thanks,
Faiz

#2 lore raw

PATCH v2 1/1 board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM

In reply to Faiz Abbas

+ Tom

Quoted 7 lines · Faiz Abbas

From: Vignesh R <[email protected]>

MCAN can be accessed via DCAN1 or DCAN2. Determining which DCAN instance to use if any at all is done through CTRL_CORE_CONTROL_SPARE_RW.SEL_ALT_MCAN. Since general pinmuxing is handled in U-boot. Handle this additional pinmuxing requirement in U-boot to ensure that MCAN is used by default via the DCAN1 pins.

Reviewed-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

#3 lore raw

PATCH v2 1/1 board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM

In reply to Faiz Abbas
Quoted 8 lines · Faiz Abbas

From: Vignesh R <[email protected]>

MCAN can be accessed via DCAN1 or DCAN2. Determining which DCAN instance to use if any at all is done through CTRL_CORE_CONTROL_SPARE_RW.SEL_ALT_MCAN. Since general pinmuxing is handled in U-boot. Handle this additional pinmuxing requirement in U-boot to ensure that MCAN is used by default via the DCAN1 pins.

Quoted 6 lines
Signed-off-by Vignesh R <[email protected]>
[fcooper at ti.com: Update commit message and use DCAN1 not DCAN2 for MCAN]
Signed-off-by Franklin S Cooper Jr <[email protected]>
Signed-off-by Lokesh Vutla <[email protected]>
Signed-off-by Faiz Abbas <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180119/b012da2f/attachment.sig>