aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-03 18:24:15 -0500
committerKukjin Kim <kgene.kim@samsung.com>2011-03-04 01:46:27 -0500
commit18b52ca5d0ea7f7d1933ebe8d277a1b499c940f2 (patch)
tree8f03a8d1fd5cad687a36926dbd863cad8f9beb88 /arch
parent628e7eb5a74b4ea78db97609a8dcbdf41b4b0b90 (diff)
ARM: S3C64XX: Update regulator names for debugfs compatiblity on SMDK6410
The debugfs support added to the regulator API (which has been merged in during this merge window) creates directories for regulators named after the display names for the regulators so replace / as a separator for multiple supplies with + in the SMDK6410 machine. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c64xx/mach-smdk6410.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index a74f2c9f9f3..a80a3163dd3 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -352,7 +352,7 @@ static struct regulator_init_data smdk6410_vddpll = {
352/* VDD_UH_MMC, LDO5 on J5 */ 352/* VDD_UH_MMC, LDO5 on J5 */
353static struct regulator_init_data smdk6410_vdduh_mmc = { 353static struct regulator_init_data smdk6410_vdduh_mmc = {
354 .constraints = { 354 .constraints = {
355 .name = "PVDD_UH/PVDD_MMC", 355 .name = "PVDD_UH+PVDD_MMC",
356 .always_on = 1, 356 .always_on = 1,
357 }, 357 },
358}; 358};
@@ -418,7 +418,7 @@ static struct regulator_init_data smdk6410_vddaudio = {
418/* S3C64xx internal logic & PLL */ 418/* S3C64xx internal logic & PLL */
419static struct regulator_init_data wm8350_dcdc1_data = { 419static struct regulator_init_data wm8350_dcdc1_data = {
420 .constraints = { 420 .constraints = {
421 .name = "PVDD_INT/PVDD_PLL", 421 .name = "PVDD_INT+PVDD_PLL",
422 .min_uV = 1200000, 422 .min_uV = 1200000,
423 .max_uV = 1200000, 423 .max_uV = 1200000,
424 .always_on = 1, 424 .always_on = 1,
@@ -453,7 +453,7 @@ static struct regulator_consumer_supply wm8350_dcdc4_consumers[] = {
453 453
454static struct regulator_init_data wm8350_dcdc4_data = { 454static struct regulator_init_data wm8350_dcdc4_data = {
455 .constraints = { 455 .constraints = {
456 .name = "PVDD_HI/PVDD_EXT/PVDD_SYS/PVCCM2MTV", 456 .name = "PVDD_HI+PVDD_EXT+PVDD_SYS+PVCCM2MTV",
457 .min_uV = 3000000, 457 .min_uV = 3000000,
458 .max_uV = 3000000, 458 .max_uV = 3000000,
459 .always_on = 1, 459 .always_on = 1,
@@ -465,7 +465,7 @@ static struct regulator_init_data wm8350_dcdc4_data = {
465/* OTGi/1190-EV1 HPVDD & AVDD */ 465/* OTGi/1190-EV1 HPVDD & AVDD */
466static struct regulator_init_data wm8350_ldo4_data = { 466static struct regulator_init_data wm8350_ldo4_data = {
467 .constraints = { 467 .constraints = {
468 .name = "PVDD_OTGI/HPVDD/AVDD", 468 .name = "PVDD_OTGI+HPVDD+AVDD",
469 .min_uV = 1200000, 469 .min_uV = 1200000,
470 .max_uV = 1200000, 470 .max_uV = 1200000,
471 .apply_uV = 1, 471 .apply_uV = 1,
@@ -553,7 +553,7 @@ static struct wm831x_backlight_pdata wm1192_backlight_pdata = {
553 553
554static struct regulator_init_data wm1192_dcdc3 = { 554static struct regulator_init_data wm1192_dcdc3 = {
555 .constraints = { 555 .constraints = {
556 .name = "PVDD_MEM/PVDD_GPS", 556 .name = "PVDD_MEM+PVDD_GPS",
557 .always_on = 1, 557 .always_on = 1,
558 }, 558 },
559}; 559};
@@ -564,7 +564,7 @@ static struct regulator_consumer_supply wm1192_ldo1_consumers[] = {
564 564
565static struct regulator_init_data wm1192_ldo1 = { 565static struct regulator_init_data wm1192_ldo1 = {
566 .constraints = { 566 .constraints = {
567 .name = "PVDD_LCD/PVDD_EXT", 567 .name = "PVDD_LCD+PVDD_EXT",
568 .always_on = 1, 568 .always_on = 1,
569 }, 569 },
570 .consumer_supplies = wm1192_ldo1_consumers, 570 .consumer_supplies = wm1192_ldo1_consumers,