From ad393fbbfa31319a898496da7629b48d01ab5fb4 Mon Sep 17 00:00:00 2001 From: Declan Snyder Date: Tue, 19 Mar 2024 15:53:03 -0500 Subject: [PATCH] dts: Rename RW pinctrl to MCI IO MUX "RW pinctrl" is clearly SOC specific naming for an IP that is not necessarily constrained to live on one SOC series. Signed-off-by: Declan Snyder --- drivers/pinctrl/CMakeLists.txt | 2 +- drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/Kconfig.mci_io_mux | 9 +++++++++ drivers/pinctrl/Kconfig.rw | 9 --------- .../{pinctrl_rw_iomux.c => pinctrl_mci_io_mux.c} | 0 dts/arm/nxp/nxp_rw6xx_common.dtsi | 2 +- .../{nxp,rw-iomux-pinctrl.yaml => nxp,mci-io-mux.yaml} | 10 +++++----- 7 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 drivers/pinctrl/Kconfig.mci_io_mux delete mode 100644 drivers/pinctrl/Kconfig.rw rename drivers/pinctrl/{pinctrl_rw_iomux.c => pinctrl_mci_io_mux.c} (100%) rename dts/bindings/pinctrl/{nxp,rw-iomux-pinctrl.yaml => nxp,mci-io-mux.yaml} (89%) diff --git a/drivers/pinctrl/CMakeLists.txt b/drivers/pinctrl/CMakeLists.txt index a0e246ba687..c285e7d6f7f 100644 --- a/drivers/pinctrl/CMakeLists.txt +++ b/drivers/pinctrl/CMakeLists.txt @@ -34,7 +34,7 @@ zephyr_library_sources_ifdef(CONFIG_PINCTRL_EMSDP pinctrl_emsdp.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_TI_CC32XX pinctrl_ti_cc32xx.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_NUMAKER pinctrl_numaker.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_QUICKLOGIC_EOS_S3 pinctrl_eos_s3.c) -zephyr_library_sources_ifdef(CONFIG_PINCTRL_RW pinctrl_rw_iomux.c) +zephyr_library_sources_ifdef(CONFIG_PINCTRL_MCI_IO_MUX pinctrl_mci_io_mux.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_ENE_KB1200 pinctrl_ene_kb1200.c) zephyr_library_sources_ifdef(CONFIG_PINCTRL_IMX_SCU pinctrl_imx_scu.c) diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index df96253c9f9..ab6ea86bcc9 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -62,7 +62,7 @@ source "drivers/pinctrl/Kconfig.emsdp" source "drivers/pinctrl/Kconfig.ti_cc32xx" source "drivers/pinctrl/Kconfig.numaker" source "drivers/pinctrl/Kconfig.eos_s3" -source "drivers/pinctrl/Kconfig.rw" +source "drivers/pinctrl/Kconfig.mci_io_mux" source "drivers/pinctrl/Kconfig.ene" source "drivers/pinctrl/Kconfig.zynqmp" diff --git a/drivers/pinctrl/Kconfig.mci_io_mux b/drivers/pinctrl/Kconfig.mci_io_mux new file mode 100644 index 00000000000..d50064cb5f9 --- /dev/null +++ b/drivers/pinctrl/Kconfig.mci_io_mux @@ -0,0 +1,9 @@ +# Copyright 2022 NXP +# SPDX-License-Identifier: Apache-2.0 + +config PINCTRL_MCI_IO_MUX + bool "NXP MCI IO MUX Pinctrl Driver" + default y + depends on DT_HAS_NXP_MCI_IO_MUX_ENABLED + help + Enable pin controller driver for NXP MCI_IO_MUX diff --git a/drivers/pinctrl/Kconfig.rw b/drivers/pinctrl/Kconfig.rw deleted file mode 100644 index 77d293f7b58..00000000000 --- a/drivers/pinctrl/Kconfig.rw +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -config PINCTRL_RW - bool "Pin controller driver for NXP RW MCUs" - default y - depends on DT_HAS_NXP_RW_IOMUX_PINCTRL_ENABLED - help - Enable pin controller driver for NXP RW61x series MCUs diff --git a/drivers/pinctrl/pinctrl_rw_iomux.c b/drivers/pinctrl/pinctrl_mci_io_mux.c similarity index 100% rename from drivers/pinctrl/pinctrl_rw_iomux.c rename to drivers/pinctrl/pinctrl_mci_io_mux.c diff --git a/dts/arm/nxp/nxp_rw6xx_common.dtsi b/dts/arm/nxp/nxp_rw6xx_common.dtsi index 905de90a813..978a4d94688 100644 --- a/dts/arm/nxp/nxp_rw6xx_common.dtsi +++ b/dts/arm/nxp/nxp_rw6xx_common.dtsi @@ -58,7 +58,7 @@ }; pinctrl: mci_iomux@4000 { - compatible = "nxp,rw-iomux-pinctrl"; + compatible = "nxp,mci-io-mux"; reg = <0x4000 0x1000>; status = "okay"; }; diff --git a/dts/bindings/pinctrl/nxp,rw-iomux-pinctrl.yaml b/dts/bindings/pinctrl/nxp,mci-io-mux.yaml similarity index 89% rename from dts/bindings/pinctrl/nxp,rw-iomux-pinctrl.yaml rename to dts/bindings/pinctrl/nxp,mci-io-mux.yaml index 3264c405040..d717c0374e1 100644 --- a/dts/bindings/pinctrl/nxp,rw-iomux-pinctrl.yaml +++ b/dts/bindings/pinctrl/nxp,mci-io-mux.yaml @@ -1,8 +1,8 @@ -# Copyright 2022, NXP +# Copyright 2022, 2024 NXP # SPDX-License-Identifier: Apache-2.0 description: | - RW61x pin control node. This node defines pin configurations in pin + MCI IO MUX pin control node. This node defines pin configurations in pin groups, and has the 'pinctrl' node identifier in the SOC's devicetree. Each group within the pin configuration defines a peripheral's pin configuration. Each numbered subgroup represents pins with shared configuration for that @@ -30,16 +30,16 @@ description: | bias-pull-up: PAD_PU_PD_ENx= (0x1 << pin_index) bias-pull-down: PAD_PU_PD_ENx= (0x10 << pin_index) -compatible: "nxp,rw-iomux-pinctrl" +compatible: "nxp,mci-io-mux" include: - name: base.yaml child-binding: - description: iMX RW IOMUX pin controller pin group + description: MCI IO MUX pin controller pin group child-binding: description: | - iMX RW IOMUX pin controller pin configuration node + MCI IO MUX pin controller pin configuration node include: - name: pincfg-node.yaml property-allowlist: