diff options
author | Lee Jones <lee.jones@linaro.org> | 2012-05-30 00:47:26 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-03 08:25:06 -0400 |
commit | 7e715b954a78debf021c8ad33a2cb4f462c245e3 (patch) | |
tree | 5a2112a88e560ca635ea469486fe2384136de59e /drivers/regulator/ab8500.c | |
parent | abcfaf23c7d8494bd3b3266f7a78e9efe6206ca4 (diff) |
regulator: Change ab8500 match names to reflect Device Tree
The 'name' field in 'struct of_regulator_match' expects to match with
its corresponding regulator device node in the Device Tree. This patch
renames each of the regulators in the ab8500 regulator driver so this
is true.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/ab8500.c')
-rw-r--r-- | drivers/regulator/ab8500.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index f15807449011..290c289a653d 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c | |||
@@ -771,17 +771,17 @@ static __devinit int ab8500_regulator_register(struct platform_device *pdev, | |||
771 | } | 771 | } |
772 | 772 | ||
773 | static struct of_regulator_match ab8500_regulator_matches[] = { | 773 | static struct of_regulator_match ab8500_regulator_matches[] = { |
774 | { .name = "LDO-AUX1", .driver_data = (void *) AB8500_LDO_AUX1, }, | 774 | { .name = "ab8500_ldo_aux1", .driver_data = (void *) AB8500_LDO_AUX1, }, |
775 | { .name = "LDO-AUX2", .driver_data = (void *) AB8500_LDO_AUX2, }, | 775 | { .name = "ab8500_ldo_aux2", .driver_data = (void *) AB8500_LDO_AUX2, }, |
776 | { .name = "LDO-AUX3", .driver_data = (void *) AB8500_LDO_AUX3, }, | 776 | { .name = "ab8500_ldo_aux3", .driver_data = (void *) AB8500_LDO_AUX3, }, |
777 | { .name = "LDO-INTCORE", .driver_data = (void *) AB8500_LDO_INTCORE, }, | 777 | { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, }, |
778 | { .name = "LDO-TVOUT", .driver_data = (void *) AB8500_LDO_TVOUT, }, | 778 | { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, }, |
779 | { .name = "LDO-USB", .driver_data = (void *) AB8500_LDO_USB, }, | 779 | { .name = "ab8500_ldo_usb", .driver_data = (void *) AB8500_LDO_USB, }, |
780 | { .name = "LDO-AUDIO", .driver_data = (void *) AB8500_LDO_AUDIO, }, | 780 | { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, }, |
781 | { .name = "LDO-ANAMIC1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, | 781 | { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, |
782 | { .name = "LDO-ANAMIC2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, | 782 | { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, |
783 | { .name = "LDO-DMIC", .driver_data = (void *) AB8500_LDO_DMIC, }, | 783 | { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, }, |
784 | { .name = "LDO-ANA", .driver_data = (void *) AB8500_LDO_ANA, }, | 784 | { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, }, |
785 | }; | 785 | }; |
786 | 786 | ||
787 | static __devinit int | 787 | static __devinit int |