Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18b52ca5 authored by Mark Brown's avatar Mark Brown Committed by Kukjin Kim
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 628e7eb5

arch/arm/mach-s3c64xx/mach-smdk6410.c

+6 −6
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static struct regulator_init_data smdk6410_vddpll = { 
/* VDD_UH_MMC, LDO5 on J5 */

static struct regulator_init_data smdk6410_vdduh_mmc = {

	.constraints = {

		.name = "PVDD_UH/PVDD_MMC",

		.name = "PVDD_UH+PVDD_MMC",

		.always_on = 1,

	},

};
@@ -418,7 +418,7 @@ static struct regulator_init_data smdk6410_vddaudio = { 
/* S3C64xx internal logic & PLL */

static struct regulator_init_data wm8350_dcdc1_data = {

	.constraints = {

		.name = "PVDD_INT/PVDD_PLL",

		.name = "PVDD_INT+PVDD_PLL",

		.min_uV = 1200000,

		.max_uV = 1200000,

		.always_on = 1,
@@ -453,7 +453,7 @@ static struct regulator_consumer_supply wm8350_dcdc4_consumers[] = { 


static struct regulator_init_data wm8350_dcdc4_data = {

	.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,
@@ -465,7 +465,7 @@ static struct regulator_init_data wm8350_dcdc4_data = { 
/* OTGi/1190-EV1 HPVDD & AVDD */

static struct regulator_init_data wm8350_ldo4_data = {

	.constraints = {

		.name = "PVDD_OTGI/HPVDD/AVDD",

		.name = "PVDD_OTGI+HPVDD+AVDD",

		.min_uV = 1200000,

		.max_uV = 1200000,

		.apply_uV = 1,
@@ -553,7 +553,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,

	},

};
@@ -564,7 +564,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,