diff options
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 5 | ||||
| -rw-r--r-- | drivers/regulator/ab8500-debug.c | 12 | ||||
| -rw-r--r-- | drivers/regulator/ab8500.c | 3 |
3 files changed, 5 insertions, 15 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 44533ee280e..7dc16903a6f 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -311,9 +311,10 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { */ INIT_REGULATOR_REGISTER(AB8500_VAUX12REGU, 0x01), /* - * Vaux3regu = force off + * Vrf1Regu = HW control + * Vaux3Regu = force off */ - INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x00), + INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x08), /* * Vsmps1 = 1.15V */ diff --git a/drivers/regulator/ab8500-debug.c b/drivers/regulator/ab8500-debug.c index 8ba059616c4..955aebd5392 100644 --- a/drivers/regulator/ab8500-debug.c +++ b/drivers/regulator/ab8500-debug.c @@ -1448,18 +1448,6 @@ struct ab8500_force_reg { static struct ab8500_force_reg ab8500_force_reg[] = { { /* - * VRF1Vaux3Regu - * OTP: 0x04, HSI: 0x08, suspend: 0x08/0x0f (value/mask) - * [3:2] VRF1Regu[1:0] = VRF1 in HW control - */ - .name = "VRF1Vaux3Regu", - .bank = 0x04, - .addr = 0x0a, - .mask = 0x0c, - .val = 0x08, - }, - { - /* * SysClkCtrl * OTP: 0x00, HSI: 0x06, suspend: 0x00/0x07 (value/mask) * [ 2] USBClkEna = disable SysClk path to USB block diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 192650a9a4c..4018c5dcc71 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -726,9 +726,10 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_VAUX12REGU, 0x04, 0x09, 0x0f), /* + * 0x0c, Vrf1Regu * 0x03, Vaux3Regu */ - REG_INIT(AB8500_VRF1VAUX3REGU, 0x04, 0x0a, 0x03), + REG_INIT(AB8500_VRF1VAUX3REGU, 0x04, 0x0a, 0x0f), /* * 0x3f, Vsmps1Sel1 */ |