Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365051
b: refs/heads/master
c: 422d765
h: refs/heads/master
i:
  365049: 45c967c
  365047: 7fd37c7
v: v3
  • Loading branch information
Lee Jones authored and Mark Brown committed Mar 29, 2013
1 parent 96f8509 commit 5cb2ade
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1d494806698ae37c14b0c7fe9e6165e3b0c146c
refs/heads/master: 422d765d2cb9a22ded86d8b63a1701e296436b81
17 changes: 17 additions & 0 deletions trunk/arch/arm/mach-ux500/board-mop500-regulators.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <linux/kernel.h>
#include <linux/regulator/machine.h>
#include <linux/regulator/ab8500.h>
#include <mach/id.h> /* to identify older boards for fixes */
#include "board-mop500-regulators.h"

static struct regulator_consumer_supply gpio_en_3v3_consumers[] = {
Expand Down Expand Up @@ -494,3 +495,19 @@ static void ab8500_modify_reg_init(int id, u8 mask, u8 value)

BUG_ON(1);
}

void mop500_regulator_init(void)
{
struct regulator_init_data *regulator;

/*
* Handle VextSupply1 on older boards than HREFP_V22_V1x
* (turn off in suspend)
*/
if (cpu_is_u8500v20() || cpu_is_u8500v21()) {
/* disable VextSupply1 in suspend */
regulator = &ab8500_ext_regulators[AB8500_EXT_SUPPLY1];
regulator->constraints.state_mem.disabled = 1;
regulator->constraints.state_standby.disabled = 1;
}
}
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-ux500/board-mop500-regulators.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data;
extern struct regulator_init_data tps61052_regulator;
extern struct regulator_init_data gpio_en_3v3_regulator;

void mop500_regulator_init(void);

#endif

0 comments on commit 5cb2ade

Please sign in to comment.