diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-12 16:50:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-12 16:50:10 -0700 |
| commit | ff299f1b1cb4e0c44a3f76d1f8ee4eb2f64f098f (patch) | |
| tree | 9e4d85cfc0c5a8394bc1fcafd7c406c5ac558c70 /arch/arm/mach-ux500/board-mop500-regulators.c | |
| parent | 7d428ce284fce4aacb215ca15d0274e7261864a3 (diff) | |
| parent | ae7b6dccf6711e8d5815688f1572ab55bf5b3069 (diff) | |
Merge tag 's3c24xx-driver-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim, driver updats for s3c24xx:
- move cpufreq driver into drivers/
- add pinctrl-s3c24xx driver
- cleanup OF in gpio driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-regulators.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 33c353bc1c4..d6b7c8556fa 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -374,6 +374,7 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = { static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { /* supplies to the display/camera */ [AB8500_LDO_AUX1] = { + .supply_regulator = "ab8500-ext-supply3", .constraints = { .name = "V-DISPLAY", .min_uV = 2800000, @@ -387,6 +388,7 @@ static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { }, /* supplies to the on-board eMMC */ [AB8500_LDO_AUX2] = { + .supply_regulator = "ab8500-ext-supply3", .constraints = { .name = "V-eMMC1", .min_uV = 1100000, @@ -402,6 +404,7 @@ static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { }, /* supply for VAUX3, supplies to SDcard slots */ [AB8500_LDO_AUX3] = { + .supply_regulator = "ab8500-ext-supply3", .constraints = { .name = "V-MMC-SD", .min_uV = 1100000, |