diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 16:21:52 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 16:22:33 -0500 |
commit | 2eed4e7d8631d8404fdef9c09d26a48376186ad1 (patch) | |
tree | e3f85a5f6e0d643216b1d8994dc023fc4e0c0b2b /arch/arm/mach-tegra/board-harmony-power.c | |
parent | 721d6d1ecc281541a7d89989779e02af09f13c13 (diff) | |
parent | c5444f39620b2b7801eb1997c41befdc8bcf78ea (diff) |
Merge tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/boards
Tegra board updates. Most of the board updates for tegra30 and for some
of the driver device-tree conversions have gone in through the other
branches, so that leaves quite little left here -- mostly a couple
of updates to the not-yet-converted tegra2 boards and a couple of
device-tree updates.
* tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
ARM: tegra: match SoC name not board name in DT board files
ARM: tegra: PCIe: Provide 3.3V supply voltage
ARM: dt: tegra: add the wifi led to paz00 device tree
ARM: dt: tegra: add the power gpio key to paz00 device tree
ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-power.c')
-rw-r--r-- | arch/arm/mach-tegra/board-harmony-power.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-power.c b/arch/arm/mach-tegra/board-harmony-power.c index 21d1285731b3..c0298b3f7d63 100644 --- a/arch/arm/mach-tegra/board-harmony-power.c +++ b/arch/arm/mach-tegra/board-harmony-power.c | |||
@@ -36,13 +36,14 @@ static struct regulator_consumer_supply tps658621_ldo0_supply[] = { | |||
36 | 36 | ||
37 | static struct regulator_init_data ldo0_data = { | 37 | static struct regulator_init_data ldo0_data = { |
38 | .constraints = { | 38 | .constraints = { |
39 | .min_uV = 1250 * 1000, | 39 | .min_uV = 3300 * 1000, |
40 | .max_uV = 3300 * 1000, | 40 | .max_uV = 3300 * 1000, |
41 | .valid_modes_mask = (REGULATOR_MODE_NORMAL | | 41 | .valid_modes_mask = (REGULATOR_MODE_NORMAL | |
42 | REGULATOR_MODE_STANDBY), | 42 | REGULATOR_MODE_STANDBY), |
43 | .valid_ops_mask = (REGULATOR_CHANGE_MODE | | 43 | .valid_ops_mask = (REGULATOR_CHANGE_MODE | |
44 | REGULATOR_CHANGE_STATUS | | 44 | REGULATOR_CHANGE_STATUS | |
45 | REGULATOR_CHANGE_VOLTAGE), | 45 | REGULATOR_CHANGE_VOLTAGE), |
46 | .apply_uV = 1, | ||
46 | }, | 47 | }, |
47 | .num_consumer_supplies = ARRAY_SIZE(tps658621_ldo0_supply), | 48 | .num_consumer_supplies = ARRAY_SIZE(tps658621_ldo0_supply), |
48 | .consumer_supplies = tps658621_ldo0_supply, | 49 | .consumer_supplies = tps658621_ldo0_supply, |