[PATCH 2/4] firmware: arm_scmi: bus: Bypass setting fwnode for pinctrl

Peng Fan (OSS)
2024-12-25T08:27:44Z

From: Peng Fan <peng.fan@nxp.com>

pinctrl-scmi.c and pinctrl-imx-scmi.c, both use SCMI_PROTOCOL_PINCTRL.
If both drivers are built in, and the scmi device with name "pinctrl-imx"
is created earlier, and the fwnode device points to the scmi device,
non-i.MX platforms will never have the pinctrl supplier ready.

So bypass setting fwnode for scmi pinctrl devices that non
compatible with socs.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/firmware/arm_scmi/bus.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c
index 12190d4dabb65484543044b4424fbe3b67245466..87665b09c8ff492953c8300f80ed73eab6cce4fd 100644
--- a/drivers/firmware/arm_scmi/bus.c
+++ b/drivers/firmware/arm_scmi/bus.c
@@ -345,6 +345,11 @@ static void __scmi_device_destroy(struct scmi_device *scmi_dev)
device_unregister(&scmi_dev->dev);
}

+static const char * const scmi_pinctrl_imx_lists[] = {
+ "fsl,imx95",
+ NULL
+};
+
static int
__scmi_device_set_node(struct scmi_device *scmi_dev, struct device_node *np,
int protocol, const char *name)
@@ -353,6 +358,15 @@ __scmi_device_set_node(struct scmi_device *scmi_dev, struct device_node *np,
if ((protocol == SCMI_PROTOCOL_PERF) && !strcmp(name, "cpufreq"))
return 0;

+ if (protocol == SCMI_PROTOCOL_PINCTRL) {
+ if (!strcmp(name, "pinctrl") &&
+ of_machine_compatible_match(scmi_pinctrl_imx_lists))
+ return 0;
+ if (!strcmp(name, "pinctrl-imx") &&
+ !of_machine_compatible_match(scmi_pinctrl_imx_lists))
+ return 0;
+ }
+
device_set_node(&scmi_dev->dev, of_fwnode_handle(np));

return 0;

--
2.37.1