[PATCH 0/3] soc: imx: misc clean up and support i.MX9[4,52]

[PATCH 0/3] soc: imx: misc clean up and support i.MX9[4,52]

[Peng Fan (OSS)]

Patch 1, 2: Use device managed API and dev_err_probe to clean up driver
Patch 3: Support i.MX94/52

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
Peng Fan (3):
      soc: imx: Use device-managed APIs for i.MX9
      soc: imx: Use dev_err_probe() for i.MX9
      soc: imx: Spport i.MX9[4,52]

 drivers/soc/imx/soc-imx9.c | 46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)
---
base-commit: 563c8dd425b59e44470e28519107b1efc99f4c7b
change-id: 20251217-soc-imx9-fix-dfa285722307

Best regards,
-- 
Peng Fan <peng.fan@nxp.com>

[PATCH 1/3] soc: imx: Use device-managed APIs for i.MX9

[Peng Fan (OSS)]

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

Use device-managed APi to simplify code.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/soc/imx/soc-imx9.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/drivers/soc/imx/soc-imx9.c b/drivers/soc/imx/soc-imx9.c
index b46d22cf0212c3f40f61ec5be85ca11e5d3207ac..0b1c59c7ddb244549bfeedc47ae6e8d83c20b39b 100644
--- a/drivers/soc/imx/soc-imx9.c
+++ b/drivers/soc/imx/soc-imx9.c
@@ -18,6 +18,7 @@
 
 static int imx9_soc_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
 	struct soc_device_attribute *attr;
 	struct arm_smccc_res res;
 	struct soc_device *sdev;
@@ -25,17 +26,17 @@ static int imx9_soc_probe(struct platform_device *pdev)
 	u64 uid127_64, uid63_0;
 	int err;
 
-	attr = kzalloc(sizeof(*attr), GFP_KERNEL);
+	attr = devm_kzalloc(dev, 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;
+		return err;
 	}
 
