From patchwork Fri Jan 12 10:18:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 124269 Delivered-To: patch@linaro.org Received: by 10.80.140.226 with SMTP id r31csp1694718edr; Fri, 12 Jan 2018 02:19:48 -0800 (PST) X-Google-Smtp-Source: ACJfBosFBLAJu9FN3w4Yj1APnmO95pJEfvAJbk7mcHQ2hp6zcJ7ufhJeOYpHj0bYNfRLVaXnw+hW X-Received: by 10.84.246.12 with SMTP id k12mr4952044pll.438.1515752387883; Fri, 12 Jan 2018 02:19:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515752387; cv=none; d=google.com; s=arc-20160816; b=JmHeKtjkl9pyemkLl6AE3hcxbByLDTsxFDhy1cWaF7KqdvqqEyb2w9TMItvOoQ7igH OqhVULzoq2GgqMbjTyyos381UNw0BKgspFMg1l8UN/p+F/5q71SbJZN9o1v/LWV7KAvQ mtq+EYfphAygkvq/gLYui48V59LLlgxbxn8s5+mAzc2IeQiXTAssf65acx62V1OMSGWh SJmcTUAwf5CT7WAOsec3wWSPVFd/2OB+3Nra3QEdp072V5wwdoAWuXyb/qppnzu/g31l ZWKSf5aMoVrSJIonofVv/oks5bVOoRTOuakPRzbBfhgQDpq92gAHohmYQZ/A76aMKE5u PQzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=EcLpvBMIMakiKa8EPdDMFEkOKTKDf++0HWt3W/KiWU4=; b=Q6PHdcvuB1ZVTQ9cH+cV/22PDsHCD2I3u60LPTLVv5iSDtAsCgGfkMhfIGgXtMhO01 +0O6VY2ONiNI45KNDp48ax6mrMYMAk8bi7gGpEMVMKgXUs2A8W+Hjb/3+mgc95Vw/4Yb WVHxUOjtqYHet79NvEgKQ+8h83sA8N5hQ8UAhhcIxUUFWNHYfUnL+ikkZrQ59FIDjMj8 q76HPR4qDEq6wQqlzjzLB6LyDQYd3HVklNheD9clF+uZKkiosrVhR7J2k85QwZqUgXHa 2DMek73uPMYrO1PMzP1X001gIR9w2fi30C9xmDxjuak0xgEpzbtYYXqY1FSABsAYyBFK 8l4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KLmEU2VB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l6si13445687pgr.804.2018.01.12.02.19.47; Fri, 12 Jan 2018 02:19:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KLmEU2VB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933429AbeALKTp (ORCPT + 28 others); Fri, 12 Jan 2018 05:19:45 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:44008 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754833AbeALKTC (ORCPT ); Fri, 12 Jan 2018 05:19:02 -0500 Received: by mail-pf0-f195.google.com with SMTP id e3so4084840pfi.10 for ; Fri, 12 Jan 2018 02:19:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EcLpvBMIMakiKa8EPdDMFEkOKTKDf++0HWt3W/KiWU4=; b=KLmEU2VBqUhD9+TwhU9dji27xdf//pgTjaUFkKlgHxv4vJqFkc64GvmbbKbZbuzWgH G4P/s3KD2+v3Oscf8PnpXx06j0vD7pdx8Y+1Y9ZS8yjlv/CZIGfhMrpvkqF4nRtvLFnr NYu5hUPVH45A+uYbhV1nOR0zEfSlX75Gl1GsA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EcLpvBMIMakiKa8EPdDMFEkOKTKDf++0HWt3W/KiWU4=; b=OUX5gO4Og0TsvT3UT2q7mdLY+fhkqeMzxKGC0D8yfGG/JoNpisNnBJlGNUE9immv/+ +fLQHxaDk7eLJvq4kRa50ZZYJuC0Kznt6m4+CcdbM8oRhE1FSs4NXkB5u4URbFuu8WUZ M2Ux7QrVHPIDY9wR11N1YSEbjQLYZFuPdUHEwV5ESdKwECg/29RKbRd5rONmRx2dWvBz Oc49Z8if0L8mU9xZ+VJMkC1CImQngYMVp24fhlcYvY4eajY+BTMgi+LC8vfCljp6CnnQ Xf5xJZL8XFKi9liX0bOgr6KXU826ZsLr8klefTBNHD3UTIQq25IeLdEwNwqOQKw4fnfi dG4A== X-Gm-Message-State: AKGB3mK9hmjLk/RuEsPeo578S8BYueJ9Bs2gC6izxjFeEC9swa5saupz 4/DhLB4yUpVGv24b2F0j5U9jGA== X-Received: by 10.159.204.131 with SMTP id t3mr25942874plo.381.1515752341773; Fri, 12 Jan 2018 02:19:01 -0800 (PST) Received: from ubt.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id m22sm44692613pfg.120.2018.01.12.02.18.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jan 2018 02:19:00 -0800 (PST) From: Chunyan Zhang To: Mark Brown , Rob Herring Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Ulf Hansson , Arnd Bergmann , Chunyan Zhang Subject: [PATCH v3 3/5] drivers: regulator: leave one item to record whether regulator is enabled Date: Fri, 12 Jan 2018 18:18:23 +0800 Message-Id: <1515752305-15907-4-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515752305-15907-1-git-send-email-zhang.chunyan@linaro.org> References: <1515752305-15907-1-git-send-email-zhang.chunyan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The items "disabled" and "enabled" are a little redundant, since only one of them would be set to record if the regulator device should keep on or be switched to off in suspend states. So in this patch, the "disabled" was removed, only leave the "enabled": - enabled == 1 for regulator-on-in-suspend - enabled == 0 for regulator-off-in-suspend - enabled == -1 means do nothing when entering suspend mode. Signed-off-by: Chunyan Zhang --- drivers/regulator/core.c | 14 ++++++-------- drivers/regulator/of_regulator.c | 6 ++++-- include/linux/regulator/machine.h | 19 +++++++++++++++---- 3 files changed, 25 insertions(+), 14 deletions(-) -- 2.7.4 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 97bc9f7..5ea80e9 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -742,21 +742,19 @@ static int suspend_set_state(struct regulator_dev *rdev, * only warn if the driver implements set_suspend_voltage or * set_suspend_mode callback. */ - if (!rstate->enabled && !rstate->disabled) { + if (rstate->enabled != ENABLE_IN_SUSPEND && + rstate->enabled != DISABLE_IN_SUSPEND) { if (rdev->desc->ops->set_suspend_voltage || rdev->desc->ops->set_suspend_mode) rdev_warn(rdev, "No configuration\n"); return 0; } - if (rstate->enabled && rstate->disabled) { - rdev_err(rdev, "invalid configuration\n"); - return -EINVAL; - } - - if (rstate->enabled && rdev->desc->ops->set_suspend_enable) + if (rstate->enabled == ENABLE_IN_SUSPEND && + rdev->desc->ops->set_suspend_enable) ret = rdev->desc->ops->set_suspend_enable(rdev); - else if (rstate->disabled && rdev->desc->ops->set_suspend_disable) + else if (rstate->enabled == DISABLE_IN_SUSPEND && + rdev->desc->ops->set_suspend_disable) ret = rdev->desc->ops->set_suspend_disable(rdev); else /* OK if set_suspend_enable or set_suspend_disable is NULL */ ret = 0; diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 14637a0..41dad42 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -177,10 +177,12 @@ static void of_get_regulation_constraints(struct device_node *np, if (of_property_read_bool(suspend_np, "regulator-on-in-suspend")) - suspend_state->enabled = true; + suspend_state->enabled = ENABLE_IN_SUSPEND; else if (of_property_read_bool(suspend_np, "regulator-off-in-suspend")) - suspend_state->disabled = true; + suspend_state->enabled = DISABLE_IN_SUSPEND; + else + suspend_state->enabled = DO_NOTHING_IN_SUSPEND; if (!of_property_read_u32(suspend_np, "regulator-suspend-microvolt", &pval)) diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index 9cd4fef..ce89c55 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -42,6 +42,16 @@ struct regulator; #define REGULATOR_CHANGE_DRMS 0x10 #define REGULATOR_CHANGE_BYPASS 0x20 +/* + * operations in suspend mode + * DO_NOTHING_IN_SUSPEND - the default value + * DISABLE_IN_SUSPEND - turn off regulator in suspend states + * ENABLE_IN_SUSPEND - keep regulator on in suspend states + */ +#define DO_NOTHING_IN_SUSPEND (-1) +#define DISABLE_IN_SUSPEND 0 +#define ENABLE_IN_SUSPEND 1 + /* Regulator active discharge flags */ enum regulator_active_discharge { REGULATOR_ACTIVE_DISCHARGE_DEFAULT, @@ -58,14 +68,15 @@ enum regulator_active_discharge { * * @uV: Operating voltage during suspend. * @mode: Operating mode during suspend. - * @enabled: Enabled during suspend. - * @disabled: Disabled during suspend. + * @enabled: operations during suspend. + * - DO_NOTHING_IN_SUSPEND + * - DISABLE_IN_SUSPEND + * - ENABLE_IN_SUSPEND */ struct regulator_state { int uV; /* suspend voltage */ unsigned int mode; /* suspend regulator operating mode */ - int enabled; /* is regulator enabled in this suspend state */ - int disabled; /* is the regulator disabled in this suspend state */ + int enabled; }; /**