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

Commit e4b63810 authored by Mark Rutland's avatar Mark Rutland Committed by Russell King
Browse files

ARM: 6977/1: pmu: add platform_device_id table support 



This patch adds support for platform_device_id tables, allowing new
PMU types to be registered with the correct type, without requiring
new platform_driver shims to provide the type. An single entry for
existing devices is provided.

Macros matching functionality of the of_device_id table macros are
provided for convenience.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarJamie Iles <jamie@jamieiles.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e73c34c3

arch/arm/kernel/pmu.c

+18 −2
Original line number Diff line number Diff line
@@ -61,9 +61,22 @@ static struct of_device_id armpmu_of_device_ids[] = { 
	{},

};



#define PLAT_MATCH_PMU(_name, _type) {	\

	.name		= _name,	\

	.driver_data	= _type,	\

}



#define PLAT_MATCH_CPU(_name)	PLAT_MATCH_PMU(_name, ARM_PMU_DEVICE_CPU)



static struct platform_device_id armpmu_plat_device_ids[] = {

	PLAT_MATCH_CPU("arm-pmu"),

	{},

};



enum arm_pmu_type armpmu_device_type(struct platform_device *pdev)

{

	const struct of_device_id	*of_id;

	const struct platform_device_id *pdev_id;



	/* provided by of_device_id table */

	if (pdev->dev.of_node) {
@@ -72,8 +85,10 @@ enum arm_pmu_type armpmu_device_type(struct platform_device *pdev) 
		return (enum arm_pmu_type)of_id->data;

	}



	/* Provided by a 'legacy' platform_device */

	return ARM_PMU_DEVICE_CPU;

	/* Provided by platform_device_id table */

	pdev_id = platform_get_device_id(pdev);

	BUG_ON(!pdev_id);

	return pdev_id->driver_data;

}



static int __devinit armpmu_device_probe(struct platform_device *pdev)
@@ -87,6 +102,7 @@ static struct platform_driver armpmu_driver = { 
		.of_match_table = armpmu_of_device_ids,

	},

	.probe		= armpmu_device_probe,

	.id_table	= armpmu_plat_device_ids,

};



static int __init register_pmu_driver(void)