lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regulators: Moved define for number of regulators in ab8500

Browse Source 
The define for number of regulators is moved from ab8500-core to
ab8500-regulator so that the regulator driver can be updated
independently of ab8500-core. This also changes the platform
configuration structure of ab8500-core so that it contains a
pointer to the regulator_init_data array plus number of
regulators instead of an fixed size array of pointers to
regulator_init_data.

Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Bengt Jonsson
2010-12-10 11:08:40 +01:00
committed by Liam Girdwood
parent 1394fd2826
commit cb189b07d5
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/regulator/ab8500.c
View File

@@ -370,6 +370,12 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
} }
pdata = dev_get_platdata(ab8500->dev); pdata = dev_get_platdata(ab8500->dev);
/* make sure the platform data has the correct size */
if (pdata->num_regulator != ARRAY_SIZE(ab8500_regulator_info)) {
dev_err(&pdev->dev, "platform configuration error\n");
return -EINVAL;
}
/* register all regulators */ /* register all regulators */
for (i = 0; i < ARRAY_SIZE(ab8500_regulator_info); i++) { for (i = 0; i < ARRAY_SIZE(ab8500_regulator_info); i++) {
struct ab8500_regulator_info *info = NULL; struct ab8500_regulator_info *info = NULL;
@@ -380,7 +386,7 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
info->ab8500 = ab8500; info->ab8500 = ab8500;
info->regulator = regulator_register(&info->desc, &pdev->dev, info->regulator = regulator_register(&info->desc, &pdev->dev,
pdata->regulator[i], info); &pdata->regulator[i], info);
if (IS_ERR(info->regulator)) { if (IS_ERR(info->regulator)) {
err = PTR_ERR(info->regulator); err = PTR_ERR(info->regulator);
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",

5
include/linux/mfd/ab8500.h
View File

@@ -99,8 +99,6 @@
#define AB8500_NR_IRQS 104 #define AB8500_NR_IRQS 104
#define AB8500_NUM_IRQ_REGS 13 #define AB8500_NUM_IRQ_REGS 13
#define AB8500_NUM_REGULATORS 15
/** /**
* struct ab8500 - ab8500 internal structure * struct ab8500 - ab8500 internal structure
* @dev: parent device * @dev: parent device
@@ -145,7 +143,8 @@ struct regulator_init_data;
struct ab8500_platform_data { struct ab8500_platform_data {
int irq_base; int irq_base;
void (*init) (struct ab8500 *); void (*init) (struct ab8500 *);
struct regulator_init_data *regulator[AB8500_NUM_REGULATORS]; int num_regulator;
struct regulator_init_data *regulator;
}; };
extern int __devinit ab8500_init(struct ab8500 *ab8500); extern int __devinit ab8500_init(struct ab8500 *ab8500);

24
include/linux/regulator/ab8500.h
View File

@@ -11,15 +11,17 @@
#define __LINUX_MFD_AB8500_REGULATOR_H #define __LINUX_MFD_AB8500_REGULATOR_H
/* AB8500 regulators */ /* AB8500 regulators */
#define AB8500_LDO_AUX1 0 enum ab8500_regulator_id {
#define AB8500_LDO_AUX2 1 AB8500_LDO_AUX1,
#define AB8500_LDO_AUX3 2 AB8500_LDO_AUX2,
#define AB8500_LDO_INTCORE 3 AB8500_LDO_AUX3,
#define AB8500_LDO_TVOUT 4 AB8500_LDO_INTCORE,
#define AB8500_LDO_AUDIO 5 AB8500_LDO_TVOUT,
#define AB8500_LDO_ANAMIC1 6 AB8500_LDO_AUDIO,
#define AB8500_LDO_ANAMIC2 7 AB8500_LDO_ANAMIC1,
#define AB8500_LDO_DMIC 8 AB8500_LDO_ANAMIC2,
#define AB8500_LDO_ANA 9 AB8500_LDO_DMIC,
AB8500_LDO_ANA,
AB8500_NUM_REGULATORS,
};
#endif #endif