From patchwork Sun Jan 22 21:17:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 92197 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1071807qgi; Sun, 22 Jan 2017 21:17:38 -0800 (PST) X-Received: by 10.99.113.85 with SMTP id b21mr29482279pgn.180.1485148658513; Sun, 22 Jan 2017 21:17:38 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w22si6049356pgm.99.2017.01.22.21.17.38; Sun, 22 Jan 2017 21:17:38 -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; 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 S1750789AbdAWFRW (ORCPT + 25 others); Mon, 23 Jan 2017 00:17:22 -0500 Received: from mail-pf0-f171.google.com ([209.85.192.171]:33982 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750728AbdAWFQ6 (ORCPT ); Mon, 23 Jan 2017 00:16:58 -0500 Received: by mail-pf0-f171.google.com with SMTP id e4so38069487pfg.1 for ; Sun, 22 Jan 2017 21:16:57 -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=x5yYTqsLOjZURZPh+4sdgKFez4DsTVx9AmX2Kzvc2jI=; b=ZJyCpmbBdAlcp6J3LTtmgU5jQxOUNiqT9eOLIkVRnOz+049K6FesHv+lIp1tldU+j6 dk/cdR1oSwzTd6tA6i/jhRwD57SB47iwz9zHlOhgZAgct7Xt/P8mpQNdwsiKY/uyDSQS PvxGl3G5ZSvqmeyWQgxHFM1W7eZc7XoGsykFc= 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=x5yYTqsLOjZURZPh+4sdgKFez4DsTVx9AmX2Kzvc2jI=; b=H0vuvEcYu7+9qssb/oOz/BY22DzmD70BW8G41lYuVb+/f7QBxKSZ9Y4fnT3DIxTi0x OV87xhE25Np2rCCdSWjSou2xZiNTH0RhQmAAvwlQhv6pACL9g+jtYlhqfWnwurejZcVa 1jy8QkDlFdbpJXTgf4IkWXTvdnfmlOdaH/ke38gjeA8qTZW5weTf9Y+x3KDDcWlUkGT4 zKWnNAWqnPrWRCuf0sthMErOFjvxb1I+KJx8Tr4L6kFlp2eImRYcXmDxMDs2p/S9iKXB /ksaskwF/Y3rczXj6aYbum+t6BquGqAom3nbthkvZrpgDLAGQgkHn7dRB13hoopRHu0Q 5sIg== X-Gm-Message-State: AIkVDXKl23L+KRiZlrXcWD13yXE8CPwi4N2wF7nvZESnJ5IUgVuw/KuvtEtOaM1d/tqyzq7X X-Received: by 10.98.141.194 with SMTP id p63mr30678189pfk.185.1485148617356; Sun, 22 Jan 2017 21:16:57 -0800 (PST) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id 18sm33169100pgf.28.2017.01.22.21.16.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jan 2017 21:16:55 -0800 (PST) From: Bjorn Andersson To: Kishon Vijay Abraham I Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 3/4] phy: qcom-ufs: Remove -always-on property Date: Sun, 22 Jan 2017 13:17:48 -0800 Message-Id: <20170122211749.22803-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170122211749.22803-1-bjorn.andersson@linaro.org> References: <20170122211749.22803-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The fact that a regulator is always-on is a property of the regulator, not a specific consumer. Implementing this in the driver leads to a system behaviour that is dependent on if the Qualcomm UFS PHY was ever (partially) probed. If the specific regulator should be always on in a particular device, mark it so by specifying "regulator-always-on" in the regulator node. Reviewed-by: Vivek Gautam Reviewed-by: Subhash Jadavani Acked-by: Rob Herring Signed-off-by: Bjorn Andersson --- Changes since v1: - Picked up reviewd-bys from Vivek and Subhash Documentation/devicetree/bindings/ufs/ufs-qcom.txt | 1 - drivers/phy/phy-qcom-ufs-i.h | 1 - drivers/phy/phy-qcom-ufs.c | 5 +---- 3 files changed, 1 insertion(+), 6 deletions(-) -- 2.11.0 diff --git a/Documentation/devicetree/bindings/ufs/ufs-qcom.txt b/Documentation/devicetree/bindings/ufs/ufs-qcom.txt index b6b5130e5f65..1f69ee1a61ea 100644 --- a/Documentation/devicetree/bindings/ufs/ufs-qcom.txt +++ b/Documentation/devicetree/bindings/ufs/ufs-qcom.txt @@ -29,7 +29,6 @@ Optional properties: - vdda-pll-max-microamp : specifies max. load that can be drawn from pll supply - vddp-ref-clk-supply : phandle to UFS device ref_clk pad power supply - vddp-ref-clk-max-microamp : specifies max. load that can be drawn from this supply -- vddp-ref-clk-always-on : specifies if this supply needs to be kept always on Example: diff --git a/drivers/phy/phy-qcom-ufs-i.h b/drivers/phy/phy-qcom-ufs-i.h index d505d98cf5f8..13b02b7de30b 100644 --- a/drivers/phy/phy-qcom-ufs-i.h +++ b/drivers/phy/phy-qcom-ufs-i.h @@ -77,7 +77,6 @@ struct ufs_qcom_phy_vreg { int min_uV; int max_uV; bool enabled; - bool is_always_on; }; struct ufs_qcom_phy { diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c index bbd317158084..c145fa6e824c 100644 --- a/drivers/phy/phy-qcom-ufs.c +++ b/drivers/phy/phy-qcom-ufs.c @@ -242,9 +242,6 @@ static int ufs_qcom_phy_init_vreg(struct device *dev, } err = 0; } - snprintf(prop_name, MAX_PROP_NAME, "%s-always-on", name); - vreg->is_always_on = of_property_read_bool(dev->of_node, - prop_name); } if (!strcmp(name, "vdda-pll")) { @@ -402,7 +399,7 @@ static int ufs_qcom_phy_disable_vreg(struct device *dev, { int ret = 0; - if (!vreg || !vreg->enabled || vreg->is_always_on) + if (!vreg || !vreg->enabled) goto out; ret = regulator_disable(vreg->reg);