pinctrl: nxp: imx93: Rename to imx9

We are going to add pinctrl data support for both i.MX93 and i.MX91.
Since these SoCs share the same pinctrl driver structure, rename
pinctrl-imx93.c to a more generic pinctrl-imx9.c and update all related
variable and function names accordingly.

This prepares the driver for supporting additional i.MX9 family SoCs.

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/drivers/pinctrl/nxp/Makefile b/drivers/pinctrl/nxp/Makefile
index 7d861ae52c1c9d1c7b325d94216e7cf1a38b4998..7f1cc5a182ff16f27d6ae190db5d366855cc4614 100644 (file)
--- a/drivers/pinctrl/nxp/Makefile
+++ b/drivers/pinctrl/nxp/Makefile
@@ -7,7 +7,7 @@ obj-$(CONFIG_PINCTRL_IMX7ULP)           += pinctrl-imx7ulp.o
 obj-$(CONFIG_PINCTRL_IMX8ULP)          += pinctrl-imx8ulp.o
 obj-$(CONFIG_PINCTRL_IMX8)             += pinctrl-imx8.o
 obj-$(CONFIG_PINCTRL_IMX8M)            += pinctrl-imx8m.o
-obj-$(CONFIG_PINCTRL_IMX93)            += pinctrl-imx93.o
+obj-$(CONFIG_PINCTRL_IMX93)            += pinctrl-imx9.o
 obj-$(CONFIG_PINCTRL_MXS)              += pinctrl-mxs.o
 obj-$(CONFIG_PINCTRL_VYBRID)           += pinctrl-vf610.o
 obj-$(CONFIG_PINCTRL_IMXRT)            += pinctrl-imxrt.o

diff --git a/drivers/pinctrl/nxp/pinctrl-imx9.c b/drivers/pinctrl/nxp/pinctrl-imx9.c
new file mode 100644 (file)
index 0000000..39bcdea
--- /dev/null
+++ b/drivers/pinctrl/nxp/pinctrl-imx9.c
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2022 NXP
+ */
+
+#include <dm/device.h>
+#include <dm/pinctrl.h>
+
+#include "pinctrl-imx.h"
+
+static struct imx_pinctrl_soc_info imx9_pinctrl_soc_info __section(".data") = {
+       .flags = ZERO_OFFSET_VALID,
+};
+
+static const struct udevice_id imx9_pinctrl_match[] = {
+       { .compatible = "fsl,imx93-iomuxc", .data = (ulong)&imx9_pinctrl_soc_info },
+       { .compatible = "fsl,imx91-iomuxc", .data = (ulong)&imx9_pinctrl_soc_info },
+       { /* sentinel */ }
+};
+
+static const struct pinctrl_ops imx9_pinctrl_ops = {
+       .set_state = imx_pinctrl_set_state_mmio,
+};
+
+U_BOOT_DRIVER(imx9_pinctrl) = {
+       .name = "imx9-pinctrl",
+       .id = UCLASS_PINCTRL,
+       .of_match = of_match_ptr(imx9_pinctrl_match),
+       .probe = imx_pinctrl_probe_mmio,
+       .remove = imx_pinctrl_remove_mmio,
+       .priv_auto      = sizeof(struct imx_pinctrl_priv),
+       .ops = &imx9_pinctrl_ops,
+       .flags = DM_FLAG_PRE_RELOC,
+};

diff --git a/drivers/pinctrl/nxp/pinctrl-imx93.c b/drivers/pinctrl/nxp/pinctrl-imx93.c
deleted file mode 100644 (file)
index 5d250db..0000000
--- a/drivers/pinctrl/nxp/pinctrl-imx93.c
+++ /dev/null
@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2022 NXP
- */
-
-#include <dm/device.h>
-#include <dm/pinctrl.h>
-
-#include "pinctrl-imx.h"
-
-static struct imx_pinctrl_soc_info imx93_pinctrl_soc_info __section(".data") = {
-       .flags = ZERO_OFFSET_VALID,
-};
-
-static const struct udevice_id imx93_pinctrl_match[] = {
-       { .compatible = "fsl,imx93-iomuxc", .data = (ulong)&imx93_pinctrl_soc_info },
-       { .compatible = "fsl,imx91-iomuxc", .data = (ulong)&imx93_pinctrl_soc_info },
-       { /* sentinel */ }
-};
-
-static const struct pinctrl_ops imx93_pinctrl_ops = {
-       .set_state = imx_pinctrl_set_state_mmio,
-};
-
-U_BOOT_DRIVER(imx93_pinctrl) = {
-       .name = "imx93-pinctrl",
-       .id = UCLASS_PINCTRL,
-       .of_match = of_match_ptr(imx93_pinctrl_match),
-       .probe = imx_pinctrl_probe_mmio,
-       .remove = imx_pinctrl_remove_mmio,
-       .priv_auto      = sizeof(struct imx_pinctrl_priv),
-       .ops = &imx93_pinctrl_ops,
-       .flags = DM_FLAG_PRE_RELOC,
-};