michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: lpcxpresso55s69: remove pinmux settings

Browse source 
All peripherals used by lpcxpresso55s69 support pinctrl driver, so
remove pinmux settings. Pinmux file is retained for board specific I2S
loopback configuration.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2022-03-24 16:51:31 -05:00 • committed by Marti Bolivar
commit 06a6c233bb
5 changed files with 11 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

6
boards/arm/lpcxpresso55s69/CMakeLists.txt
View file

@ -5,10 +5,8 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
if(CONFIG_PINMUX_MCUX_LPC) zephyr_library()
zephyr_library() zephyr_library_sources(pinmux.c)
zephyr_library_sources(pinmux.c)
endif()
if (CONFIG_SECOND_CORE_MCUX) if (CONFIG_SECOND_CORE_MCUX)

2
boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0_defconfig
View file

@ -13,10 +13,10 @@ CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_CORTEX_M_SYSTICK=y CONFIG_CORTEX_M_SYSTICK=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_PINMUX=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
CONFIG_ARM_MPU=y CONFIG_ARM_MPU=y
CONFIG_HW_STACK_PROTECTION=y CONFIG_HW_STACK_PROTECTION=y
CONFIG_PINCTRL=y
# Enable TrustZone-M # Enable TrustZone-M
CONFIG_TRUSTED_EXECUTION_SECURE=y CONFIG_TRUSTED_EXECUTION_SECURE=y

2
boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1_defconfig
View file

@ -10,7 +10,7 @@ CONFIG_BOARD_LPCXPRESSO55S69_CPU1=y
CONFIG_CORTEX_M_SYSTICK=y CONFIG_CORTEX_M_SYSTICK=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_GPIO_MCUX_LPC=y CONFIG_GPIO_MCUX_LPC=y
CONFIG_PINMUX=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
CONFIG_PINCTRL=y
CONFIG_RUNTIME_NMI=y CONFIG_RUNTIME_NMI=y

2
boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig
View file

@ -13,8 +13,8 @@ CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_CORTEX_M_SYSTICK=y CONFIG_CORTEX_M_SYSTICK=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_PINMUX=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
CONFIG_PINCTRL=y
# TFM sets up MPU_NS, can't correctly change this configuration yet # TFM sets up MPU_NS, can't correctly change this configuration yet
CONFIG_ARM_MPU=n CONFIG_ARM_MPU=n

232
boards/arm/lpcxpresso55s69/pinmux.c
View file

