pinctrl: imx: Add support for NXP i.MX952

The i.MX952 System Manager (SM) firmware supports the System Control
Management Interface (SCMI) pinctrl protocol, similar to the i.MX95 SM.
The base offset for the i.MX952 IOMUXC Daisy input register differs from
that of the i.MX95. Update the pinctrl-imx-scmi driver to add support for
i.MX952.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Linus Walleij <linusw@kernel.org>

diff --git a/drivers/pinctrl/freescale/pinctrl-imx-scmi.c b/drivers/pinctrl/freescale/pinctrl-imx-scmi.c
index 04728ad807d38367a19e6e774d4ccc985549ecfe..dab2fabdf4561c21f747773f2908f15b61eebb50 100644 (file)
--- a/drivers/pinctrl/freescale/pinctrl-imx-scmi.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx-scmi.c
@@ -51,8 +51,9 @@ struct scmi_pinctrl_imx {
 
 #define IMX_SCMI_PIN_SIZE      24
 
-#define IMX95_DAISY_OFF                0x408
 #define IMX94_DAISY_OFF                0x608
+#define IMX95_DAISY_OFF                0x408
+#define IMX952_DAISY_OFF       0x460
 
 static int pinctrl_scmi_imx_dt_node_to_map(struct pinctrl_dev *pctldev,
                                           struct device_node *np,
@@ -74,6 +75,8 @@ static int pinctrl_scmi_imx_dt_node_to_map(struct pinctrl_dev *pctldev,
                        daisy_off = IMX95_DAISY_OFF;
                } else if (of_machine_is_compatible("fsl,imx94")) {
                        daisy_off = IMX94_DAISY_OFF;
+               } else if (of_machine_is_compatible("fsl,imx952")) {
+                       daisy_off = IMX952_DAISY_OFF;
                } else {
                        dev_err(pctldev->dev, "platform not support scmi pinctrl\n");
                        return -EINVAL;
@@ -299,8 +302,9 @@ scmi_pinctrl_imx_get_pins(struct scmi_pinctrl_imx *pmx, struct pinctrl_desc *des
 }
 
 static const char * const scmi_pinctrl_imx_allowlist[] = {
-       "fsl,imx95",
        "fsl,imx94",
+       "fsl,imx95",
+       "fsl,imx952",
        NULL
 };
 

diff --git a/drivers/pinctrl/pinctrl-scmi.c b/drivers/pinctrl/pinctrl-scmi.c
index af3ac031e3626818495a168a96c7930907d9524a..d5fb8649cd9aaddee679ebfd86d8f3d1127b8e01 100644 (file)
--- a/drivers/pinctrl/pinctrl-scmi.c
+++ b/drivers/pinctrl/pinctrl-scmi.c
@@ -504,8 +504,9 @@ static int pinctrl_scmi_get_pins(struct scmi_pinctrl *pmx,
 }
 
 static const char * const scmi_pinctrl_blocklist[] = {
-       "fsl,imx95",
        "fsl,imx94",
+       "fsl,imx95",
+       "fsl,imx952",
        NULL
 };