From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752330AbbCXObi (ORCPT ); Tue, 24 Mar 2015 10:31:38 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:48407 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751917AbbCXObh (ORCPT ); Tue, 24 Mar 2015 10:31:37 -0400 From: Charles Keepax To: broonie@kernel.org Cc: lgirdwood@gmail.com, linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: [PATCH] regulator: arizona-ldo1: Add ramp time for HI_PWR Date: Tue, 24 Mar 2015 14:27:56 +0000 Message-Id: <1427207276-28038-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.2.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Richard Fitzgerald For regulators that support HI_PWR we need to ensure that switching to 1.8v allows time for the regulator to reach that voltage. Signed-off-by: Richard Fitzgerald Signed-off-by: Charles Keepax --- drivers/regulator/arizona-ldo1.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index a1d07d3..9474597 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c @@ -113,6 +113,17 @@ static int arizona_ldo1_hc_get_voltage_sel(struct regulator_dev *rdev) return (val & ARIZONA_LDO1_VSEL_MASK) >> ARIZONA_LDO1_VSEL_SHIFT; } +static int arizona_ldo1_hc_set_voltage_time_sel(struct regulator_dev *rdev, + unsigned int old_selector, + unsigned int new_selector) +{ + /* if moving to 1.8v allow time for it to reach voltage */ + if (new_selector == rdev->desc->n_voltages - 1) + return 25; + else + return 0; +} + static struct regulator_ops arizona_ldo1_hc_ops = { .list_voltage = arizona_ldo1_hc_list_voltage, .map_voltage = arizona_ldo1_hc_map_voltage, @@ -120,6 +131,7 @@ static struct regulator_ops arizona_ldo1_hc_ops = { .set_voltage_sel = arizona_ldo1_hc_set_voltage_sel, .get_bypass = regulator_get_bypass_regmap, .set_bypass = regulator_set_bypass_regmap, + .set_voltage_time_sel = arizona_ldo1_hc_set_voltage_time_sel, }; static const struct regulator_desc arizona_ldo1_hc = { -- 1.7.2.5