michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: remove spi pinmux setting for kinetis boards

Browse source 
Remove spi pinmux setting for kinetis boards with dspi, as dspi driver
supports pinctrl

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2022-03-07 11:34:51 -06:00 • committed by Carles Cufí
commit f400aa41cd
8 changed files with 2 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

8
boards/arm/frdm_k22f/pinmux.c
View file

@ -38,14 +38,6 @@ static int frdm_k22f_pinmux_init(const struct device *dev)
__ASSERT_NO_MSG(device_is_ready(porte));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi0), okay) && CONFIG_SPI
/* SPI0 CS0, SCK, SOUT, SIN */
pinmux_pin_set(portc, 4, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 1, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 2, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 3, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
return 0;
}

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

@ -38,14 +38,6 @@ static int frdm_k64f_pinmux_init(const struct device *dev)
__ASSERT_NO_MSG(device_is_ready(porte));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi0), okay) && CONFIG_SPI
/* SPI0 CS0, SCK, SOUT, SIN */
pinmux_pin_set(portd, 0, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 1, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 2, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 3, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc1), okay) && CONFIG_ADC
/* ADC1_SE14 */
pinmux_pin_set(portb, 10, PORT_PCR_MUX(kPORT_PinDisabledOrAnalog));

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

@ -38,22 +38,6 @@ static int frdm_k82f_pinmux_init(const struct device *dev)
__ASSERT_NO_MSG(device_is_ready(porte));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay) && CONFIG_SPI
/* SPI1 SCK, SOUT, SIN, PCS0 */
pinmux_pin_set(porte, 1, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(porte, 2, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(porte, 4, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(porte, 5, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi0), okay) && CONFIG_SPI
/* SPI0 SCK, SOUT, SIN, PCS1 */
pinmux_pin_set(portd, 1, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 2, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 3, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portd, 4, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(adc0), okay) && CONFIG_ADC
/* ADC0_SE15 */
pinmux_pin_set(portc, 1, PORT_PCR_MUX(kPORT_PinDisabledOrAnalog));

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

@ -51,14 +51,6 @@ static int frdm_kw41z_pinmux_init(const struct device *dev)
pinmux_pin_set(portc, 7, PORT_PCR_MUX(kPORT_MuxAlt4));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi0), okay) && CONFIG_SPI
/* SPI0 CS0, SCK, SOUT, SIN */
pinmux_pin_set(portc, 16, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portc, 17, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portc, 18, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portc, 19, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
return 0;
}

8
boards/arm/ip_k66f/pinmux.c
View file

@ -51,14 +51,6 @@ static int ip_k66f_pinmux_init(const struct device *dev)
#endif
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay) && CONFIG_SPI
/* SPI1 CS0, SCK, SOUT, SIN - Control of KSZ8794 */
pinmux_pin_set(portb, 10, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 11, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 16, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 17, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
return 0;
}

25
boards/arm/rddrone_fmuk66/pinmux.c
View file

@ -58,31 +58,6 @@ static int rddrone_fmuk66_pinmux_init(const struct device *dev)
pinmux_pin_set(portc, 16, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi0), okay) && CONFIG_SPI
/* SPI0 CS2, SCK, SIN, SOUT */
pinmux_pin_set(portc, 2, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portc, 5, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portc, 6, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portc, 7, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay) && CONFIG_SPI
/* SPI1 CS0, CS1, SCK, SIN, SOUT */
pinmux_pin_set(portb, 10, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 9, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 11, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 16, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 17, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi2), okay) && CONFIG_SPI
/* SPI2 CS0, SCK, SIN, SOUT */
pinmux_pin_set(portb, 20, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 21, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 22, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 23, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
return 0;
}

8
boards/arm/usb_kw24d512/pinmux.c
View file

@ -44,14 +44,6 @@ static int usb_kw24d512_pinmux_init(const struct device *dev)
pinmux_pin_set(porta, 2, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay) && CONFIG_SPI
/* SPI1 CS0, SCK, SOUT, SIN */
pinmux_pin_set(portb, 10, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 11, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 16, PORT_PCR_MUX(kPORT_MuxAlt2));
pinmux_pin_set(portb, 17, PORT_PCR_MUX(kPORT_MuxAlt2));
#endif
return 0;
}

4
drivers/spi/spi_mcux_dspi.c
View file

@ -754,6 +754,8 @@ static int spi_mcux_init(const struct device *dev)
{
int err;
struct spi_mcux_data *data = dev->data;
const struct spi_mcux_config *config = dev->config;
#ifdef CONFIG_DSPI_MCUX_EDMA
enum dma_channel_filter spi_filter = DMA_CHANNEL_NORMAL;
const struct device *dma_dev;
@ -765,8 +767,6 @@ static int spi_mcux_init(const struct device *dev)
data->tx_dma_config.dma_channel =
dma_request_channel(dma_dev, (void *)&spi_filter);
#else
const struct spi_mcux_config *config = dev->config;
config->irq_config_func(dev);
#endif
err = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);