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

Commit 0281bafa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ccn/fixes-for-4.13-v2' of... 

Merge tag 'ccn/fixes-for-4.13-v2' of git://git.linaro.org/people/pawel.moll/linux into next/fixes-non-critical

Pull "bus: ARM CCN PMU driver updates" from Paweł Moll:

* Fixed missing module aliases, thus autoloading.
* Use appropriate (c)allocation function for arrays of structures.
* Add compatibility string (thus support) for CCN-502 variant.

* tag 'ccn/fixes-for-4.13-v2' of git://git.linaro.org/people/pawel.moll/linux:
  bus: arm-ccn: Enable stats for CCN-502 interconnect
  dt-bindings: arm-ccn: Add bindings info for CCN-502 compatible string
  bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe()
  bus: arm-ccn: Fix module autoload
parents e4fc0e50 2941be21

Documentation/devicetree/bindings/arm/ccn.txt

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
Required properties:



- compatible: (standard compatible string) should be one of:

	"arm,ccn-502"

	"arm,ccn-504"

	"arm,ccn-508"

drivers/bus/arm-ccn.c

+6 −4
Original line number Diff line number Diff line
@@ -1520,9 +1520,9 @@ static int arm_ccn_probe(struct platform_device *pdev) 
	if (err)

		return err;



	ccn->node = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_nodes,

	ccn->node = devm_kcalloc(ccn->dev, ccn->num_nodes, sizeof(*ccn->node),

				 GFP_KERNEL);

	ccn->xp = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_xps,

	ccn->xp = devm_kcalloc(ccn->dev, ccn->num_xps, sizeof(*ccn->node),

			       GFP_KERNEL);

	if (!ccn->node || !ccn->xp)

		return -ENOMEM;
@@ -1544,9 +1544,11 @@ static int arm_ccn_remove(struct platform_device *pdev) 
}



static const struct of_device_id arm_ccn_match[] = {

	{ .compatible = "arm,ccn-502", },

	{ .compatible = "arm,ccn-504", },

	{},

};

MODULE_DEVICE_TABLE(of, arm_ccn_match);



static struct platform_driver arm_ccn_driver = {

	.driver = {