Skip to content

Commit a36c7dd

Browse files
danieldegrassemmahadevan108
danieldegrasse
authored and
mmahadevan108
committed
drivers: pinctrl: rename nxp,kinetis-pinctrl to nxp,port-pinctrl
The NXP PORT pinmuxing peripheral is reused across the MCX, S32, and Kinetis lines. Rename the compatible from the family-specific nxp,kinetis-pinctrl to a more generic nxp,port-pinctrl to reflect the actual name for the IP block used within reference manuals. Update the NXP HAL revision to include a change to use the new Kconfig name for the PORT pinctrl driver Update the MAINTAINERS.yml path, as there are no longer any NXP drivers matching the string "drivers/*/*kinetis* Signed-off-by: Daniel DeGrasse <[email protected]>
1 parent 78c1def commit a36c7dd

26 files changed

+123
-126
lines changed

‎MAINTAINERS.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3680,7 +3680,7 @@ NXP Drivers:
36803680
- drivers/*/*.mcux
36813681
- drivers/*/*.nxp
36823682
- drivers/*/*nxp*
3683-
- drivers/*/*kinetis*
3683+
- drivers/*/*/*kinetis*
36843684
- drivers/misc/*/nxp*
36853685
- include/zephyr/dt-bindings/*/*nxp*
36863686
- include/zephyr/dt-bindings/*/*mcux*

‎drivers/clock_control/clock_control_mcux_syscon.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static int mcux_lpc_syscon_clock_control_on(const struct device *dev,
4444
}
4545
#endif
4646

47-
#if defined(CONFIG_PINCTRL_NXP_KINETIS)
47+
#if defined(CONFIG_PINCTRL_NXP_PORT)
4848
switch ((uint32_t)sub_system) {
4949
#if defined(CONFIG_SOC_SERIES_MCXA)
5050
case MCUX_PORT0_CLK:
@@ -82,7 +82,7 @@ static int mcux_lpc_syscon_clock_control_on(const struct device *dev,
8282
default:
8383
break;
8484
}
85-
#endif /* defined(CONFIG_PINCTRL_NXP_KINETIS) */
85+
#endif /* defined(CONFIG_PINCTRL_NXP_PORT) */
8686

8787
#ifdef CONFIG_ETH_NXP_ENET_QOS
8888
if ((uint32_t)sub_system == MCUX_ENET_QOS_CLK) {

‎drivers/pinctrl/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ zephyr_library_sources_ifdef(CONFIG_PINCTRL_RPI_PICO pinctrl_rpi_pico.c)
1515
zephyr_library_sources_ifdef(CONFIG_PINCTRL_SAM pinctrl_sam.c)
1616
zephyr_library_sources_ifdef(CONFIG_PINCTRL_SAM0 pinctrl_sam0.c)
1717
zephyr_library_sources_ifdef(CONFIG_PINCTRL_STM32 pinctrl_stm32.c)
18-
zephyr_library_sources_ifdef(CONFIG_PINCTRL_NXP_KINETIS pinctrl_kinetis.c)
18+
zephyr_library_sources_ifdef(CONFIG_PINCTRL_NXP_PORT pinctrl_nxp_port.c)
1919
zephyr_library_sources_ifdef(CONFIG_PINCTRL_MCHP_XEC pinctrl_mchp_xec.c)
2020
zephyr_library_sources_ifdef(CONFIG_PINCTRL_IMX pinctrl_imx.c)
2121
zephyr_library_sources_ifdef(CONFIG_PINCTRL_SIFIVE pinctrl_sifive.c)

‎drivers/pinctrl/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ source "drivers/pinctrl/Kconfig.rpi_pico"
4444
source "drivers/pinctrl/Kconfig.sam"
4545
source "drivers/pinctrl/Kconfig.sam0"
4646
source "drivers/pinctrl/Kconfig.stm32"
47-
source "drivers/pinctrl/Kconfig.kinetis"
47+
source "drivers/pinctrl/Kconfig.nxp_port"
4848
source "drivers/pinctrl/Kconfig.xec"
4949
source "drivers/pinctrl/Kconfig.imx"
5050
source "drivers/pinctrl/Kconfig.sifive"

‎drivers/pinctrl/Kconfig.kinetis‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎drivers/pinctrl/Kconfig.nxp_port‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Copyright 2022, 2024 NXP
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
config PINCTRL_NXP_PORT
5+
bool "Pin controller driver for NXP PORT peripheral"
6+
default y
7+
depends on DT_HAS_NXP_PORT_PINMUX_ENABLED
8+
help
9+
Enable pin controller driver for NXP PORT peripheral

‎drivers/pinctrl/pinctrl_kinetis.c‎ renamed to ‎drivers/pinctrl/pinctrl_nxp_port.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
*/
66

77

8-
#define DT_DRV_COMPAT nxp_kinetis_pinmux
8+
#define DT_DRV_COMPAT nxp_port_pinmux
99

1010
#include <zephyr/drivers/clock_control.h>
1111
#include <zephyr/drivers/pinctrl.h>
1212
#include <zephyr/logging/log.h>
1313
#include <fsl_clock.h>
1414

15-
LOG_MODULE_REGISTER(pinctrl_kinetis, CONFIG_PINCTRL_LOG_LEVEL);
15+
LOG_MODULE_REGISTER(pinctrl_nxp_port, CONFIG_PINCTRL_LOG_LEVEL);
1616

1717
/* Port register addresses. */
1818
static PORT_Type *ports[] = {
@@ -52,10 +52,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
5252
return 0;
5353
}
5454

55-
/* Kinetis pinmux driver binds to the same DTS nodes,
56-
* and handles clock init. Only bind to these nodes if pinmux driver
57-
* is disabled.
58-
*/
5955
static int pinctrl_mcux_init(const struct device *dev)
6056
{
6157
const struct pinctrl_mcux_config *config = dev->config;

‎dts/arm/nxp/nxp_k2x.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
/* Dummy pinctrl node, filled with pin mux options at board level */
5757
pinctrl: pinctrl {
58-
compatible = "nxp,kinetis-pinctrl";
58+
compatible = "nxp,port-pinctrl";
5959
status = "okay";
6060
};
6161

@@ -194,31 +194,31 @@
194194
};
195195

196196
porta: pinmux@40049000 {
197-
compatible = "nxp,kinetis-pinmux";
197+
compatible = "nxp,port-pinmux";
198198
reg = <0x40049000 0xd0>;
199199
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>;
200200
};
201201

202202
portb: pinmux@4004a000 {
203-
compatible = "nxp,kinetis-pinmux";
203+
compatible = "nxp,port-pinmux";
204204
reg = <0x4004a000 0xd0>;
205205
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>;
206206
};
207207

208208
portc: pinmux@4004b000 {
209-
compatible = "nxp,kinetis-pinmux";
209+
compatible = "nxp,port-pinmux";
210210
reg = <0x4004b000 0xd0>;
211211
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>;
212212
};
213213

214214
portd: pinmux@4004c000 {
215-
compatible = "nxp,kinetis-pinmux";
215+
compatible = "nxp,port-pinmux";
216216
reg = <0x4004c000 0xd0>;
217217
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>;
218218
};
219219

220220
porte: pinmux@4004d000 {
221-
compatible = "nxp,kinetis-pinmux";
221+
compatible = "nxp,port-pinmux";
222222
reg = <0x4004d000 0xd0>;
223223
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>;
224224
};

‎dts/arm/nxp/nxp_k6x.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
/* Dummy pinctrl node, filled with pin mux options at board level */
7676
pinctrl: pinctrl {
77-
compatible = "nxp,kinetis-pinctrl";
77+
compatible = "nxp,port-pinctrl";
7878
status = "okay";
7979
};
8080

@@ -255,31 +255,31 @@
255255
};
256256

