Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f7f3f1ad9ee13c962122e36752ef6908aff920a2

Authored by Lee Jones
Committed by Mark Brown
1 parent 9d88fc0b35
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 11 additions and 11 deletions Side-by-side Diff

drivers/regulator/ab8500.c
Diff comments   View file @ f7f3f1a
... ... @@ -794,17 +794,17 @@
794 794 }
795 795  
796 796 static struct of_regulator_match ab8500_regulator_matches[] = {
797   - { .name = "LDO-AUX1", .driver_data = (void *) AB8500_LDO_AUX1, },
798   - { .name = "LDO-AUX2", .driver_data = (void *) AB8500_LDO_AUX2, },
799   - { .name = "LDO-AUX3", .driver_data = (void *) AB8500_LDO_AUX3, },
800   - { .name = "LDO-INTCORE", .driver_data = (void *) AB8500_LDO_INTCORE, },
801   - { .name = "LDO-TVOUT", .driver_data = (void *) AB8500_LDO_TVOUT, },
802   - { .name = "LDO-USB", .driver_data = (void *) AB8500_LDO_USB, },
803   - { .name = "LDO-AUDIO", .driver_data = (void *) AB8500_LDO_AUDIO, },
804   - { .name = "LDO-ANAMIC1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
805   - { .name = "LDO-ANAMIC2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
806   - { .name = "LDO-DMIC", .driver_data = (void *) AB8500_LDO_DMIC, },
807   - { .name = "LDO-ANA", .driver_data = (void *) AB8500_LDO_ANA, },
  797 + { .name = "ab8500_ldo_aux1", .driver_data = (void *) AB8500_LDO_AUX1, },
  798 + { .name = "ab8500_ldo_aux2", .driver_data = (void *) AB8500_LDO_AUX2, },
  799 + { .name = "ab8500_ldo_aux3", .driver_data = (void *) AB8500_LDO_AUX3, },
  800 + { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, },
  801 + { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, },
  802 + { .name = "ab8500_ldo_usb", .driver_data = (void *) AB8500_LDO_USB, },
  803 + { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, },
  804 + { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
  805 + { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
  806 + { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, },
  807 + { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, },
808 808 };
809 809  
810 810 static __devinit int