From patchwork Thu Dec 15 12:05:42 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: 9475921 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 14E60607EE for ; Thu, 15 Dec 2016 12:08:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02BAE2870F for ; Thu, 15 Dec 2016 12:08:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EBCE62875E; Thu, 15 Dec 2016 12:08:50 +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 7C1372870F for ; Thu, 15 Dec 2016 12:08:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933120AbcLOMIu (ORCPT ); Thu, 15 Dec 2016 07:08:50 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:51486 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754709AbcLOMIr (ORCPT ); Thu, 15 Dec 2016 07:08:47 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 41C86615C2; Thu, 15 Dec 2016 12:06:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1481803576; bh=R20LaK1R88iMcruqi+G6lj30iqbZLIBtlANm+N6GFIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aSPYuQ/lDixldOa0UgcdZZfPh2ROQhJZDv4/3MB43p4ZZLlK9UwfLk8bqOXlYJYsH PGn7/Rw8dhDvUjgnL8v+wIPjIVu/Ca7SVsnSktwhWxKHgi2Ow0Qts4sK7i+5Kpsq7p r6fg+zcF2Fj0uAJZcnvz4V3YWpXq3qrLeYKNyeQE= 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 36F02613E4; Thu, 15 Dec 2016 12:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1481803575; bh=R20LaK1R88iMcruqi+G6lj30iqbZLIBtlANm+N6GFIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YHvlTCnMRzQPyCPNE67qSroudu8iJw/ZR0zae5gX1GPxA83SRDM/jKaNucpJF6SFa Z/mhjGdwYJEDg+pW9aSGkHm3WZWsdVRFzY3wpuOf9F+sJ4x3bKXSPUC6U6nPagGRx2 fmpsuUx4dTPYMjPaKPJFT5gM6EsfOWaDDnDHOe+c= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org 36F02613E4 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, linux-arm-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org, Avaneesh Kumar Dwivedi Subject: [PATCH v5 3/7] remoteproc: qcom: Add and initialize proxy and active regulators. Date: Thu, 15 Dec 2016 17:35:42 +0530 Message-Id: <1481803546-31592-4-git-send-email-akdwived@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1481803546-31592-1-git-send-email-akdwived@codeaurora.org> References: <1481803546-31592-1-git-send-email-akdwived@codeaurora.org> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Certain regulators and clocks need voting by rproc on behalf of hexagon only during restart operation but certain clocks and voltage need to be voted till hexagon is up, these regulators and clocks are identified as proxy and active resource respectively, whose handle is being obtained by supplying proxy and active regulator string name. Signed-off-by: Avaneesh Kumar Dwivedi --- drivers/remoteproc/qcom_q6v5_pil.c | 118 +++++++++++++++++++++++++++++++------ 1 file changed, 100 insertions(+), 18 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index 8c8b239..e95d118 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c @@ -93,8 +93,22 @@ #define QDSS_BHS_ON BIT(21) #define QDSS_LDO_BYP BIT(22) +struct reg_info { + struct regulator *reg; + int uV; + int uA; +}; + +struct qcom_mss_reg_res { + const char *supply; + int uV; + int uA; +}; + struct rproc_hexagon_res { const char *hexagon_mba_image; + struct qcom_mss_reg_res proxy_supply[4]; + struct qcom_mss_reg_res active_supply[2]; char **proxy_clk_string; char **active_clk_string; }; @@ -121,6 +135,11 @@ struct q6v5 { int active_clk_count; int proxy_clk_count; + struct reg_info active_regs[1]; + struct reg_info proxy_regs[3]; + int active_reg_count; + int proxy_reg_count; + struct regulator_bulk_data supply[4]; struct clk *ahb_clk; @@ -148,29 +167,34 @@ enum { Q6V5_SUPPLY_PLL, }; -static int q6v5_regulator_init(struct q6v5 *qproc) +static int q6v5_regulator_init(struct device *dev, struct reg_info *regs, + const struct qcom_mss_reg_res *reg_res) { - int ret; + int count = 0; + int rc; + int i; - qproc->supply[Q6V5_SUPPLY_CX].supply = "cx"; - qproc->supply[Q6V5_SUPPLY_MX].supply = "mx"; - qproc->supply[Q6V5_SUPPLY_MSS].supply = "mss"; - qproc->supply[Q6V5_SUPPLY_PLL].supply = "pll"; + while (reg_res[count].supply) + count++; - ret = devm_regulator_bulk_get(qproc->dev, - ARRAY_SIZE(qproc->supply), qproc->supply); - if (ret < 0) { - dev_err(qproc->dev, "failed to get supplies\n"); - return ret; - } + for (i = 0; i < count; i++) { + regs[i].reg = devm_regulator_get(dev, reg_res[i].supply); + if (IS_ERR(regs[i].reg)) { + rc = PTR_ERR(regs[i].reg); + if (rc != -EPROBE_DEFER) + dev_err(dev, "Failed to get %s\n regulator", + reg_res[i].supply); + return rc; + } - regulator_set_load(qproc->supply[Q6V5_SUPPLY_CX].consumer, 100000); - regulator_set_load(qproc->supply[Q6V5_SUPPLY_MSS].consumer, 100000); - regulator_set_load(qproc->supply[Q6V5_SUPPLY_PLL].consumer, 10000); + regs[i].uV = reg_res[i].uV; + regs[i].uA = reg_res[i].uA; + } - return 0; + return count; } + static int q6v5_regulator_enable(struct q6v5 *qproc) { struct regulator *mss = qproc->supply[Q6V5_SUPPLY_MSS].consumer; @@ -872,9 +896,21 @@ static int q6v5_probe(struct platform_device *pdev) } qproc->active_clk_count = ret; - ret = q6v5_regulator_init(qproc); - if (ret) + ret = q6v5_regulator_init(&pdev->dev, qproc->proxy_regs, + desc->proxy_supply); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to setup proxy regulators.\n"); goto free_rproc; + } + qproc->proxy_reg_count = ret; + + ret = q6v5_regulator_init(&pdev->dev, qproc->active_regs, + desc->active_supply); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to setup active regulators.\n"); + goto free_rproc; + } + qproc->active_reg_count = ret; ret = q6v5_init_reset(qproc); if (ret) @@ -926,12 +962,58 @@ static int q6v5_remove(struct platform_device *pdev) static const struct rproc_hexagon_res msm8916_mss = { .hexagon_mba_image = "mba.mbn", + .proxy_supply = (struct qcom_mss_reg_res[]) { + { + .supply = "mx", + .uV = 1050000, + }, + { + .supply = "cx", + .uA = 100000, + }, + { + .supply = "pll", + .uA = 100000, + }, + { NULL } + }, + .active_supply = (struct qcom_mss_reg_res[]) { + { + .supply = "mss", + .uV = 1050000, + .uA = 100000, + }, + { NULL } + }, .proxy_clk_string = (char*[]){"xo", NULL}, .active_clk_string = (char*[]){"iface", "bus", "mem", NULL}, }; static const struct rproc_hexagon_res msm8974_mss = { .hexagon_mba_image = "mba.b00", + .proxy_supply = (struct qcom_mss_reg_res[]) { + { + .supply = "mx", + .uV = 1050000, + }, + { + .supply = "cx", + .uA = 100000, + }, + { + .supply = "pll", + .uA = 100000, + }, + { NULL } + }, + .active_supply = (struct qcom_mss_reg_res[]) { + { + .supply = "mss", + .uV = 1050000, + .uA = 100000, + }, + { NULL } + }, .proxy_clk_string = (char*[]){"xo", NULL}, .active_clk_string = (char*[]){"iface", "bus", "mem", NULL}, };