Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754119AbcDVNng (ORCPT ); Fri, 22 Apr 2016 09:43:36 -0400 Received: from mx0b-001ae601.pphosted.com ([67.231.152.168]:38913 "EHLO mx0b-001ae601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752972AbcDVNne (ORCPT ); Fri, 22 Apr 2016 09:43:34 -0400 Authentication-Results: ppops.net; spf=none smtp.mail=rf@opensource.wolfsonmicro.com From: Richard Fitzgerald To: CC: , , Subject: [PATCH] regulator: arizona-ldo1: Only enable status change if we have LDOENA Date: Fri, 22 Apr 2016 14:43:28 +0100 Message-ID: <1461332608-14760-1-git-send-email-rf@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1603290000 definitions=main-1604220180 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2452 Lines: 75 The driver was hardcoding REGULATOR_CHANGE_STATUS on the regulator which made the regulator core assume that it can be powered off. The power state of the regulator is controlled by the LDOENA pin so this patch changes to only setting the REGULATOR_CHANGE_STATUS flag if we have a valid gpio for LDOENA. Signed-off-by: Richard Fitzgerald --- drivers/regulator/arizona-ldo1.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index f7c88ff..edeb36b 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c @@ -161,16 +161,12 @@ static const struct regulator_init_data arizona_ldo1_dvfs = { .constraints = { .min_uV = 1200000, .max_uV = 1800000, - .valid_ops_mask = REGULATOR_CHANGE_STATUS | - REGULATOR_CHANGE_VOLTAGE, + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, }, .num_consumer_supplies = 1, }; static const struct regulator_init_data arizona_ldo1_default = { - .constraints = { - .valid_ops_mask = REGULATOR_CHANGE_STATUS, - }, .num_consumer_supplies = 1, }; @@ -178,8 +174,7 @@ static const struct regulator_init_data arizona_ldo1_wm5110 = { .constraints = { .min_uV = 1175000, .max_uV = 1200000, - .valid_ops_mask = REGULATOR_CHANGE_STATUS | - REGULATOR_CHANGE_VOLTAGE, + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, }, .num_consumer_supplies = 1, }; @@ -290,9 +285,9 @@ static int arizona_ldo1_probe(struct platform_device *pdev) config.ena_gpio = arizona->pdata.ldoena; if (arizona->pdata.ldo1) - config.init_data = arizona->pdata.ldo1; - else - config.init_data = &ldo1->init_data; + ldo1->init_data = *arizona->pdata.ldo1; + + config.init_data = &ldo1->init_data; /* * LDO1 can only be used to supply DCVDD so if it has no @@ -301,6 +296,15 @@ static int arizona_ldo1_probe(struct platform_device *pdev) if (config.init_data->num_consumer_supplies == 0) arizona->external_dcvdd = true; + if (!arizona->external_dcvdd && + (config.ena_gpio || config.ena_gpio_initialized) && + gpio_is_valid(config.ena_gpio)) + ldo1->init_data.constraints.valid_ops_mask |= + REGULATOR_CHANGE_STATUS; + else + dev_warn(arizona->dev, + "No LDOENA: regulator will be always-on\n"); + ldo1->regulator = devm_regulator_register(&pdev->dev, desc, &config); of_node_put(config.of_node); -- 1.9.1