aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/hx4700.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-05-08 04:25:10 -0400
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-05-13 21:30:04 -0400
commit0bf189abc52b89bfcfa9782543de7f5e90263fe5 (patch)
treea64266cb44abab200f27c529b78ff618bfa3daa9 /arch/arm/mach-pxa/hx4700.c
parent36be50515fe2aef61533b516fa2576a2c7fe7664 (diff)
ARM: pxa: Use REGULATOR_SUPPLY macro
Signed-off-by: Axel Lin <axel.lin@gmail.com> Cc: Eric Miao <eric.y.miao@gmail.com> Tested-by: Paul Parsons <lost.distance@yahoo.com> Acked-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/hx4700.c')
-rw-r--r--arch/arm/mach-pxa/hx4700.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index b83b95a29503..88f0f51ad6d5 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -680,12 +680,8 @@ static struct platform_device power_supply = {
680 */ 680 */
681 681
682static struct regulator_consumer_supply bq24022_consumers[] = { 682static struct regulator_consumer_supply bq24022_consumers[] = {
683 { 683 REGULATOR_SUPPLY("vbus_draw", NULL),
684 .supply = "vbus_draw", 684 REGULATOR_SUPPLY("ac_draw", NULL),
685 },
686 {
687 .supply = "ac_draw",
688 },
689}; 685};
690 686
691static struct regulator_init_data bq24022_init_data = { 687static struct regulator_init_data bq24022_init_data = {
@@ -764,9 +760,8 @@ static struct platform_device strataflash = {
764 * Maxim MAX1587A on PI2C 760 * Maxim MAX1587A on PI2C
765 */ 761 */
766 762
767static struct regulator_consumer_supply max1587a_consumer = { 763static struct regulator_consumer_supply max1587a_consumer =
768 .supply = "vcc_core", 764 REGULATOR_SUPPLY("vcc_core", NULL);
769};
770 765
771static struct regulator_init_data max1587a_v3_info = { 766static struct regulator_init_data max1587a_v3_info = {
772 .constraints = { 767 .constraints = {