i.MX drivers change for 6.14:

- Add a SoC driver for i.MX9 (Alice Guo)
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmd6S4kUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM7yrwf+JeckCaD87b6FNo47xrsh0dszXpue
 k5wx2Bibq50iL8m7iXxzMBiLFruhAuG/nhOGMncOntjjWbQGa3QCAfMWUasoMEPD
 0pUdQZSYUFY4bhCFPoRV3a8Na+5ka7PptJwYfAqXKAzKR4cvwBvDdZgLdIGIkxzg
 MusfRC8hSR2TvwU6B5rL8m6lfTef91Rc7Y9FKiuvZ/wwzSris+TWN+5DkMtyrDBi
 +NSv6XjxH1Z9MnhO5QvtS8B/gOWmRvPSvBFq/0jTggvtcPj07t+d5JmYnSbA8avV
 QFencJ5+UnEoKfvGwMAwgeKYDueP/0FxhK7+EcvJ5iYM9Vz3LZStNgsYCw==
 =bRjr
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmeHyw4ACgkQYKtH/8kJ
 Uiej7A/6AlD5vU87H/0XpCA4mZzLK121VSik3Dmfoc4lRG91oG/ltadGvtJGsKWS
 Ly6cRn+fUpgs5w/WP8UmFwgaTfkYnTY+BPYDc0kVLy/KTovNGhpVX8hG65x0g89w
 ZGa6nM9146yJSPlBwRSkJTk9RDFX7dUpO+8L6YYIsbG7MCyx8/RkdTnXJ27cJAKx
 HlV2BQ0fLtmVHUJNYk8kNIqK/oCaRUmgKUQJFlw7ts16Z+XbZYJtnpu4B+7c6ZLB
 OCkR2otrsNFZn65shhkoejXOnrGCgha73nSXSF7zAr8aPX6KzIgWapZaF70rZ3X4
 FKhBOSoklhlX4NXkjCkAQq1Zvp2vF4EmnUJuOShCMEdJ1ii6MfAhjq2wPxYA1kTv
 0eM2tmSrvyQ29/yVng12696LbhV2jzsuUtkqmUWXFsXlxiSfzjeVc+y8Ri2AGjz9
 8gcUIVq9mpvNypsQF/lPeGZuKzQRxfQDH/SJ0TshiakxExX08uxyrCsONtkMTpKf
 k+tX3KmvAVFwPYCz2Ril7yL1/qhcoiZmU/V67EwlwaheLR7zTE8rNTSnHYYRxP19
 6yv+Lc5VgQ/8hi5bdzyQTzXUXmpp2ybfU9qojcCrJNNcfFIsW8NWys6od/kxpHBV
 8W02UDDcvlgWR+P90dNnBdG2IU2Qjj/GnwFbDajiixfNdMQSXp0=
 =8enG
 -----END PGP SIGNATURE-----

Merge tag 'imx-drivers-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/drivers

i.MX drivers change for 6.14:

- Add a SoC driver for i.MX9 (Alice Guo)

* tag 'imx-drivers-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx: Add SoC device register for i.MX9

Link: https://lore.kernel.org/r/20250105095139.714590-1-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

drivers/soc/imx/Makefile

@@ -3,4 +3,4 @@ ifeq ($(CONFIG_ARM),y)
 obj-$(CONFIG_ARCH_MXC) += soc-imx.o
 endif
 obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o
-obj-$(CONFIG_SOC_IMX9) += imx93-src.o
+obj-$(CONFIG_SOC_IMX9) += imx93-src.o soc-imx9.o

drivers/soc/imx/soc-imx9.c

