From patchwork Wed Nov 16 17:01:27 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: 9432205 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 6F57660476 for ; Wed, 16 Nov 2016 17:02:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E99628F71 for ; Wed, 16 Nov 2016 17:02:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5347428FCB; Wed, 16 Nov 2016 17:02:05 +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 1F6DB28FCD for ; Wed, 16 Nov 2016 17:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932629AbcKPRB6 (ORCPT ); Wed, 16 Nov 2016 12:01:58 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:57102 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932643AbcKPRBw (ORCPT ); Wed, 16 Nov 2016 12:01:52 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 921F56155C; Wed, 16 Nov 2016 17:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1479315711; bh=pfGAsqDWn4rnpy6Ee/4o0tPVQ6cJMuuZs3/E4hdStOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CSMhroJAjKNunTGIIq8dCX0sUsA9/lmRJfTBENRvPmZlYx24oOQtE7GbtTJKg2WDS jSZIf4gXuF3/fOCbUw7Zm+t+xh8KRZrSawqklh0wDEE2dlMwIP48SVSTvwmHZHs5Bw Le1w+GiWIu7H5XCpv7zgRWOUaGhSXOXVgY9TAlmI= 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 184AC614A2; Wed, 16 Nov 2016 17:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1479315710; bh=pfGAsqDWn4rnpy6Ee/4o0tPVQ6cJMuuZs3/E4hdStOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mx8G728QdbZUkyVMRoQdqel8oWIQNtNTVDzLU+6b8ae/reNMDugG9ggcRDh2jOvdF /p8Q5eesUQikeaubBg4r4K0mhNtKjov11amvh4OtLRKEnv5LcQ/xZrq/9N8It6Byuk Ev1DWEeLoEc+rSwBGWHolNK+9DJHjzSYHpWavvpk= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org 184AC614A2 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: [PATCH v4 01/10] remoteproc: qcom: Add and initialize private data for hexagon dsp. Date: Wed, 16 Nov 2016 22:31:27 +0530 Message-Id: <1479315696-15490-2-git-send-email-akdwived@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479315696-15490-1-git-send-email-akdwived@codeaurora.org> References: <1479315696-15490-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 Embed resources specific to version of hexagon chip in device structure to avoid conditional check for manipulation of those resources in driver code. Signed-off-by: Avaneesh Kumar Dwivedi --- .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 1 + drivers/remoteproc/qcom_q6v5_pil.c | 48 +++++++++++++++++++++- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt index 57cb49e..cbc165c 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt +++ b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt @@ -8,6 +8,7 @@ on the Qualcomm Hexagon core. Value type: Definition: must be one of: "qcom,q6v5-pil" + "qcom,q6v56-pil" - reg: Usage: required diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index 2e0caaa..7660012 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c @@ -30,13 +30,14 @@ #include #include #include +#include #include "remoteproc_internal.h" #include "qcom_mdt_loader.h" #include -#define MBA_FIRMWARE_NAME "mba.b00" +#define MBA_FIRMWARE_NAME "mba.b00" #define MPSS_FIRMWARE_NAME "modem.mdt" #define MPSS_CRASH_REASON_SMEM 421 @@ -93,6 +94,23 @@ #define QDSS_BHS_ON BIT(21) #define QDSS_LDO_BYP BIT(22) +struct q6_rproc_res { + char *q6_mba_image; + int (*q6_reset_init)(void *q, void *p); + char **proxy_reg_string; + char **active_reg_string; + int **proxy_voltage_load; + int **active_voltage_load; + char **proxy_clk_string; + char **active_clk_string; +}; + +struct reg_info { + struct regulator *reg; + int uV; + int uA; +}; + struct q6v5 { struct device *dev; struct rproc *rproc; @@ -890,8 +908,34 @@ static int q6v5_remove(struct platform_device *pdev) return 0; } +static char *proxy_q6v56_regulator_namestr[] = {"mx", "cx", "pll", NULL}; +static int proxy_q6v56_voltage_load[3][2] = { {1050000, 0}, {0, 100000}, + {0, 100000} }; +static char *proxy_q6v56_clk_namestr[] = {"xo", "pnoc", "qdss", NULL}; +static char *active_q6v56_clk_namestr[] = {"iface", "bus", "mem", + "gpll0_mss_clk", "snoc_axi_clk", "mnoc_axi_clk", NULL}; + +static const struct q6_rproc_res q6v56_res = { + .q6_reset_init = NULL, + .q6_mba_image = "mba.mbn", + .proxy_reg_string = proxy_q6v56_regulator_namestr, + .active_reg_string = NULL, + .proxy_voltage_load = (int **)proxy_q6v56_voltage_load, + .active_voltage_load = NULL, + .proxy_clk_string = proxy_q6v56_clk_namestr, + .active_clk_string = active_q6v56_clk_namestr, +}; + +static const struct q6_rproc_res q6v5_res = { + .q6_reset_init = NULL, + .q6_mba_image = "mba.mbn", + .proxy_reg_string = proxy_q6v56_regulator_namestr, + .proxy_voltage_load = (int **)proxy_q6v56_voltage_load, +}; + static const struct of_device_id q6v5_of_match[] = { - { .compatible = "qcom,q6v5-pil", }, + { .compatible = "qcom,q6v5-pil", .data = &q6v5_res}, + { .compatible = "qcom,q6v56-pil", .data = &q6v56_res}, { }, };