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

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

mfd: Register ab8500 devices using the newly DT:ed MFD API 



Now the MFD API is Device Tree aware we can use it for platform
registration again, even when booting with DT enabled. To aid in
Device Node pointer allocation we provide each cell with the
associative compatible string.

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

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

+0 −1
Original line number Diff line number Diff line
@@ -793,7 +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,ab8500-regulator", },

	{ .compatible = "simple-bus"},

	{ },

};

drivers/mfd/ab8500-core.c

+39 −25
Original line number Diff line number Diff line
@@ -970,54 +970,69 @@ static struct mfd_cell __devinitdata abx500_common_devs[] = { 
#ifdef CONFIG_DEBUG_FS

	{

		.name = "ab8500-debug",

		.of_compatible = "stericsson,ab8500-debug",

		.num_resources = ARRAY_SIZE(ab8500_debug_resources),

		.resources = ab8500_debug_resources,

	},

#endif

	{

		.name = "ab8500-sysctrl",

		.of_compatible = "stericsson,ab8500-sysctrl",

	},

	{

		.name = "ab8500-regulator",

		.of_compatible = "stericsson,ab8500-regulator",

	},

	{

		.name = "ab8500-gpadc",

		.of_compatible = "stericsson,ab8500-gpadc",

		.num_resources = ARRAY_SIZE(ab8500_gpadc_resources),

		.resources = ab8500_gpadc_resources,

	},

	{

		.name = "ab8500-rtc",

		.of_compatible = "stericsson,ab8500-rtc",

		.num_resources = ARRAY_SIZE(ab8500_rtc_resources),

		.resources = ab8500_rtc_resources,

	},

	{

		.name = "ab8500-acc-det",

		.of_compatible = "stericsson,ab8500-acc-det",

		.num_resources = ARRAY_SIZE(ab8500_av_acc_detect_resources),

		.resources = ab8500_av_acc_detect_resources,

	},

	{

		.name = "ab8500-poweron-key",

		.of_compatible = "stericsson,ab8500-poweron-key",

		.num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),

		.resources = ab8500_poweronkey_db_resources,

	},

	{

		.name = "ab8500-pwm",

		.of_compatible = "stericsson,ab8500-pwm",

		.id = 1,

	},

	{

		.name = "ab8500-pwm",

		.of_compatible = "stericsson,ab8500-pwm",

		.id = 2,

	},

	{

		.name = "ab8500-pwm",

		.of_compatible = "stericsson,ab8500-pwm",

		.id = 3,

	},

	{ .name = "ab8500-leds", },

	{

		.name = "ab8500-leds",

		.of_compatible = "stericsson,ab8500-leds",

	},

	{

		.name = "ab8500-denc",

		.of_compatible = "stericsson,ab8500-denc",

	},

	{

		.name = "ab8500-temp",

		.of_compatible = "stericsson,ab8500-temp",

		.num_resources = ARRAY_SIZE(ab8500_temp_resources),

		.resources = ab8500_temp_resources,

	},
@@ -1049,11 +1064,13 @@ static struct mfd_cell __devinitdata ab8500_bm_devs[] = { 
static struct mfd_cell __devinitdata ab8500_devs[] = {

	{

		.name = "ab8500-gpio",

		.of_compatible = "stericsson,ab8500-gpio",

		.num_resources = ARRAY_SIZE(ab8500_gpio_resources),

		.resources = ab8500_gpio_resources,

	},

	{

		.name = "ab8500-usb",

		.of_compatible = "stericsson,ab8500-usb",

		.num_resources = ARRAY_SIZE(ab8500_usb_resources),

		.resources = ab8500_usb_resources,

	},
@@ -1399,11 +1416,9 @@ static int __devinit ab8500_probe(struct platform_device *pdev) 
			goto out_freeoldmask;

	}



	if (!np) {

	ret = mfd_add_devices(ab8500->dev, 0, abx500_common_devs,

			ARRAY_SIZE(abx500_common_devs), NULL,

			ab8500->irq_base);



	if (ret)

		goto out_freeirq;
@@ -1424,7 +1439,6 @@ static int __devinit ab8500_probe(struct platform_device *pdev) 
				ab8500->irq_base);

	if (ret)

		goto out_freeirq;

	}



	if (!no_bm) {

		/* Add battery management devices */

drivers/mfd/ab8500-debugfs.c

+0 −6
Original line number Diff line number Diff line
@@ -608,16 +608,10 @@ static int __devexit ab8500_debug_remove(struct platform_device *plf) 
	return 0;

}



static const struct of_device_id ab8500_debug_match[] = {

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

        {}

};



static struct platform_driver ab8500_debug_driver = {

	.driver = {

		.name = "ab8500-debug",

		.owner = THIS_MODULE,

		.of_match_table = ab8500_debug_match,

	},

	.probe  = ab8500_debug_probe,

	.remove = __devexit_p(ab8500_debug_remove)

drivers/mfd/ab8500-gpadc.c

+0 −6
Original line number Diff line number Diff line
@@ -649,18 +649,12 @@ static int __devexit ab8500_gpadc_remove(struct platform_device *pdev) 
	return 0;

}



static const struct of_device_id ab8500_gpadc_match[] = {

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

	{}

};



static struct platform_driver ab8500_gpadc_driver = {

	.probe = ab8500_gpadc_probe,

	.remove = __devexit_p(ab8500_gpadc_remove),

	.driver = {

		.name = "ab8500-gpadc",

		.owner = THIS_MODULE,

		.of_match_table = ab8500_gpadc_match,

	},

};

drivers/mfd/ab8500-sysctrl.c

+0 −6
Original line number Diff line number Diff line
@@ -61,16 +61,10 @@ static int __devexit ab8500_sysctrl_remove(struct platform_device *pdev) 
	return 0;

}



static const struct of_device_id ab8500_sysctrl_match[] = {

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

	{}

};



static struct platform_driver ab8500_sysctrl_driver = {

	.driver = {

		.name = "ab8500-sysctrl",

		.owner = THIS_MODULE,

		.of_match_table = ab8500_sysctrl_match,

	},

	.probe = ab8500_sysctrl_probe,

	.remove = __devexit_p(ab8500_sysctrl_remove),