diff --git a/boards/arm/rddrone_fmuk66/pinmux.c b/boards/arm/rddrone_fmuk66/pinmux.c index 45e13b6ac09..755c93c8ed0 100644 --- a/boards/arm/rddrone_fmuk66/pinmux.c +++ b/boards/arm/rddrone_fmuk66/pinmux.c @@ -46,32 +46,6 @@ static int rddrone_fmuk66_pinmux_init(const struct device *dev) pinmux_pin_set(portd, 9, PORT_PCR_MUX(kPORT_MuxAlt5)); #endif -#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay) && CONFIG_SERIAL - /* UART0 RX, TX */ - pinmux_pin_set(porta, 1, PORT_PCR_MUX(kPORT_MuxAlt2)); - pinmux_pin_set(porta, 2, PORT_PCR_MUX(kPORT_MuxAlt2)); -#endif - -#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart1), okay) && CONFIG_SERIAL - /* UART1 RX, TX */ - pinmux_pin_set(portc, 3, PORT_PCR_MUX(kPORT_MuxAlt3)); - pinmux_pin_set(portc, 4, PORT_PCR_MUX(kPORT_MuxAlt3)); -#endif - -#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart2), okay) && CONFIG_SERIAL - /* UART1 RX, TX */ - pinmux_pin_set(portd, 2, PORT_PCR_MUX(kPORT_MuxAlt3)); - pinmux_pin_set(portd, 3, PORT_PCR_MUX(kPORT_MuxAlt3)); -#endif - -#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart4), okay) && CONFIG_SERIAL - /* UART1 RTS, CTS, RX, TX */ - pinmux_pin_set(porte, 27, PORT_PCR_MUX(kPORT_MuxAlt3)); - pinmux_pin_set(portc, 13, PORT_PCR_MUX(kPORT_MuxAlt3)); - pinmux_pin_set(portc, 14, PORT_PCR_MUX(kPORT_MuxAlt3)); - pinmux_pin_set(portc, 15, PORT_PCR_MUX(kPORT_MuxAlt3)); -#endif - #if DT_NODE_HAS_STATUS(DT_NODELABEL(flexcan0), okay) && CONFIG_CAN /* CAN0 TX, RX */ pinmux_pin_set(portb, 18, PORT_PCR_MUX(kPORT_MuxAlt2)); diff --git a/boards/arm/rddrone_fmuk66/rddrone_fmuk66-pinctrl.dtsi b/boards/arm/rddrone_fmuk66/rddrone_fmuk66-pinctrl.dtsi new file mode 100644 index 00000000000..49383e232bb --- /dev/null +++ b/boards/arm/rddrone_fmuk66/rddrone_fmuk66-pinctrl.dtsi @@ -0,0 +1,191 @@ +/* + * NOTE: Autogenerated file by kinetis_signal2dts.py + * for MK66FN2M0VMD18/signal_configuration.xml + * + * Copyright (c) 2022, NXP + * SPDX-License-Identifier: Apache-2.0 + */ + + +#include + +&pinctrl { + enet_default: enet_default { + group0 { + pinmux = ; + drive-strength = "low"; + drive-open-drain; + bias-pull-up; + slew-rate = "fast"; + }; + group1 { + pinmux = , + , + , + , + , + , + , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + flexcan0_default: flexcan0_default { + group0 { + pinmux = ; + drive-strength = "low"; + bias-pull-up; + slew-rate = "fast"; + }; + group1 { + pinmux = ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + flexcan1_default: flexcan1_default { + group0 { + pinmux = ; + drive-strength = "low"; + bias-pull-up; + slew-rate = "fast"; + }; + group1 { + pinmux = ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + ftm0_default: ftm0_default { + group0 { + pinmux = ; + drive-strength = "low"; + bias-pull-up; + slew-rate = "fast"; + }; + group1 { + pinmux = , + , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + ftm3_default: ftm3_default { + group0 { + pinmux = , + , + , + , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + i2c0_default: i2c0_default { + group0 { + pinmux = , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + i2c1_default: i2c1_default { + group0 { + pinmux = , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + lpuart0_default: lpuart0_default { + group0 { + pinmux = , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + spi0_default: spi0_default { + group0 { + pinmux = , + , + , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + spi1_default: spi1_default { + group0 { + pinmux = , + , + , + , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + spi2_default: spi2_default { + group0 { + pinmux = , + , + , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + uart0_default: uart0_default { + group0 { + pinmux = , + ; + drive-strength = "low"; + bias-pull-up; + slew-rate = "fast"; + }; + }; + + uart1_default: uart1_default { + group0 { + pinmux = , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + uart2_default: uart2_default { + group0 { + pinmux = , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + + uart4_default: uart4_default { + group0 { + pinmux = , + , + , + ; + drive-strength = "low"; + slew-rate = "fast"; + }; + }; + +}; diff --git a/boards/arm/rddrone_fmuk66/rddrone_fmuk66.dts b/boards/arm/rddrone_fmuk66/rddrone_fmuk66.dts index dcbfcbe6608..022376d687b 100644 --- a/boards/arm/rddrone_fmuk66/rddrone_fmuk66.dts +++ b/boards/arm/rddrone_fmuk66/rddrone_fmuk66.dts @@ -1,13 +1,14 @@ /* - * Copyright (c) 2021, Electromaticus LLC, 2021 NXP + * Copyright (c) 2021, Electromaticus LLC, 2022 NXP * * SPDX-License-Identifier: Apache-2.0 */ /dts-v1/; -#include +#include #include +#include "rddrone_fmuk66-pinctrl.dtsi" / { model = "NXP RDDRONE FMUK66 board"; @@ -89,7 +90,8 @@ status = "okay"; compatible = "nxp,kinetis-ftm-pwm"; #pwm-cells = <3>; - pinctrl-0 = <&FTM0_CH0_PTC1 &FTM0_CH1_PTA4 &FTM0_CH4_PTD4 &FTM0_CH5_PTD5>; + pinctrl-0 = <&ftm0_default>; + pinctrl-names = "default"; }; @@ -98,14 +100,16 @@ status = "okay"; compatible = "nxp,kinetis-ftm-pwm"; #pwm-cells = <3>; - pinctrl-0 = <&FTM3_CH3_PTD3 &FTM3_CH4_PTC8 &FTM3_CH5_PTC9 &FTM3_CH6_PTE11 &FTM3_CH7_PTE12>; + pinctrl-0 = <&ftm3_default>; + pinctrl-names = "default"; }; /* LPUART connected to debug header */ &lpuart0 { status = "okay"; current-speed = <115200>; - pinctrl-0 = <&LPUART0_RX_PTD8 &LPUART0_TX_PTD9>; + pinctrl-0 = <&lpuart0_default>; + pinctrl-names = "default"; }; zephyr_udc0: &usbotg { @@ -117,25 +121,29 @@ zephyr_udc0: &usbotg { &uart0 { status = "okay"; current-speed = <115200>; - pinctrl-0 = <&UART0_RX_PTA1 &UART0_TX_PTA2>; + pinctrl-0 = <&uart0_default>; + pinctrl-names = "default"; }; &uart1 { status = "okay"; current-speed = <115200>; - pinctrl-0 = <&UART1_RX_PTC3 &UART1_TX_PTC4>; + pinctrl-0 = <&uart1_default>; + pinctrl-names = "default"; }; &uart2 { status = "okay"; current-speed = <115200>; - pinctrl-0 = <&UART2_RX_PTD2 &UART2_TX_PTD3>; + pinctrl-0 = <&uart2_default>; + pinctrl-names = "default"; }; &uart4 { status = "okay"; current-speed = <115200>; - pinctrl-0 = <&UART4_RTS_b_PTE27 &UART4_CTS_b_PTC13 &UART4_RX_PTC14 &UART4_TX_PTC15>; + pinctrl-0 = <&uart4_default>; + pinctrl-names = "default"; }; &usbotg { @@ -204,42 +212,29 @@ zephyr_udc0: &usbotg { &enet { status = "okay"; - pinctrl-0 = <&RMII0_RXER_PTA5 &RMII0_RXD1_PTA12 - &RMII0_RXD0_PTA13 &RMII0_CRS_DV_PTA14 - &RMII0_TXEN_PTA15 &RMII0_TXD0_PTA16 - &RMII0_TXD1_PTA17 &RMII0_MDIO_PTB0 - &RMII0_MDC_PTB1>; -}; - -&RMII0_MDIO_PTB0 { - bias-pull-up; - drive-open-drain; + pinctrl-0 = <&enet_default>; + pinctrl-names = "default"; }; &flexcan0 { status = "okay"; - pinctrl-0 = <&CAN0_TX_PTB18 &CAN0_RX_PTB19>; + pinctrl-0 = <&flexcan0_default>; + pinctrl-names = "default"; bus-speed = <125000>; }; -&CAN0_RX_PTB19 { - bias-pull-up; -}; - &flexcan1 { status = "okay"; - pinctrl-0 = <&CAN1_TX_PTC17 &CAN1_RX_PTC16>; + pinctrl-0 = <&flexcan1_default>; + pinctrl-names = "default"; bus-speed = <125000>; }; -&CAN1_RX_PTC16 { - bias-pull-up; -}; - /* external i2c port */ &i2c0 { status = "okay"; - pinctrl-0 = <&I2C0_SCL_PTE24 &I2C0_SDA_PTE25>; + pinctrl-0 = <&i2c0_default>; + pinctrl-names = "default"; }; /* magnetometer (bmm150), barometer (bmp280), pressure (mpl3115), @@ -247,26 +242,29 @@ zephyr_udc0: &usbotg { */ &i2c1 { status = "okay"; - pinctrl-0 = <&I2C1_SCL_PTC10 &I2C1_SDA_PTC11>; + pinctrl-0 = <&i2c1_default>; + pinctrl-names = "default"; }; /* f-ram spi port */ &spi0 { status = "okay"; - pinctrl-0 = <&SPI0_PCS2_PTC2 &SPI0_SCK_PTC5 &SPI0_SOUT_PTC6 &SPI0_SIN_PTC7>; + pinctrl-0 = <&spi0_default>; + pinctrl-names = "default"; }; /* flash (w25x40), accel, magneto (fxos8700), gyro (fxas2100) */ &spi1 { status = "okay"; - pinctrl-0 = <&SPI1_PCS0_PTB10 &SPI1_PCS1_PTB9 &SPI1_SCK_PTB11 - &SPI1_SOUT_PTB16 &SPI1_SIN_PTB17>; + pinctrl-0 = <&spi1_default>; + pinctrl-names = "default"; }; /* external spi */ &spi2 { status = "okay"; - pinctrl-0 = <&SPI2_PCS0_PTB20 &SPI2_SCK_PTB21 &SPI2_SOUT_PTB22 &SPI2_SIN_PTB23>; + pinctrl-0 = <&spi2_default>; + pinctrl-names = "default"; }; &edma0 { diff --git a/boards/arm/rddrone_fmuk66/rddrone_fmuk66_defconfig b/boards/arm/rddrone_fmuk66/rddrone_fmuk66_defconfig index 9f87aeca304..759bbd82764 100644 --- a/boards/arm/rddrone_fmuk66/rddrone_fmuk66_defconfig +++ b/boards/arm/rddrone_fmuk66/rddrone_fmuk66_defconfig @@ -7,6 +7,7 @@ CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_CORTEX_M_SYSTICK=y CONFIG_GPIO=y +CONFIG_PINCTRL=y CONFIG_PINMUX=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=160000000 CONFIG_OSC_EXTERNAL=y