diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 990366726c58..5e559dda3cc3 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -358,14 +358,17 @@ static struct omap2_hsmmc_info mmc[] __initdata = { | |||
358 | {} /* Terminator */ | 358 | {} /* Terminator */ |
359 | }; | 359 | }; |
360 | 360 | ||
361 | static struct regulator_consumer_supply rx51_vmmc1_supply = | 361 | static struct regulator_consumer_supply rx51_vmmc1_supply[] = { |
362 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); | 362 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), |
363 | }; | ||
363 | 364 | ||
364 | static struct regulator_consumer_supply rx51_vaux3_supply = | 365 | static struct regulator_consumer_supply rx51_vaux3_supply[] = { |
365 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); | 366 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"), |
367 | }; | ||
366 | 368 | ||
367 | static struct regulator_consumer_supply rx51_vsim_supply = | 369 | static struct regulator_consumer_supply rx51_vsim_supply[] = { |
368 | REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1"); | 370 | REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1"), |
371 | }; | ||
369 | 372 | ||
370 | static struct regulator_consumer_supply rx51_vmmc2_supplies[] = { | 373 | static struct regulator_consumer_supply rx51_vmmc2_supplies[] = { |
371 | /* tlv320aic3x analog supplies */ | 374 | /* tlv320aic3x analog supplies */ |
@@ -452,8 +455,8 @@ static struct regulator_init_data rx51_vaux3_mmc = { | |||
452 | | REGULATOR_CHANGE_MODE | 455 | | REGULATOR_CHANGE_MODE |
453 | | REGULATOR_CHANGE_STATUS, | 456 | | REGULATOR_CHANGE_STATUS, |
454 | }, | 457 | }, |
455 | .num_consumer_supplies = 1, | 458 | .num_consumer_supplies = ARRAY_SIZE(rx51_vaux3_supply), |
456 | .consumer_supplies = &rx51_vaux3_supply, | 459 | .consumer_supplies = rx51_vaux3_supply, |
457 | }; | 460 | }; |
458 | 461 | ||
459 | static struct regulator_init_data rx51_vaux4 = { | 462 | static struct regulator_init_data rx51_vaux4 = { |
@@ -479,8 +482,8 @@ static struct regulator_init_data rx51_vmmc1 = { | |||
479 | | REGULATOR_CHANGE_MODE | 482 | | REGULATOR_CHANGE_MODE |
480 | | REGULATOR_CHANGE_STATUS, | 483 | | REGULATOR_CHANGE_STATUS, |
481 | }, | 484 | }, |
482 | .num_consumer_supplies = 1, | 485 | .num_consumer_supplies = ARRAY_SIZE(rx51_vmmc1_supply), |
483 | .consumer_supplies = &rx51_vmmc1_supply, | 486 | .consumer_supplies = rx51_vmmc1_supply, |
484 | }; | 487 | }; |
485 | 488 | ||
486 | static struct regulator_init_data rx51_vmmc2 = { | 489 | static struct regulator_init_data rx51_vmmc2 = { |
@@ -511,8 +514,8 @@ static struct regulator_init_data rx51_vsim = { | |||
511 | .valid_ops_mask = REGULATOR_CHANGE_MODE | 514 | .valid_ops_mask = REGULATOR_CHANGE_MODE |
512 | | REGULATOR_CHANGE_STATUS, | 515 | | REGULATOR_CHANGE_STATUS, |
513 | }, | 516 | }, |
514 | .num_consumer_supplies = 1, | 517 | .num_consumer_supplies = ARRAY_SIZE(rx51_vsim_supply), |
515 | .consumer_supplies = &rx51_vsim_supply, | 518 | .consumer_supplies = rx51_vsim_supply, |
516 | }; | 519 | }; |
517 | 520 | ||
518 | static struct regulator_init_data rx51_vdac = { | 521 | static struct regulator_init_data rx51_vdac = { |
@@ -526,7 +529,7 @@ static struct regulator_init_data rx51_vdac = { | |||
526 | .valid_ops_mask = REGULATOR_CHANGE_MODE | 529 | .valid_ops_mask = REGULATOR_CHANGE_MODE |
527 | | REGULATOR_CHANGE_STATUS, | 530 | | REGULATOR_CHANGE_STATUS, |
528 | }, | 531 | }, |
529 | .num_consumer_supplies = 1, | 532 | .num_consumer_supplies = ARRAY_SIZE(rx51_vdac_supply), |
530 | .consumer_supplies = rx51_vdac_supply, | 533 | .consumer_supplies = rx51_vdac_supply, |
531 | }; | 534 | }; |
532 | 535 | ||