From 0869737a03c2da1e6f2f4386812368bb5d4a4a86 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 4 Feb 2013 11:53:17 +0000 Subject: [PATCH] regulator: ab8500: Initialize Vrf1 regulator Vrf1 regulator is put in HW control at initialization. Forcing this regulator to HW control in suspend is removed. Signed-off-by: Bengt Jonsson Signed-off-by: Lee Jones Reviewed-by: Martin PERSSON Signed-off-by: Mark Brown --- arch/arm/mach-ux500/board-mop500-regulators.c | 5 +++-- drivers/regulator/ab8500.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 0cc9edc690ff..ba379f78c58a 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -275,9 +275,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.c b/drivers/regulator/ab8500.c index ac07fc84f99e..b36941171ea3 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -619,9 +619,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 */ -- 2.39.5