From: broonie@opensource.wolfsonmicro.com (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/7] ARM: SMDK6410: Update regulator names for debugfs compatiblity
Date: Thu, 3 Mar 2011 14:58:35 +0000 [thread overview]
Message-ID: <1299164315-22246-7-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20110303145710.GA32234@opensource.wolfsonmicro.com>
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>
---
arch/arm/mach-s3c64xx/mach-smdk6410.c | 12 ++++++------
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 4094707..2f30c79 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -353,7 +353,7 @@ static struct regulator_init_data smdk6410_vddpll __initdata = {
/* VDD_UH_MMC, LDO5 on J5 */
static struct regulator_init_data smdk6410_vdduh_mmc __initdata = {
.constraints = {
- .name = "PVDD_UH/PVDD_MMC",
+ .name = "PVDD_UH+PVDD_MMC",
.always_on = 1,
},
};
@@ -419,7 +419,7 @@ static struct regulator_init_data smdk6410_vddaudio __initdata = {
/* S3C64xx internal logic & PLL */
static struct regulator_init_data wm8350_dcdc1_data __initdata = {
.constraints = {
- .name = "PVDD_INT/PVDD_PLL",
+ .name = "PVDD_INT+PVDD_PLL",
.min_uV = 1200000,
.max_uV = 1200000,
.always_on = 1,
@@ -454,7 +454,7 @@ static struct regulator_consumer_supply wm8350_dcdc4_consumers[] __initdata = {
static struct regulator_init_data wm8350_dcdc4_data __initdata = {
.constraints = {
- .name = "PVDD_HI/PVDD_EXT/PVDD_SYS/PVCCM2MTV",
+ .name = "PVDD_HI+PVDD_EXT+PVDD_SYS+PVCCM2MTV",
.min_uV = 3000000,
.max_uV = 3000000,
.always_on = 1,
@@ -466,7 +466,7 @@ static struct regulator_init_data wm8350_dcdc4_data __initdata = {
/* OTGi/1190-EV1 HPVDD & AVDD */
static struct regulator_init_data wm8350_ldo4_data __initdata = {
.constraints = {
- .name = "PVDD_OTGI/HPVDD/AVDD",
+ .name = "PVDD_OTGI+HPVDD+AVDD",
.min_uV = 1200000,
.max_uV = 1200000,
.apply_uV = 1,
@@ -557,7 +557,7 @@ static struct wm831x_backlight_pdata wm1192_backlight_pdata = {
static struct regulator_init_data wm1192_dcdc3 = {
.constraints = {
- .name = "PVDD_MEM/PVDD_GPS",
+ .name = "PVDD_MEM+PVDD_GPS",
.always_on = 1,
},
};
@@ -568,7 +568,7 @@ static struct regulator_consumer_supply wm1192_ldo1_consumers[] = {
static struct regulator_init_data wm1192_ldo1 = {
.constraints = {
- .name = "PVDD_LCD/PVDD_EXT",
+ .name = "PVDD_LCD+PVDD_EXT",
.always_on = 1,
},
.consumer_supplies = wm1192_ldo1_consumers,
--
1.7.2.3
next prev parent reply other threads:[~2011-03-03 14:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-03 14:57 [PATCH 0/7] Various Samsung updates Mark Brown
2011-03-03 14:58 ` [PATCH 1/7] ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices Mark Brown
2011-03-03 14:58 ` [PATCH 2/7] ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions Mark Brown
2011-03-03 14:58 ` [PATCH 3/7] ARM: S3C64XX: Add clock for i2c1 Mark Brown
2011-03-03 14:58 ` [PATCH 4/7] ARM: S3C64XX: Tone down SDHCI debugging Mark Brown
2011-03-03 14:58 ` [PATCH 5/7] ARM: S3C64XX: Reduce output of s3c64xx_dma_init1() Mark Brown
2011-03-03 14:58 ` [PATCH 6/7] ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled Mark Brown
2011-03-03 14:58 ` Mark Brown [this message]
2011-03-04 1:39 ` [PATCH 7/7] ARM: SMDK6410: Update regulator names for debugfs compatiblity Kukjin Kim
2011-03-04 11:33 ` Mark Brown
2011-03-03 14:59 ` [PATCH 0/7] Various Samsung updates Ben Dooks
2011-03-04 1:33 ` Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1299164315-22246-7-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).