From patchwork Thu Nov 24 10:00:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dwivedi, Avaneesh Kumar (avani)" X-Patchwork-Id: 9445093 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7F3F8606DB for ; Thu, 24 Nov 2016 10:01:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E0B027A98 for ; Thu, 24 Nov 2016 10:01:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 532CA27CF5; Thu, 24 Nov 2016 10:01:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA43E27A98 for ; Thu, 24 Nov 2016 10:01:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937770AbcKXKBR (ORCPT ); Thu, 24 Nov 2016 05:01:17 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:45312 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938417AbcKXKBO (ORCPT ); Thu, 24 Nov 2016 05:01:14 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5F0D26151D; Thu, 24 Nov 2016 10:00:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1479981657; bh=A7M5WslCUM+57c1WRtl6xlMLx1NFFlOSyz4tc1D58po=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WW7DYGMplTA9zW5o9lEb+1KanHng7KPoKgSZXpoDCY/yQkkX7vz8oH1PumGwLa7yt URh74+C2z9XuVkqTE3gaBgTRUoek9p5aawrXzRrZaJBr7MTeI2YqN97x6xj9twHCTh 4uIBomiAucSHUV+hrgjqo2EwKBnUN+mHNXNkqu1A= Received: from akdwived-linux.qualcomm.com (unknown [202.46.23.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: akdwived@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id BC6B76155B; Thu, 24 Nov 2016 10:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1479981656; bh=A7M5WslCUM+57c1WRtl6xlMLx1NFFlOSyz4tc1D58po=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M8aNerSQxC+SVsjvqoQXZhKZOqLbAxaFz0zewcX1w6QOG9DH+glUIS1SYaR85o+rp RHNL5qZ66qkZ6VG//vJ9uGV3sjKEVY3UGOqzYQsdWW/nUElU/VVMicKTURdghq84rq 2ozIOjb5pmTbQKJpTk5pMD3qM+UPAM42qAf8ZIpE= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org BC6B76155B Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=akdwived@codeaurora.org From: Avaneesh Kumar Dwivedi To: bjorn.andersson@linaro.org Cc: sboyd@codeaurora.org, agross@codeaurora.org, linux-arm-msm@vger.kernel.org, Avaneesh Kumar Dwivedi Subject: [RESEND PATCH v4 3/7] remoteproc: qcom: Modify regulator enable and disable interface Date: Thu, 24 Nov 2016 15:30:34 +0530 Message-Id: <1479981638-32069-4-git-send-email-akdwived@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479981638-32069-1-git-send-email-akdwived@codeaurora.org> References: <1479981638-32069-1-git-send-email-akdwived@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Regulator enable routine will get additional input parameter of regulator info and count, It will read regulator info and will do appropriate voltage and load configuration before turning them up. Also separate out disable interface into proxy and active disable so that on arrival of handover interrupt proxy regulators alone could be voted out. Signed-off-by: Avaneesh Kumar Dwivedi --- drivers/remoteproc/qcom_q6v5_pil.c | 113 ++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 27 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index b0f0fcf..06d5bb2 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c @@ -126,7 +126,6 @@ struct q6v5 { struct qcom_smem_state *state; unsigned stop_bit; - struct regulator_bulk_data supply[4]; struct clk *ahb_clk; struct clk *axi_clk; @@ -160,13 +159,6 @@ enum { Q5V56_1_5_0, /*hexagon on msm8996*/ }; -enum { - Q6V5_SUPPLY_CX, - Q6V5_SUPPLY_MX, - Q6V5_SUPPLY_MSS, - Q6V5_SUPPLY_PLL, -}; - static int q6v5_regulator_init(struct device *dev, struct reg_info *regs, char **reg_str, int volatage_load[][2]) { @@ -206,35 +198,93 @@ static int q6v5_regulator_init(struct device *dev, return reg_count; } -static int q6v5_regulator_enable(struct q6v5 *qproc) +static int q6v5_regulator_enable(struct q6v5 *qproc, + struct reg_info *regs, int count) { - struct regulator *mss = qproc->supply[Q6V5_SUPPLY_MSS].consumer; - struct regulator *mx = qproc->supply[Q6V5_SUPPLY_MX].consumer; - int ret; + int i, rc = 0; + + for (i = 0; i < count; i++) { + if (regs[i].uV > 0) { + rc = regulator_set_voltage(regs[i].reg, + regs[i].uV, INT_MAX); + if (rc) { + dev_err(qproc->dev, + "Failed to request voltage for %d.\n", + i); + goto err; + } + } - /* TODO: Q6V5_SUPPLY_CX is supposed to be set to super-turbo here */ + if (regs[i].uA > 0) { + rc = regulator_set_load(regs[i].reg, + regs[i].uA); + if (rc < 0) { + dev_err(qproc->dev, "Failed to set regulator mode\n"); + goto err; + } + } - ret = regulator_set_voltage(mx, 1050000, INT_MAX); - if (ret) - return ret; + rc = regulator_enable(regs[i].reg); + if (rc) { + dev_err(qproc->dev, "Regulator enable failed\n"); + goto err; + } + } + + return 0; +err: + for (; i >= 0; i--) { + if (regs[i].uV > 0) + regulator_set_voltage(regs[i].reg, 0, INT_MAX); - regulator_set_voltage(mss, 1000000, 1150000); + if (regs[i].uA > 0) + regulator_set_load(regs[i].reg, 0); + + regulator_disable(regs[i].reg); + } - return regulator_bulk_enable(ARRAY_SIZE(qproc->supply), qproc->supply); + return rc; } -static void q6v5_regulator_disable(struct q6v5 *qproc) +static void q6v5_proxy_regulator_disable(struct q6v5 *qproc) { - struct regulator *mss = qproc->supply[Q6V5_SUPPLY_MSS].consumer; - struct regulator *mx = qproc->supply[Q6V5_SUPPLY_MX].consumer; + int i; + struct reg_info *regs = qproc->proxy_regs; - /* TODO: Q6V5_SUPPLY_CX corner votes should be released */ + for (i = 0; i < qproc->proxy_reg_count; i++) { + if (regs[i].uV > 0) + regulator_set_voltage(regs[i].reg, 0, INT_MAX); - regulator_bulk_disable(ARRAY_SIZE(qproc->supply), qproc->supply); - regulator_set_voltage(mx, 0, INT_MAX); - regulator_set_voltage(mss, 0, 1150000); + if (regs[i].uA > 0) + regulator_set_load(regs[i].reg, 0); + + regulator_disable(regs[i].reg); + } } +static void q6v5_active_regulator_disable(struct q6v5 *qproc) +{ + int i; + struct reg_info *regs = qproc->active_regs; + + for (i = 0; i < qproc->active_reg_count; i++) { + if (regs[i].uV > 0) + regulator_set_voltage(regs[i].reg, 0, INT_MAX); + + if (regs[i].uA > 0) + regulator_set_load(regs[i].reg, 0); + + regulator_disable(regs[i].reg); + } +} + +static void q6v5_regulator_disable(struct q6v5 *qproc) +{ + q6v5_proxy_regulator_disable(qproc); + q6v5_active_regulator_disable(qproc); +} + + static int q6v5_load(struct rproc *rproc, const struct firmware *fw) { struct q6v5 *qproc = rproc->priv; @@ -524,12 +574,19 @@ static int q6v5_start(struct rproc *rproc) struct q6v5 *qproc = (struct q6v5 *)rproc->priv; int ret; - ret = q6v5_regulator_enable(qproc); + ret = q6v5_regulator_enable(qproc, qproc->proxy_regs, + qproc->proxy_reg_count); if (ret) { - dev_err(qproc->dev, "failed to enable supplies\n"); + dev_err(qproc->dev, "failed to enable proxy supplies\n"); return ret; } + ret = q6v5_regulator_enable(qproc, qproc->active_regs, + qproc->active_reg_count); + if (ret) { + dev_err(qproc->dev, "failed to enable supplies\n"); + goto disable_proxy_reg; + } ret = reset_control_deassert(qproc->mss_restart); if (ret) { dev_err(qproc->dev, "failed to deassert mss restart\n"); @@ -600,6 +657,8 @@ static int q6v5_start(struct rproc *rproc) disable_vdd: q6v5_regulator_disable(qproc); +disable_proxy_reg: + q6v5_proxy_regulator_disable(qproc); return ret; }