michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: arm: Conditionalize adc pinmuxes on nxp boards

Browse source 
Conditionalizes adc pinmuxes on CONFIG_ADC for all nxp boards (kinetis,
lpc, and imx families) to avoid possible conflicts between peripherals.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2020-05-21 09:02:02 -05:00 • committed by Carles Cufí
commit 54f606eec0
8 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,7 +117,7 @@ static int frdm_k64f_pinmux_init(struct device *dev)
| PORT_PCR_ODE_MASK);
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay) && CONFIG_ADC
/* ADC1_SE14 */
pinmux_pin_set(portb, 10, PORT_PCR_MUX(kPORT_PinDisabledOrAnalog));
#endif

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

@ -77,7 +77,7 @@ static int frdm_k82f_pinmux_init(struct device *dev)
pinmux_pin_set(portc, 15, PORT_PCR_MUX(kPORT_MuxAlt3));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay) && CONFIG_ADC
/* ADC0_SE15 */
pinmux_pin_set(portc, 1, PORT_PCR_MUX(kPORT_PinDisabledOrAnalog));
#endif

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

@ -60,7 +60,7 @@ static int frdm_kl25z_pinmux_init(struct device *dev)
| PORT_PCR_PS_MASK);
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay) && CONFIG_ADC
/* ADC0_SE12 */
pinmux_pin_set(portb, 2, PORT_PCR_MUX(kPORT_PinDisabledOrAnalog));
#endif

2
boards/arm/frdm_kw41z/Kconfig.defconfig
View file

@ -23,7 +23,7 @@ config PINMUX_MCUX_PORTA
default y
config PINMUX_MCUX_PORTB
default y if "$(dt_nodelabel_enabled,adc0)"
default y if "$(dt_nodelabel_enabled,adc0)" && ADC
default y if "$(dt_nodelabel_enabled,tpm1)"
config PINMUX_MCUX_PORTC

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

@ -46,7 +46,7 @@ static int frdm_kw41z_pinmux_init(struct device *dev)
| PORT_PCR_PS_MASK);
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay) && CONFIG_ADC
/* ADC0_SE3 */
pinmux_pin_set(portb, 2, PORT_PCR_MUX(kPORT_PinDisabledOrAnalog));
#endif

2
boards/arm/hexiwear_kw40z/Kconfig.defconfig
View file

@ -23,7 +23,7 @@ config PINMUX_MCUX_PORTA
default y
config PINMUX_MCUX_PORTB
default y if "$(dt_nodelabel_enabled,adc0)"
default y if "$(dt_nodelabel_enabled,adc0)" && ADC
config PINMUX_MCUX_PORTC
default y if "$(dt_nodelabel_enabled,lpuart0)" && SERIAL

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

@ -36,7 +36,7 @@ static int hexiwear_kw40z_pinmux_init(struct device *dev)
| PORT_PCR_PS_MASK);
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay) && CONFIG_ADC
/* ADC0_SE1 */
pinmux_pin_set(portb, 1, PORT_PCR_MUX(kPORT_PinDisabledOrAnalog));
#endif

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

@ -134,7 +134,7 @@ static int twr_ke18f_pinmux_init(struct device *dev)
#endif
pinmux_pin_set(portc, 15, PORT_PCR_MUX(kPORT_MuxAsGpio));
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay)
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay) && CONFIG_ADC
/* Thermistor A, B */
pinmux_pin_set(porta, 0, PORT_PCR_MUX(kPORT_PinDisabledOrAnalog));
pinmux_pin_set(porta, 1, PORT_PCR_MUX(kPORT_PinDisabledOrAnalog));