Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d43aeff3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc-fsl-for-4.16' of... 

Merge tag 'soc-fsl-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/leo/linux into next/drivers

Pull "FSL/NXP SoC drivers updates for 4.16" from Li Yang:

This adds new SoC support and more error path handling to the guts
driver.

* tag 'soc-fsl-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/leo/linux:
  soc: fsl: guts: Add a NULL check for devm_kasprintf()
  soc: fsl: support GUTS driver for ls1012a/ls1046a
parents e2105ca8 14b055f4

drivers/soc/fsl/guts.c

+8 −0
Original line number Diff line number Diff line
@@ -167,10 +167,16 @@ static int fsl_guts_probe(struct platform_device *pdev) 
	} else {

		soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ");

	}

	if (!soc_dev_attr.family)

		return -ENOMEM;

	soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL,

					     "svr:0x%08x", svr);

	if (!soc_dev_attr.soc_id)

		return -ENOMEM;

	soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",

					       (svr >>  4) & 0xf, svr & 0xf);

	if (!soc_dev_attr.revision)

		return -ENOMEM;



	soc_dev = soc_device_register(&soc_dev_attr);

	if (IS_ERR(soc_dev))
@@ -214,6 +220,8 @@ static const struct of_device_id fsl_guts_of_match[] = { 
	{ .compatible = "fsl,ls1043a-dcfg", },

	{ .compatible = "fsl,ls2080a-dcfg", },

	{ .compatible = "fsl,ls1088a-dcfg", },

	{ .compatible = "fsl,ls1012a-dcfg", },

	{ .compatible = "fsl,ls1046a-dcfg", },

	{}

};

MODULE_DEVICE_TABLE(of, fsl_guts_of_match);