diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index d7154422342..846d4cc2bf6 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -3680,7 +3680,7 @@ NXP Drivers: - drivers/*/*.mcux - drivers/*/*.nxp - drivers/*/*nxp* - - drivers/*/*kinetis* + - drivers/*/*/*kinetis* - drivers/misc/*/nxp* - include/zephyr/dt-bindings/*/*nxp* - include/zephyr/dt-bindings/*/*mcux* diff --git a/drivers/clock_control/clock_control_mcux_syscon.c b/drivers/clock_control/clock_control_mcux_syscon.c index ca772e2cdd4..3229c7a9ecc 100644 --- a/drivers/clock_control/clock_control_mcux_syscon.c +++ b/drivers/clock_control/clock_control_mcux_syscon.c @@ -44,7 +44,7 @@ static int mcux_lpc_syscon_clock_control_on(const struct device *dev, } #endif -#if defined(CONFIG_PINCTRL_NXP_KINETIS) +#if defined(CONFIG_PINCTRL_NXP_PORT) switch ((uint32_t)sub_system) { #if defined(CONFIG_SOC_SERIES_MCXA) case MCUX_PORT0_CLK: @@ -82,7 +82,7 @@ static int mcux_lpc_syscon_clock_control_on(const struct device *dev, default: break; } -#endif /* defined(CONFIG_PINCTRL_NXP_KINETIS) */ +#endif /* defined(CONFIG_PINCTRL_NXP_PORT) */ #ifdef CONFIG_ETH_NXP_ENET_QOS if ((uint32_t)sub_system == MCUX_ENET_QOS_CLK) { diff --git a/drivers/pinctrl/CMakeLists.txt b/drivers/pinctrl/CMakeLists.txt index 99cb8d6b9e5..d83272acf1e 100644 --- a/drivers/pinctrl/CMakeLists.txt +++ b/drivers/pinctrl/CMakeLists.txt @@ -15,7 +15,7 @@ zephyr_library_sources_ifdef(CONFIG_PINCTRL_RPI_PICO pinctrl_rpi_pico.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_SAM pinctrl_sam.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_SAM0 pinctrl_sam0.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_STM32 pinctrl_stm32.c) -zephyr_library_sources_ifdef(CONFIG_PINCTRL_NXP_KINETIS pinctrl_kinetis.c) +zephyr_library_sources_ifdef(CONFIG_PINCTRL_NXP_PORT pinctrl_nxp_port.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_MCHP_XEC pinctrl_mchp_xec.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_IMX pinctrl_imx.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_SIFIVE pinctrl_sifive.c) diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 511a8a22cb9..5dcb9be4d73 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -44,7 +44,7 @@ source "drivers/pinctrl/Kconfig.rpi_pico" source "drivers/pinctrl/Kconfig.sam" source "drivers/pinctrl/Kconfig.sam0" source "drivers/pinctrl/Kconfig.stm32" -source "drivers/pinctrl/Kconfig.kinetis" +source "drivers/pinctrl/Kconfig.nxp_port" source "drivers/pinctrl/Kconfig.xec" source "drivers/pinctrl/Kconfig.imx" source "drivers/pinctrl/Kconfig.sifive" diff --git a/drivers/pinctrl/Kconfig.kinetis b/drivers/pinctrl/Kconfig.kinetis deleted file mode 100644 index 04c2ee04df2..00000000000 --- a/drivers/pinctrl/Kconfig.kinetis +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -config PINCTRL_NXP_KINETIS - bool "Pin controller driver for NXP Kinetis MCUs" - default y - depends on DT_HAS_NXP_KINETIS_PINMUX_ENABLED - help - Enable pin controller driver for NXP Kinetis MCUs diff --git a/drivers/pinctrl/Kconfig.nxp_port b/drivers/pinctrl/Kconfig.nxp_port new file mode 100644 index 00000000000..0aed599cf94 --- /dev/null +++ b/drivers/pinctrl/Kconfig.nxp_port @@ -0,0 +1,9 @@ +# Copyright 2022, 2024 NXP +# SPDX-License-Identifier: Apache-2.0 + +config PINCTRL_NXP_PORT + bool "Pin controller driver for NXP PORT peripheral" + default y + depends on DT_HAS_NXP_PORT_PINMUX_ENABLED + help + Enable pin controller driver for NXP PORT peripheral diff --git a/drivers/pinctrl/pinctrl_kinetis.c b/drivers/pinctrl/pinctrl_nxp_port.c similarity index 92% rename from drivers/pinctrl/pinctrl_kinetis.c rename to drivers/pinctrl/pinctrl_nxp_port.c index bc250d742cf..4cfe63f8412 100644 --- a/drivers/pinctrl/pinctrl_kinetis.c +++ b/drivers/pinctrl/pinctrl_nxp_port.c @@ -5,14 +5,14 @@ */ -#define DT_DRV_COMPAT nxp_kinetis_pinmux +#define DT_DRV_COMPAT nxp_port_pinmux #include #include #include #include -LOG_MODULE_REGISTER(pinctrl_kinetis, CONFIG_PINCTRL_LOG_LEVEL); +LOG_MODULE_REGISTER(pinctrl_nxp_port, CONFIG_PINCTRL_LOG_LEVEL); /* Port register addresses. */ static PORT_Type *ports[] = { @@ -52,10 +52,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, return 0; } -/* Kinetis pinmux driver binds to the same DTS nodes, - * and handles clock init. Only bind to these nodes if pinmux driver - * is disabled. - */ static int pinctrl_mcux_init(const struct device *dev) { const struct pinctrl_mcux_config *config = dev->config; diff --git a/dts/arm/nxp/nxp_k2x.dtsi b/dts/arm/nxp/nxp_k2x.dtsi index 147ccffde0b..82f594e84e1 100644 --- a/dts/arm/nxp/nxp_k2x.dtsi +++ b/dts/arm/nxp/nxp_k2x.dtsi @@ -55,7 +55,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -194,31 +194,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>; }; diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi index 38c8dfe0517..f478e1eb1a8 100644 --- a/dts/arm/nxp/nxp_k6x.dtsi +++ b/dts/arm/nxp/nxp_k6x.dtsi @@ -74,7 +74,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -255,31 +255,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>; }; diff --git a/dts/arm/nxp/nxp_k8x.dtsi b/dts/arm/nxp/nxp_k8x.dtsi index aeb747add09..7270656fd06 100644 --- a/dts/arm/nxp/nxp_k8x.dtsi +++ b/dts/arm/nxp/nxp_k8x.dtsi @@ -34,7 +34,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -260,31 +260,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>; }; diff --git a/dts/arm/nxp/nxp_ke1xf.dtsi b/dts/arm/nxp/nxp_ke1xf.dtsi index c6280351ca3..e43ce594278 100644 --- a/dts/arm/nxp/nxp_ke1xf.dtsi +++ b/dts/arm/nxp/nxp_ke1xf.dtsi @@ -92,7 +92,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -422,31 +422,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0x1000>; clocks = <&pcc 0x124 KINETIS_PCC_SRC_NONE_OR_EXT>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0x1000>; clocks = <&pcc 0x128 KINETIS_PCC_SRC_NONE_OR_EXT>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0x1000>; clocks = <&pcc 0x12c KINETIS_PCC_SRC_NONE_OR_EXT>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0x1000>; clocks = <&pcc 0x130 KINETIS_PCC_SRC_NONE_OR_EXT>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0x1000>; clocks = <&pcc 0x134 KINETIS_PCC_SRC_NONE_OR_EXT>; }; diff --git a/dts/arm/nxp/nxp_ke1xz.dtsi b/dts/arm/nxp/nxp_ke1xz.dtsi index 6268ffb9aa4..7c40a9adbc2 100644 --- a/dts/arm/nxp/nxp_ke1xz.dtsi +++ b/dts/arm/nxp/nxp_ke1xz.dtsi @@ -67,7 +67,7 @@ }; pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; }; soc { @@ -187,31 +187,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0x1000>; clocks = <&pcc 0x124 KINETIS_PCC_SRC_NONE_OR_EXT>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0x1000>; clocks = <&pcc 0x128 KINETIS_PCC_SRC_NONE_OR_EXT>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0x1000>; clocks = <&pcc 0x12c KINETIS_PCC_SRC_NONE_OR_EXT>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0x1000>; clocks = <&pcc 0x130 KINETIS_PCC_SRC_NONE_OR_EXT>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0x1000>; clocks = <&pcc 0x134 KINETIS_PCC_SRC_NONE_OR_EXT>; }; diff --git a/dts/arm/nxp/nxp_kl25z.dtsi b/dts/arm/nxp/nxp_kl25z.dtsi index bd1e30a9819..c41820d63fd 100644 --- a/dts/arm/nxp/nxp_kl25z.dtsi +++ b/dts/arm/nxp/nxp_kl25z.dtsi @@ -31,7 +31,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -119,31 +119,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>; }; diff --git a/dts/arm/nxp/nxp_kv5x.dtsi b/dts/arm/nxp/nxp_kv5x.dtsi index 6569d57b431..230e0dccf62 100644 --- a/dts/arm/nxp/nxp_kv5x.dtsi +++ b/dts/arm/nxp/nxp_kv5x.dtsi @@ -29,7 +29,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -177,31 +177,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0x1000>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>; }; diff --git a/dts/arm/nxp/nxp_kw2xd.dtsi b/dts/arm/nxp/nxp_kw2xd.dtsi index b0fd41ba9a3..e394885aa8a 100644 --- a/dts/arm/nxp/nxp_kw2xd.dtsi +++ b/dts/arm/nxp/nxp_kw2xd.dtsi @@ -34,7 +34,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; /* * KW2XD is a system in package part, so the SPI1 controller is @@ -176,31 +176,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>; }; diff --git a/dts/arm/nxp/nxp_kw40z.dtsi b/dts/arm/nxp/nxp_kw40z.dtsi index 06df329b44e..9046fe56a88 100644 --- a/dts/arm/nxp/nxp_kw40z.dtsi +++ b/dts/arm/nxp/nxp_kw40z.dtsi @@ -32,7 +32,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -124,19 +124,19 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0xa4>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0xa4>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0xa4>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; diff --git a/dts/arm/nxp/nxp_kw41z.dtsi b/dts/arm/nxp/nxp_kw41z.dtsi index 87c69d17f5e..a3e61d11e76 100644 --- a/dts/arm/nxp/nxp_kw41z.dtsi +++ b/dts/arm/nxp/nxp_kw41z.dtsi @@ -37,7 +37,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -131,19 +131,19 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0xa4>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0xa4>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0xa4>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; diff --git a/dts/arm/nxp/nxp_mcxa156.dtsi b/dts/arm/nxp/nxp_mcxa156.dtsi index 3397861dc63..900b18b8109 100644 --- a/dts/arm/nxp/nxp_mcxa156.dtsi +++ b/dts/arm/nxp/nxp_mcxa156.dtsi @@ -24,7 +24,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -50,31 +50,31 @@ }; porta: pinmux@400bc000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x400bc000 0x1000>; clocks = <&syscon MCUX_PORT0_CLK>; }; portb: pinmux@400bd000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x400bd000 0x1000>; clocks = <&syscon MCUX_PORT1_CLK>; }; portc: pinmux@400be000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x400be000 0x1000>; clocks = <&syscon MCUX_PORT2_CLK>; }; portd: pinmux@400bf000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x400bf000 0x1000>; clocks = <&syscon MCUX_PORT3_CLK>; }; porte: pinmux@400c0000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x400c0000 0x1000>; clocks = <&syscon MCUX_PORT4_CLK>; }; diff --git a/dts/arm/nxp/nxp_mcxc_common.dtsi b/dts/arm/nxp/nxp_mcxc_common.dtsi index ef0b7f807e1..07c867ce126 100644 --- a/dts/arm/nxp/nxp_mcxc_common.dtsi +++ b/dts/arm/nxp/nxp_mcxc_common.dtsi @@ -35,7 +35,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -107,31 +107,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>; }; diff --git a/dts/arm/nxp/nxp_mcxn23x_common.dtsi b/dts/arm/nxp/nxp_mcxn23x_common.dtsi index 3857b30af8d..d44324ac6f8 100644 --- a/dts/arm/nxp/nxp_mcxn23x_common.dtsi +++ b/dts/arm/nxp/nxp_mcxn23x_common.dtsi @@ -30,7 +30,7 @@ }; pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; }; @@ -74,37 +74,37 @@ }; porta: pinmux@116000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x116000 0x1000>; clocks = <&syscon MCUX_PORT0_CLK>; }; portb: pinmux@117000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x117000 0x1000>; clocks = <&syscon MCUX_PORT1_CLK>; }; portc: pinmux@118000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x118000 0x1000>; clocks = <&syscon MCUX_PORT2_CLK>; }; portd: pinmux@119000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x119000 0x1000>; clocks = <&syscon MCUX_PORT3_CLK>; }; porte: pinmux@11a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x11a000 0x1000>; clocks = <&syscon MCUX_PORT4_CLK>; }; portf: pinmux@42000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x42000 0x1000>; clocks = <&syscon MCUX_PORT5_CLK>; }; diff --git a/dts/arm/nxp/nxp_mcxn94x_common.dtsi b/dts/arm/nxp/nxp_mcxn94x_common.dtsi index fd36a4c2aef..859916a094a 100644 --- a/dts/arm/nxp/nxp_mcxn94x_common.dtsi +++ b/dts/arm/nxp/nxp_mcxn94x_common.dtsi @@ -35,7 +35,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; }; @@ -80,37 +80,37 @@ }; porta: pinmux@116000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x116000 0x1000>; clocks = <&syscon MCUX_PORT0_CLK>; }; portb: pinmux@117000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x117000 0x1000>; clocks = <&syscon MCUX_PORT1_CLK>; }; portc: pinmux@118000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x118000 0x1000>; clocks = <&syscon MCUX_PORT2_CLK>; }; portd: pinmux@119000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x119000 0x1000>; clocks = <&syscon MCUX_PORT3_CLK>; }; porte: pinmux@11a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x11a000 0x1000>; clocks = <&syscon MCUX_PORT4_CLK>; }; portf: pinmux@42000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x42000 0x1000>; clocks = <&syscon MCUX_PORT5_CLK>; }; diff --git a/dts/arm/nxp/nxp_mcxw71.dtsi b/dts/arm/nxp/nxp_mcxw71.dtsi index e17ae42ea5f..695c0fd65bb 100644 --- a/dts/arm/nxp/nxp_mcxw71.dtsi +++ b/dts/arm/nxp/nxp_mcxw71.dtsi @@ -116,7 +116,7 @@ }; pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; }; }; @@ -147,25 +147,25 @@ }; porta: pinctrl@42000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x42000 0xe0>; clocks = <&scg SCG_K4_SLOW_CLK 0x108>; }; portb: pinctrl@43000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x43000 0xe0>; clocks = <&scg SCG_K4_SLOW_CLK 0x10c>; }; portc: pinctrl@44000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x44000 0xe0>; clocks = <&scg SCG_K4_SLOW_CLK 0x110>; }; portd: pinctrl@45000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x45000 0xe0>; clocks = <&scg SCG_K4_SLOW_CLK 0>; }; diff --git a/dts/arm/nxp/nxp_s32k1xx.dtsi b/dts/arm/nxp/nxp_s32k1xx.dtsi index db200638781..8668b3aed20 100644 --- a/dts/arm/nxp/nxp_s32k1xx.dtsi +++ b/dts/arm/nxp/nxp_s32k1xx.dtsi @@ -25,7 +25,7 @@ /* Dummy pinctrl node, filled with pin mux options at board level */ pinctrl: pinctrl { - compatible = "nxp,kinetis-pinctrl"; + compatible = "nxp,port-pinctrl"; status = "okay"; }; @@ -99,31 +99,31 @@ }; porta: pinmux@40049000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x40049000 0x1000>; clocks = <&clock NXP_S32_PORTA_CLK>; }; portb: pinmux@4004a000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004a000 0x1000>; clocks = <&clock NXP_S32_PORTB_CLK>; }; portc: pinmux@4004b000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004b000 0x1000>; clocks = <&clock NXP_S32_PORTC_CLK>; }; portd: pinmux@4004c000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004c000 0x1000>; clocks = <&clock NXP_S32_PORTD_CLK>; }; porte: pinmux@4004d000 { - compatible = "nxp,kinetis-pinmux"; + compatible = "nxp,port-pinmux"; reg = <0x4004d000 0x1000>; clocks = <&clock NXP_S32_PORTE_CLK>; }; diff --git a/dts/bindings/pinctrl/nxp,kinetis-pinctrl.yaml b/dts/bindings/pinctrl/nxp,port-pinctrl.yaml similarity index 73% rename from dts/bindings/pinctrl/nxp,kinetis-pinctrl.yaml rename to dts/bindings/pinctrl/nxp,port-pinctrl.yaml index 819ab7e2ab7..ec096802250 100644 --- a/dts/bindings/pinctrl/nxp,kinetis-pinctrl.yaml +++ b/dts/bindings/pinctrl/nxp,port-pinctrl.yaml @@ -2,13 +2,14 @@ # SPDX-License-Identifier: Apache-2.0 description: | - Kinetis pinctrl node. This node will define pin configurations in pin groups, - and has the 'pinctrl' node identifier in the SOC's devicetree. Each group - within the pin configuration defines the pin configuration for a peripheral, - and each numbered subgroup in the pin group defines all the pins for that - peripheral with the same configuration properties. The 'pins' property in - a group selects the pins to be configured, and the remaining properties set - configuration values for those pins. Here is an example group for UART0 pins: + NXP PORT pinctrl node. This node will define pin configurations in pin + groups, and has the 'pinctrl' node identifier in the SOC's devicetree. Each + group within the pin configuration defines the pin configuration for a + peripheral, and each numbered subgroup in the pin group defines all the pins + for that peripheral with the same configuration properties. The 'pins' + property in a group selects the pins to be configured, and the remaining + properties set configuration values for those pins. Here is an example + group for UART0 pins: uart0_default: uart0_default { group0 { @@ -28,15 +29,15 @@ description: | PCR_DSE=, PCR_PFE=0 -compatible: "nxp,kinetis-pinctrl" +compatible: "nxp,port-pinctrl" include: base.yaml child-binding: - description: Kinetis pin controller pin group + description: NXP PORT pin controller pin group child-binding: description: | - Kinetis pin controller pin configuration node + NXP PORT pin controller pin configuration node include: - name: pincfg-node.yaml diff --git a/dts/bindings/pinctrl/nxp,kinetis-pinmux.yaml b/dts/bindings/pinctrl/nxp,port-pinmux.yaml similarity index 67% rename from dts/bindings/pinctrl/nxp,kinetis-pinmux.yaml rename to dts/bindings/pinctrl/nxp,port-pinmux.yaml index d81e5a4ad87..7bdb56b2b5e 100644 --- a/dts/bindings/pinctrl/nxp,kinetis-pinmux.yaml +++ b/dts/bindings/pinctrl/nxp,port-pinmux.yaml @@ -1,6 +1,6 @@ -description: Kinetis pinmux node +description: NXP PORT pinmux node -compatible: "nxp,kinetis-pinmux" +compatible: "nxp,port-pinmux" include: base.yaml diff --git a/west.yml b/west.yml index 8f691d40f74..94676fef423 100644 --- a/west.yml +++ b/west.yml @@ -198,7 +198,7 @@ manifest: groups: - hal - name: hal_nxp - revision: 3c64cd63125c86870802a561ce79dc33697b005c + revision: cae40020064894f67b00215dad2baf7c743e1dfb path: modules/hal/nxp groups: - hal