@ -13,179 +13,14 @@ static int lpcxpresso_55s69_pinmux_init(const struct device *dev)
{ {
ARG_UNUSED(dev); ARG_UNUSED(dev);
#ifdef CONFIG_BOARD_LPCXPRESSO55S69_CPU0
/* Only CPU0 configures GPIO port inputs. */
#if DT_NODE_HAS_STATUS(DT_NODELABEL(pio0), okay)
const struct device *port0 = DEVICE_DT_GET(DT_NODELABEL(pio0));
__ASSERT_NO_MSG(device_is_ready(port0));
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(pio1), okay)
const struct device *port1 = DEVICE_DT_GET(DT_NODELABEL(pio1));
__ASSERT_NO_MSG(device_is_ready(port1));
#endif
#endif
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm0), nxp_lpc_usart, okay) && CONFIG_SERIAL
/* USART0 RX, TX */
uint32_t port0_pin29_config = (
IOCON_PIO_FUNC1 |
IOCON_PIO_MODE_INACT |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);
uint32_t port0_pin30_config = (
IOCON_PIO_FUNC1 |
IOCON_PIO_MODE_INACT |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);
pinmux_pin_set(port0, 29, port0_pin29_config);
pinmux_pin_set(port0, 30, port0_pin30_config);
#endif
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm2), nxp_lpc_usart, okay) && CONFIG_SERIAL
/* USART2 RX, TX */
uint32_t port1_pin24_config = (
IOCON_PIO_FUNC1 |
IOCON_PIO_MODE_INACT |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);
uint32_t port0_pin27_config = (
IOCON_PIO_FUNC1 |
IOCON_PIO_MODE_INACT |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);
pinmux_pin_set(port1, 24, port1_pin24_config);
pinmux_pin_set(port0, 27, port0_pin27_config);
#endif
#if DT_PHA_HAS_CELL(DT_ALIAS(sw0), gpios, pin)
uint32_t sw0_config = (
IOCON_PIO_FUNC0 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_INPFILT_OFF |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);
pinmux_pin_set(port0, DT_GPIO_PIN(DT_ALIAS(sw0), gpios), sw0_config);
#endif
#if DT_PHA_HAS_CELL(DT_ALIAS(sw1), gpios, pin)
uint32_t sw1_config = (
IOCON_PIO_FUNC0 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_INPFILT_OFF |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);
pinmux_pin_set(port1, DT_GPIO_PIN(DT_ALIAS(sw1), gpios), sw1_config);
#endif
#if DT_PHA_HAS_CELL(DT_ALIAS(sw2), gpios, pin)
uint32_t sw2_config = (
IOCON_PIO_FUNC0 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_INPFILT_OFF |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);
pinmux_pin_set(port1, DT_GPIO_PIN(DT_ALIAS(sw2), gpios), sw2_config);
#endif
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm4), nxp_lpc_i2c, okay) && CONFIG_I2C
/* PORT1 PIN20 is configured as FC4_TXD_SCL_MISO_WS */
pinmux_pin_set(port1, 20, IOCON_PIO_FUNC5 |
IOCON_PIO_MODE_INACT |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_OPENDRAIN_DI);
/* PORT1 PIN21 is configured as FC4_RXD_SDA_MOSI_DATA */
pinmux_pin_set(port1, 21, IOCON_PIO_FUNC5 |
IOCON_PIO_MODE_INACT |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_OPENDRAIN_DI);
#endif
#ifdef CONFIG_FXOS8700_TRIGGER
pinmux_pin_set(port1, 19, IOCON_PIO_FUNC0 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_INPFILT_OFF |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI);
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(hs_lspi), okay) && CONFIG_SPI
/* PORT0 PIN26 is configured as HS_SPI_MOSI */
pinmux_pin_set(port0, 26, IOCON_PIO_FUNC9 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI);
uint32_t pio_func = IOCON_PIO_FUNC5; /* Flexcomm controlled CS*/
#if DT_NODE_HAS_PROP(DT_NODELABEL(hs_lspi), cs_gpios)
pio_func = IOCON_PIO_FUNC0; /* GPIO controlled CS*/
#endif
/* PORT1 PIN1 is configured as HS_SPI_SSEL1 */
pinmux_pin_set(port1, 1, pio_func |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI);
/* PORT1 PIN2 is configured as HS_SPI_SCK */
pinmux_pin_set(port1, 2, IOCON_PIO_FUNC6 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI);
/* PORT1 PIN3 is configured as HS_SPI_MISO */
pinmux_pin_set(port1, 3, IOCON_PIO_FUNC6 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI);
#endif
#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm6), nxp_lpc_i2s, okay)) && \ #if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm6), nxp_lpc_i2s, okay)) && \
(DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm7), nxp_lpc_i2s, okay)) && \ (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm7), nxp_lpc_i2s, okay)) && \
CONFIG_I2S CONFIG_I2S
/*
* Flexcomm 6 and 7 are connected to codec on board, and shared signal
* sets are used to enable one I2S device to handle RX and one to handle
* TX
*/
CLOCK_EnableClock(kCLOCK_Sysctl); CLOCK_EnableClock(kCLOCK_Sysctl);
/* Set shared signal set 0 SCK, WS from Transmit I2S - Flexcomm 7 */ /* Set shared signal set 0 SCK, WS from Transmit I2S - Flexcomm 7 */
SYSCTL->SHAREDCTRLSET[0] = SYSCTL_SHAREDCTRLSET_SHAREDSCKSEL(7) | SYSCTL->SHAREDCTRLSET[0] = SYSCTL_SHAREDCTRLSET_SHAREDSCKSEL(7) |
@ -213,64 +48,9 @@ static int lpcxpresso_55s69_pinmux_init(const struct device *dev)
SYSCTL->FCCTRLSEL[7] |= SYSCTL_FCCTRLSEL_DATAOUTSEL(1); SYSCTL->FCCTRLSEL[7] |= SYSCTL_FCCTRLSEL_DATAOUTSEL(1);
#endif #endif
/* Pin is configured as FC7_TXD_SCL_MISO_WS */
pinmux_pin_set(port0, 19, IOCON_PIO_FUNC7 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_SLEW_FAST |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_OPENDRAIN_DI);
/* Pin is configured as FC7_RXD_SDA_MOSI_DATA */
pinmux_pin_set(port0, 20, IOCON_PIO_FUNC7 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_SLEW_FAST |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_OPENDRAIN_DI);
/* Pin is configured as FC7_SCK */
pinmux_pin_set(port0, 21, IOCON_PIO_FUNC7 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_SLEW_FAST |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_OPENDRAIN_DI);
/* Pin is configured as FC6_RXD_SDA_MOSI_DATA */
pinmux_pin_set(port1, 13, IOCON_PIO_FUNC2 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_SLEW_FAST |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_OPENDRAIN_DI);
#endif
#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(sc_timer), nxp_sctimer_pwm, okay) && CONFIG_PWM
/* Pin is configured as SCT0_OUT2 */
pinmux_pin_set(port0, 15, IOCON_PIO_FUNC4 |
IOCON_PIO_MODE_INACT |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_OPENDRAIN_DI |
IOCON_PIO_ASW_EN);
#if DT_NODE_HAS_STATUS(DT_NODELABEL(red_pwm_led), okay)
/* Pin is configured as SCT0_OUT0 */
pinmux_pin_set(port1, 4, IOCON_PIO_FUNC4 |
IOCON_PIO_MODE_INACT |
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_INV_DI |
IOCON_PIO_DIGITAL_EN |
IOCON_PIO_OPENDRAIN_DI);
#endif
#endif #endif
return 0; return 0;
} }
SYS_INIT(lpcxpresso_55s69_pinmux_init, PRE_KERNEL_1, SYS_INIT(lpcxpresso_55s69_pinmux_init, PRE_KERNEL_1, 0);
CONFIG_PINMUX_INIT_PRIORITY);