@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2024 NXP
+ */
+
+#include <linux/arm-smccc.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/sys_soc.h>
+
+#define IMX_SIP_GET_SOC_INFO	0xc2000006
+#define SOC_ID(x)		(((x) & 0xFFFF) >> 8)
+#define SOC_REV_MAJOR(x)	((((x) >> 28) & 0xF) - 0x9)
+#define SOC_REV_MINOR(x)	(((x) >> 24) & 0xF)
+
+static int imx9_soc_probe(struct platform_device *pdev)
+{
+	struct soc_device_attribute *attr;
+	struct arm_smccc_res res;
+	struct soc_device *sdev;
+	u32 soc_id, rev_major, rev_minor;
+	u64 uid127_64, uid63_0;
+	int err;
+
+	attr = kzalloc(sizeof(*attr), GFP_KERNEL);
+	if (!attr)
+		return -ENOMEM;
+
+	err = of_property_read_string(of_root, "model", &attr->machine);
+	if (err) {
+		pr_err("%s: missing model property: %d\n", __func__, err);
+		goto attr;
+	}
+
+	attr->family = kasprintf(GFP_KERNEL, "Freescale i.MX");
+
+	/*
+	 * Retrieve the soc id, rev & uid info:
+	 * res.a1[31:16]: soc revision;
+	 * res.a1[15:0]: soc id;
+	 * res.a2: uid[127:64];
+	 * res.a3: uid[63:0];
+	 */
+	arm_smccc_smc(IMX_SIP_GET_SOC_INFO, 0, 0, 0, 0, 0, 0, 0, &res);
+	if (res.a0 != SMCCC_RET_SUCCESS) {
+		pr_err("%s: SMC failed: 0x%lx\n", __func__, res.a0);
+		err = -EINVAL;
+		goto family;
+	}
+
+	soc_id = SOC_ID(res.a1);
+	rev_major = SOC_REV_MAJOR(res.a1);
+	rev_minor = SOC_REV_MINOR(res.a1);
+
+	attr->soc_id = kasprintf(GFP_KERNEL, "i.MX%2x", soc_id);
+	attr->revision = kasprintf(GFP_KERNEL, "%d.%d", rev_major, rev_minor);
+
+	uid127_64 = res.a2;
+	uid63_0 = res.a3;
+	attr->serial_number = kasprintf(GFP_KERNEL, "%016llx%016llx", uid127_64, uid63_0);
+
+	sdev = soc_device_register(attr);
+	if (IS_ERR(sdev)) {
+		err = PTR_ERR(sdev);
+		pr_err("%s failed to register SoC as a device: %d\n", __func__, err);
+		goto serial_number;
+	}
+
+	return 0;
+
+serial_number:
+	kfree(attr->serial_number);
+	kfree(attr->revision);
+	kfree(attr->soc_id);
+family:
+	kfree(attr->family);
+attr:
+	kfree(attr);
+	return err;
+}
+
+static __maybe_unused const struct of_device_id imx9_soc_match[] = {
+	{ .compatible = "fsl,imx93", },
+	{ .compatible = "fsl,imx95", },
+	{ }
+};
+
+#define IMX_SOC_DRIVER	"imx9-soc"
+
+static struct platform_driver imx9_soc_driver = {
+	.probe = imx9_soc_probe,
+	.driver = {
+		.name = IMX_SOC_DRIVER,
+	},
+};
+
+static int __init imx9_soc_init(void)
+{
+	int ret;
+	struct platform_device *pdev;
+
+	/* No match means it is not an i.MX 9 series SoC, do nothing. */
+	if (!of_match_node(imx9_soc_match, of_root))
+		return 0;
+
+	ret = platform_driver_register(&imx9_soc_driver);
+	if (ret) {
+		pr_err("failed to register imx9_soc platform driver: %d\n", ret);
+		return ret;
+	}
+
+	pdev = platform_device_register_simple(IMX_SOC_DRIVER, -1, NULL, 0);
+	if (IS_ERR(pdev)) {
+		pr_err("failed to register imx9_soc platform device: %ld\n", PTR_ERR(pdev));
+		platform_driver_unregister(&imx9_soc_driver);
+		return PTR_ERR(pdev);
+	}
+
+	return 0;
+}
+device_initcall(imx9_soc_init);
+
+MODULE_AUTHOR("NXP");
+MODULE_DESCRIPTION("NXP i.MX9 SoC");
+MODULE_LICENSE("GPL");