diff options
| author | Martin Persson <martin.persson@stericsson.com> | 2011-03-08 10:17:22 +0100 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-03-10 14:37:54 +0100 |
| commit | 1db314fdd13da4e45aa50e279df84d9dc83bcb5b (patch) | |
| tree | 57eda7e68abff7d0469760fc613f069a836bf4e6 /drivers/regulator | |
| parent | afd8ec70bd3ccc90cdf53af72cddfef3be1c5f2e (diff) | |
regulators: remove VBB from suspend hack
remove VBB from suspend hack and add correct init values
Change-Id: Iff1ef8c77077f07e60667aed68f348b89014db71
Signed-off-by: Martin Persson <martin.persson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17802
Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/ab8500-debug.c | 26 | ||||
| -rw-r--r-- | drivers/regulator/ab8500.c | 18 |
2 files changed, 18 insertions, 26 deletions
diff --git a/drivers/regulator/ab8500-debug.c b/drivers/regulator/ab8500-debug.c index 251b95f6a6a..97430928789 100644 --- a/drivers/regulator/ab8500-debug.c +++ b/drivers/regulator/ab8500-debug.c @@ -1648,32 +1648,6 @@ static struct ab8500_force_reg ab8500_force_reg[] = { }, { /* - * VBBSel1 - * OTP: 0x00, HSI: 0xdb, suspend: 0x00/0xff (value/mask) - * [7:4] VBBPSel1[3:0] = [VBBP = VBBPFB] - * [3:0] VBBNSel1[3:0] = [VBBN = 0 V] - */ - .name = "VBBSel1", - .bank = 0x04, - .addr = 0x11, - .mask = 0xff, - .val = 0x00, - }, - { - /* - * VBBSel2 - * OTP: 0x00, HSI: N/A, suspend: 0x28/0xff (value/mask) - * [7:4] VBBPSel2[3:0] = [VBBP = VBBPFB] - * [3:0] VBBNSel2[3:0] = [VBBN = 0 V] - */ - .name = "VBBSel2", - .bank = 0x04, - .addr = 0x12, - .mask = 0xff, - .val = 0x28, - }, - { - /* * TVoutCtrl * OTP: N/A, HSI: N/A, suspend: 0x00/0x03 (value/mask) * [ 2] PlugTvOn = plug/unplug detection disabled diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index ea05d5518e3..5da92826652 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -645,6 +645,24 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_REGUCTRL1VAMIC, 0x03, 0x84, 0x03), /* + * 0x0c, VBBNRegu + * 0x03, VBBPRegu + * NOTE! PRCMU register + */ + REG_INIT(AB8500_ARMREGU2, 0x04, 0x01, 0x0f), + /* + * 0x0c, VBBPSel1 + * 0x03, VBBNSel1 + * NOTE! PRCMU register + */ + REG_INIT(AB8500_VBBSEL1, 0x04, 0x11, 0x0f), + /* + * 0x0c, VBBNSel2 + * 0x03, VBBPSel2 + * NOTE! PRCMU register + */ + REG_INIT(AB8500_VBBSEL2, 0x04, 0x12, 0x0f), + /* * 0x0c, VanaRegu * 0x03, VpllRegu */ |