-	attr->family = kasprintf(GFP_KERNEL, "Freescale i.MX");
+	attr->family = devm_kasprintf(dev, GFP_KERNEL, "Freescale i.MX");
 
 	/*
 	 * Retrieve the soc id, rev & uid info:
@@ -47,39 +48,28 @@ static int imx9_soc_probe(struct platform_device *pdev)
 	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;
+		return -EINVAL;
 	}
 
 	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);
+	attr->soc_id = devm_kasprintf(dev, GFP_KERNEL, "i.MX%2x", soc_id);
+	attr->revision = devm_kasprintf(dev, 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);
+	attr->serial_number = devm_kasprintf(dev, 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 err;
 	}
 
 	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[] = {

-- 
2.37.1

[PATCH 2/3] soc: imx: Use dev_err_probe() for i.MX9

[Peng Fan (OSS)]

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

Use dev_err_probe() to simplify code. No functional changes.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/soc/imx/soc-imx9.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/drivers/soc/imx/soc-imx9.c b/drivers/soc/imx/soc-imx9.c
index 0b1c59c7ddb244549bfeedc47ae6e8d83c20b39b..d9a686299c5f710bb9988c55ed601fc9d9f19229 100644
--- a/drivers/soc/imx/soc-imx9.c
+++ b/drivers/soc/imx/soc-imx9.c
@@ -31,10 +31,8 @@ static int imx9_soc_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	err = of_property_read_string(of_root, "model", &attr->machine);
-	if (err) {
-		pr_err("%s: missing model property: %d\n", __func__, err);
-		return err;
-	}
+	if (err)
+		return dev_err_probe(dev, err, "%s: missing model property\n", __func__);
 
 	attr->family = devm_kasprintf(dev, GFP_KERNEL, "Freescale i.MX");
 
@@ -46,10 +44,8 @@ static int imx9_soc_probe(struct platform_device *pdev)
 	 * 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);
-		return -EINVAL;
-	}
+	if (res.a0 != SMCCC_RET_SUCCESS)
+		return dev_err_probe(dev, -EINVAL, "%s: SMC failed: 0x%lx\n", __func__, res.a0);
 
 	soc_id = SOC_ID(res.a1);
 	rev_major = SOC_REV_MAJOR(res.a1);
@@ -63,11 +59,9 @@ static int imx9_soc_probe(struct platform_device *pdev)
 	attr->serial_number = devm_kasprintf(dev, 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);
-		return err;
-	}
+	if (IS_ERR(sdev))
+		return dev_err_probe(dev, PTR_ERR(sdev),
+				     "%s failed to register SoC as a device\n", __func__);
 
 	return 0;
 }

-- 
2.37.1

[PATCH 3/3] soc: imx: Spport i.MX9[4,52]

[Peng Fan (OSS)]

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

Add i.MX9[4,52] machine compatible to allow soc device could be created.

SOC_ID is 16bit format data:
 - i.MX943: 0x9430
 - i.MX952: 0x9520
Update SOC_ID macro to get the accurate data.

Co-developed-by: Jacky Bai <ping.bai@nxp.com>
Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/soc/imx/soc-imx9.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/imx/soc-imx9.c b/drivers/soc/imx/soc-imx9.c
index d9a686299c5f710bb9988c55ed601fc9d9f19229..d67bc7402b10e2966ff77cbf3b15c087540bd377 100644
--- a/drivers/soc/imx/soc-imx9.c
+++ b/drivers/soc/imx/soc-imx9.c
@@ -12,7 +12,7 @@
 #include <linux/sys_soc.h>
 
 #define IMX_SIP_GET_SOC_INFO	0xc2000006
-#define SOC_ID(x)		(((x) & 0xFFFF) >> 8)
+#define SOC_ID(x)		(((x) & 0xFF) ? ((x) & 0xFFFF) >> 4 : ((x) & 0xFFFF) >> 8)
 #define SOC_REV_MAJOR(x)	((((x) >> 28) & 0xF) - 0x9)
 #define SOC_REV_MINOR(x)	(((x) >> 24) & 0xF)
 
@@ -68,7 +68,9 @@ static int imx9_soc_probe(struct platform_device *pdev)
 
 static __maybe_unused const struct of_device_id imx9_soc_match[] = {
 	{ .compatible = "fsl,imx93", },
+	{ .compatible = "fsl,imx94", },
 	{ .compatible = "fsl,imx95", },
+	{ .compatible = "fsl,imx952", },
 	{ }
 };
 

-- 
2.37.1

Re: [PATCH 1/3] soc: imx: Use device-managed APIs for i.MX9

[Frank Li]

On Wed, Dec 17, 2025 at 08:42:07PM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> Use device-managed APi to simplify code.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---

Reviewed-by: Frank Li <Frank.Li@nxp.com>

>  drivers/soc/imx/soc-imx9.c | 28 +++++++++-------------------
>  1 file changed, 9 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/soc/imx/soc-imx9.c b/drivers/soc/imx/soc-imx9.c
> index b46d22cf0212c3f40f61ec5be85ca11e5d3207ac..0b1c59c7ddb244549bfeedc47ae6e8d83c20b39b 100644
> --- a/drivers/soc/imx/soc-imx9.c
> +++ b/drivers/soc/imx/soc-imx9.c
> @@ -18,6 +18,7 @@
>
>  static int imx9_soc_probe(struct platform_device *pdev)
>  {
> +	struct device *dev = &pdev->dev;
>  	struct soc_device_attribute *attr;
>  	struct arm_smccc_res res;
>  	struct soc_device *sdev;
> @@ -25,17 +26,17 @@ static int imx9_soc_probe(struct platform_device *pdev)
>  	u64 uid127_64, uid63_0;
>  	int err;
>
> -	attr = kzalloc(sizeof(*attr), GFP_KERNEL);
> +	attr = devm_kzalloc(dev, 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;
> +		return err;
>  	}
>
> -	attr->family = kasprintf(GFP_KERNEL, "Freescale i.MX");
> +	attr->family = devm_kasprintf(dev, GFP_KERNEL, "Freescale i.MX");
>
>  	/*
>  	 * Retrieve the soc id, rev & uid info:
> @@ -47,39 +48,28 @@ static int imx9_soc_probe(struct platform_device *pdev)
>  	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;
> +		return -EINVAL;
>  	}
>
>  	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);
> +	attr->soc_id = devm_kasprintf(dev, GFP_KERNEL, "i.MX%2x", soc_id);
> +	attr->revision = devm_kasprintf(dev, 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);
> +	attr->serial_number = devm_kasprintf(dev, 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 err;
>  	}
>
>  	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[] = {
>
> --
> 2.37.1
>

Re: [PATCH 2/3] soc: imx: Use dev_err_probe() for i.MX9

[Frank Li]

On Wed, Dec 17, 2025 at 08:42:08PM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> Use dev_err_probe() to simplify code. No functional changes.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---

Reviewed-by: Frank Li <Frank.Li@nxp.com>

>  drivers/soc/imx/soc-imx9.c | 20 +++++++-------------
>  1 file changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/soc/imx/soc-imx9.c b/drivers/soc/imx/soc-imx9.c
> index 0b1c59c7ddb244549bfeedc47ae6e8d83c20b39b..d9a686299c5f710bb9988c55ed601fc9d9f19229 100644
> --- a/drivers/soc/imx/soc-imx9.c
> +++ b/drivers/soc/imx/soc-imx9.c
> @@ -31,10 +31,8 @@ static int imx9_soc_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>
>  	err = of_property_read_string(of_root, "model", &attr->machine);
> -	if (err) {
> -		pr_err("%s: missing model property: %d\n", __func__, err);
> -		return err;
> -	}
> +	if (err)
> +		return dev_err_probe(dev, err, "%s: missing model property\n", __func__);
>
>  	attr->family = devm_kasprintf(dev, GFP_KERNEL, "Freescale i.MX");
>
> @@ -46,10 +44,8 @@ static int imx9_soc_probe(struct platform_device *pdev)
>  	 * 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);
> -		return -EINVAL;
> -	}
> +	if (res.a0 != SMCCC_RET_SUCCESS)
> +		return dev_err_probe(dev, -EINVAL, "%s: SMC failed: 0x%lx\n", __func__, res.a0);
>
>  	soc_id = SOC_ID(res.a1);
>  	rev_major = SOC_REV_MAJOR(res.a1);
> @@ -63,11 +59,9 @@ static int imx9_soc_probe(struct platform_device *pdev)
>  	attr->serial_number = devm_kasprintf(dev, 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);
> -		return err;
> -	}
> +	if (IS_ERR(sdev))
> +		return dev_err_probe(dev, PTR_ERR(sdev),
> +				     "%s failed to register SoC as a device\n", __func__);
>
>  	return 0;
>  }
>
> --
> 2.37.1
>

Re: [PATCH 3/3] soc: imx: Spport i.MX9[4,52]

[Frank Li]

On Wed, Dec 17, 2025 at 08:42:09PM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> Add i.MX9[4,52] machine compatible to allow soc device could be created.
>
> SOC_ID is 16bit format data:
>  - i.MX943: 0x9430
>  - i.MX952: 0x9520
> Update SOC_ID macro to get the accurate data.
>
> Co-developed-by: Jacky Bai <ping.bai@nxp.com>
> Signed-off-by: Jacky Bai <ping.bai@nxp.com>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  drivers/soc/imx/soc-imx9.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/imx/soc-imx9.c b/drivers/soc/imx/soc-imx9.c
> index d9a686299c5f710bb9988c55ed601fc9d9f19229..d67bc7402b10e2966ff77cbf3b15c087540bd377 100644
> --- a/drivers/soc/imx/soc-imx9.c
> +++ b/drivers/soc/imx/soc-imx9.c
> @@ -12,7 +12,7 @@
>  #include <linux/sys_soc.h>
>
>  #define IMX_SIP_GET_SOC_INFO	0xc2000006
> -#define SOC_ID(x)		(((x) & 0xFFFF) >> 8)
> +#define SOC_ID(x)		(((x) & 0xFF) ? ((x) & 0xFFFF) >> 4 : ((x) & 0xFFFF) >> 8)
>  #define SOC_REV_MAJOR(x)	((((x) >> 28) & 0xF) - 0x9)
>  #define SOC_REV_MINOR(x)	(((x) >> 24) & 0xF)
>
> @@ -68,7 +68,9 @@ static int imx9_soc_probe(struct platform_device *pdev)
>
>  static __maybe_unused const struct of_device_id imx9_soc_match[] = {
>  	{ .compatible = "fsl,imx93", },
> +	{ .compatible = "fsl,imx94", },
>  	{ .compatible = "fsl,imx95", },
> +	{ .compatible = "fsl,imx952", },

Does bind doc already applied?

Frank

>  	{ }
>  };
>
>
> --
> 2.37.1
>

Re: [PATCH 0/3] soc: imx: misc clean up and support i.MX9[4,52]

[Peng Fan]

Hi Shawn,

On Wed, Dec 17, 2025 at 08:42:06PM +0800, Peng Fan (OSS) wrote:
>Patch 1, 2: Use device managed API and dev_err_probe to clean up driver
>Patch 3: Support i.MX94/52

Since you have picked up the binding doc for i.MX952, the comment
in patch 3 from Frank is cleared, will you pick up this patchset?

Thanks,
Peng