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

Commit 6d11d135 authored by Lee Jones's avatar Lee Jones Committed by Samuel Ortiz
Browse files

mfd: Register the ab8500 from db8500-prcmu using the MFD API 



Hierarchically, the AB8500 is a child of the DB8500 PRCMU. So now that
Device Tree is being used and MFD core code is Device Tree aware, we
can simply register DB8500 PRCMU from Device Tree in the normal way
then allow the DB8500 PRCMU driver to register the AB8500 as a simple
MFD device at probe time.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 5d90322b

arch/arm/mach-ux500/board-mop500.c

+0 −2
Original line number Diff line number Diff line
@@ -793,8 +793,6 @@ static const struct of_device_id u8500_local_bus_nodes[] = { 
	/* only create devices below soc node */

	{ .compatible = "stericsson,db8500", },

	{ .compatible = "stericsson,db8500-prcmu", },

	{ .compatible = "stericsson,db8500-prcmu-regulator", },

	{ .compatible = "stericsson,ab8500", },

	{ .compatible = "stericsson,ab8500-regulator", },

	{ .compatible = "simple-bus"},

	{ },

drivers/mfd/ab8500-core.c

+0 −12
Original line number Diff line number Diff line
@@ -1230,14 +1230,6 @@ static struct attribute_group ab9540_attr_group = { 
	.attrs	= ab9540_sysfs_entries,

};



static const struct of_device_id ab8500_match[] = {

	{

		.compatible = "stericsson,ab8500",

		.data = (void *)AB8500_VERSION_AB8500,

	},

	{},

};



static int __devinit ab8500_probe(struct platform_device *pdev)

{

	struct ab8500_platform_data *plat = dev_get_platdata(&pdev->dev);
@@ -1279,9 +1271,6 @@ static int __devinit ab8500_probe(struct platform_device *pdev) 


	if (platid)

		version = platid->driver_data;

	else if (np)

		version = (unsigned int)

			of_match_device(ab8500_match, &pdev->dev)->data;



	if (version != AB8500_VERSION_UNDEFINED)

		ab8500->version = version;
@@ -1478,7 +1467,6 @@ static struct platform_driver ab8500_core_driver = { 
	.driver = {

		.name = "ab8500-core",

		.owner = THIS_MODULE,

		.of_match_table = ab8500_match,

	},

	.probe	= ab8500_probe,

	.remove	= __devexit_p(ab8500_remove),

drivers/mfd/db8500-prcmu.c

+15 −0
Original line number Diff line number Diff line
@@ -2945,6 +2945,14 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { 
	},

};



static struct resource ab8500_resources[] = {

	[0] = {

		.start	= IRQ_DB8500_AB8500,

		.end	= IRQ_DB8500_AB8500,

		.flags	= IORESOURCE_IRQ

	}

};



static struct mfd_cell db8500_prcmu_devs[] = {

	{

		.name = "db8500-prcmu-regulators",
@@ -2956,6 +2964,13 @@ static struct mfd_cell db8500_prcmu_devs[] = { 
		.name = "cpufreq-u8500",

		.of_compatible = "stericsson,cpufreq-u8500",

	},

	{

		.name = "ab8500-core",

		.of_compatible = "stericsson,ab8500",

		.num_resources = ARRAY_SIZE(ab8500_resources),

		.resources = ab8500_resources,

		.id = AB8500_VERSION_AB8500,

	},

};



/**