Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Peng Fan and committed by
Linus Walleij
6e002589 78160900

+8 -3
+6 -2
drivers/pinctrl/freescale/pinctrl-imx-scmi.c
··· 51 51 52 52 #define IMX_SCMI_PIN_SIZE 24 53 53 54 - #define IMX95_DAISY_OFF 0x408 55 54 #define IMX94_DAISY_OFF 0x608 55 + #define IMX95_DAISY_OFF 0x408 56 + #define IMX952_DAISY_OFF 0x460 56 57 57 58 static int pinctrl_scmi_imx_dt_node_to_map(struct pinctrl_dev *pctldev, 58 59 struct device_node *np, ··· 75 74 daisy_off = IMX95_DAISY_OFF; 76 75 } else if (of_machine_is_compatible("fsl,imx94")) { 77 76 daisy_off = IMX94_DAISY_OFF; 77 + } else if (of_machine_is_compatible("fsl,imx952")) { 78 + daisy_off = IMX952_DAISY_OFF; 78 79 } else { 79 80 dev_err(pctldev->dev, "platform not support scmi pinctrl\n"); 80 81 return -EINVAL; ··· 302 299 } 303 300 304 301 static const char * const scmi_pinctrl_imx_allowlist[] = { 305 - "fsl,imx95", 306 302 "fsl,imx94", 303 + "fsl,imx95", 304 + "fsl,imx952", 307 305 NULL 308 306 }; 309 307
+2 -1
drivers/pinctrl/pinctrl-scmi.c
··· 504 504 } 505 505 506 506 static const char * const scmi_pinctrl_blocklist[] = { 507 - "fsl,imx95", 508 507 "fsl,imx94", 508 + "fsl,imx95", 509 + "fsl,imx952", 509 510 NULL 510 511 }; 511 512