michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: frdm_k64f: Solve conflict between UART3 and enet

Browse source 
Arduino compatible boards should have a working UART on pin 0 & 1.
On frdm_k64f this is handled by uart3

Unfortunately pinmuxing of uart3 was destroyed when enabling NETWORKING,
because the uart3 RX/TX pins was reconfigured for 1588 timers.

1588 timers are enabled by the enet child node, ptp which by some reason
is enabled by default.
1588 timers aren't needed in most cases when ethernet is being used,
so this fix ensures ptp is by default disabled. Likewise pinmuxing of
the 1588 timer functionality is now dependant of ptp being active

Signed-off-by: Kim Bøndergaard <kim.boendergaard@escoglobal.com>
This commit is contained in:
Kim Bøndergaard 2021-10-26 08:54:51 +02:00 • committed by David Leach
commit ee6c552805
4 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
boards/arm/frdm_k64f/frdm_k64f.dts
View file

@ -241,7 +241,8 @@ zephyr_udc0: &usbotg {
&RMII0_MDC_PTB1>;
pinctrl-names = "default";
ptp {
status = "okay";
/* Be aware that PTC16 and PTC17 are also used for uart3 */
status = "disabled";
pinctrl-0 = <&ENET0_1588_TMR0_PTC16 &ENET0_1588_TMR1_PTC17
&ENET0_1588_TMR2_PTC18>;
pinctrl-names = "default";

2
boards/arm/frdm_k64f/pinmux.c
View file

@ -104,10 +104,12 @@ static int frdm_k64f_pinmux_init(const struct device *dev)
pinmux_pin_set(portb, 1, PORT_PCR_MUX(kPORT_MuxAlt4));
#if DT_NODE_HAS_STATUS(DT_CHILD(DT_NODELABEL(enet), ptp), okay)
pinmux_pin_set(portc, 16, PORT_PCR_MUX(kPORT_MuxAlt4));
pinmux_pin_set(portc, 17, PORT_PCR_MUX(kPORT_MuxAlt4));
pinmux_pin_set(portc, 18, PORT_PCR_MUX(kPORT_MuxAlt4));
#endif
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan0), okay) && CONFIG_CAN
/* FlexCAN0 RX, TX */

12
samples/net/gptp/boards/frdm_k64f.overlay Normal file
View file

@ -0,0 +1,12 @@
/*
* Copyright (c) 2021 Esco Medical Aps
*
* SPDX-License-Identifier: Apache-2.0
*/
&enet {
ptp {
status = "ok";
};
};

12
tests/net/ptp/clock/boards/frdm_k64f.overlay Normal file
View file

@ -0,0 +1,12 @@
/*
* Copyright (c) 2021 Esco Medical Aps
*
* SPDX-License-Identifier: Apache-2.0
*/
&enet {
ptp {
status = "ok";
};
};