257257
porta: pinmux@40049000 {
258-
compatible = "nxp,kinetis-pinmux";
258+
compatible = "nxp,port-pinmux";
259259
reg = <0x40049000 0xd0>;
260260
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>;
261261
};
262262

263263
portb: pinmux@4004a000 {
264-
compatible = "nxp,kinetis-pinmux";
264+
compatible = "nxp,port-pinmux";
265265
reg = <0x4004a000 0xd0>;
266266
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>;
267267
};
268268

269269
portc: pinmux@4004b000 {
270-
compatible = "nxp,kinetis-pinmux";
270+
compatible = "nxp,port-pinmux";
271271
reg = <0x4004b000 0xd0>;
272272
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>;
273273
};
274274

275275
portd: pinmux@4004c000 {
276-
compatible = "nxp,kinetis-pinmux";
276+
compatible = "nxp,port-pinmux";
277277
reg = <0x4004c000 0xd0>;
278278
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>;
279279
};
280280

281281
porte: pinmux@4004d000 {
282-
compatible = "nxp,kinetis-pinmux";
282+
compatible = "nxp,port-pinmux";
283283
reg = <0x4004d000 0xd0>;
284284
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>;
285285
};

‎dts/arm/nxp/nxp_k8x.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
/* Dummy pinctrl node, filled with pin mux options at board level */
3636
pinctrl: pinctrl {
37-
compatible = "nxp,kinetis-pinctrl";
37+
compatible = "nxp,port-pinctrl";
3838
status = "okay";
3939
};
4040

@@ -260,31 +260,31 @@
260260
};
261261

262262
porta: pinmux@40049000 {
263-
compatible = "nxp,kinetis-pinmux";
263+
compatible = "nxp,port-pinmux";
264264
reg = <0x40049000 0x1000>;
265265
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>;
266266
};
267267

268268
portb: pinmux@4004a000 {
269-
compatible = "nxp,kinetis-pinmux";
269+
compatible = "nxp,port-pinmux";
270270
reg = <0x4004a000 0x1000>;
271271
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>;
272272
};
273273

274274
portc: pinmux@4004b000 {
275-
compatible = "nxp,kinetis-pinmux";
275+
compatible = "nxp,port-pinmux";
276276
reg = <0x4004b000 0x1000>;
277277
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>;
278278
};
279279

280280
portd: pinmux@4004c000 {
281-
compatible = "nxp,kinetis-pinmux";
281+
compatible = "nxp,port-pinmux";
282282
reg = <0x4004c000 0x1000>;
283283
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>;
284284
};
285285

286286
porte: pinmux@4004d000 {
287-
compatible = "nxp,kinetis-pinmux";
287+
compatible = "nxp,port-pinmux";
288288
reg = <0x4004d000 0x1000>;
289289
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>;
290290
};

0 commit comments

Comments
 (0)