summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 12:43:30 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 12:43:30 +0900
commitf1e0d5f1384f95b03f7b12092792db761af20ee7 (patch)
treee69847313b0030d2f10a168fff532e4679664e7b /drivers/regulator
parent21e55ca4060e5a3891ab72cbbc5d6c85e3036049 (diff)
parenta9a5659ac61b9e21d17993a6c0fbbeb83e182526 (diff)
downloadlinux-stable-f1e0d5f1384f95b03f7b12092792db761af20ee7.tar.gz
linux-stable-f1e0d5f1384f95b03f7b12092792db761af20ee7.tar.bz2
linux-stable-f1e0d5f1384f95b03f7b12092792db761af20ee7.zip
Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps65910-regulator.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 6b77bbf32ebc..59c3770fa77d 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -38,6 +38,11 @@ static const unsigned int VIO_VSEL_table[] = {
/* VSEL tables for TPS65910 specific LDOs and dcdc's */
+/* supported VRTC voltages in microvolts */
+static const unsigned int VRTC_VSEL_table[] = {
+ 1800000,
+};
+
/* supported VDD3 voltages in microvolts */
static const unsigned int VDD3_VSEL_table[] = {
5000000,
@@ -95,6 +100,8 @@ static struct tps_info tps65910_regs[] = {
{
.name = "vrtc",
.vin_name = "vcc7",
+ .n_voltages = ARRAY_SIZE(VRTC_VSEL_table),
+ .voltage_table = VRTC_VSEL_table,
.enable_time_us = 2200,
},
{