From patchwork Thu Sep 29 05:02:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sireesh Kodali X-Patchwork-Id: 12993503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62593C6FA8E for ; Thu, 29 Sep 2022 05:02:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233404AbiI2FCi (ORCPT ); Thu, 29 Sep 2022 01:02:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233870AbiI2FCg (ORCPT ); Thu, 29 Sep 2022 01:02:36 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA8DF125797; Wed, 28 Sep 2022 22:02:33 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id i15-20020a17090a4b8f00b0020073b4ac27so290474pjh.3; Wed, 28 Sep 2022 22:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=IHv+se6PCST4Oao8xK2ZgRiscYBxXE1DiDrvnYlWrIY=; b=gOgKwMYh73lcy43oAvJRdZIS74zw360Tx53CmbMfCrupdwb0bbT92JJp+7W1de9CDi MCUL0SevyOPdMPdg8v+x+Zt7pU43zKIqttxNK0dA+OfcM2XWFDGsJUSTSu0bpC32HRR8 Fpuw38jgg2IiZWUKudziLqOaMFeZqmxqFiOwCXr9+cajt7ZRtFgOYTIzzPWuKbMQgAto AKMGPlBdKgfGfWVXeoXJhiUzFLQE0hJaL1Z/swOwxIbadv9z3Pq1b8vAcx0aLMgzO9A4 z2Ztnm9HF4QKS4sOg46gKwPs/vB/v8v/sN6gCzHxNuyPDt9PYfPpR8GE5pAqlLJzx8+N odwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=IHv+se6PCST4Oao8xK2ZgRiscYBxXE1DiDrvnYlWrIY=; b=qJ54ZAu+DsxwCUhimu0/nSKoTI3Hv62+4N0GYvtB0Q0lwUhnh5GOcLZsHj4n6VaXnz tqyEarJy1pMMYazvRrO1UoiukQpJvO+u3ZF+u2oyM92V1I51hdPUXebTgSuXr8vVA3TW J6oq9X4BiqycgsMDKBjmgon5Ef4YgxoZQXX97H80k+MLO5dTgivsvw3PdwXiFBrqkUFL tv5i7hXjDkAtX4Y3G4N6rXo5cXiFmQPgwr3dUllbkZ3uzERDGDeNEriskGTWosbTGvzA cEY1ZJ+vhhHqaq6gPNJsMvkimh4DrpFd4clHuvS2FC73rNuNOt//t088JtpQTM24DQNW ZaCQ== X-Gm-Message-State: ACrzQf3BpvSgs+3kx+7jbwjVYVp2RKfQt455ISPIVdJoHd2RiI85CAkQ h7ZRVEoZlDUGXTjfnKMsgQPnXLQkd5MIuGvB X-Google-Smtp-Source: AMsMyM74RpMnEp5dkLkVu+o5YxuF8XsAH66rGsuqct+R4EAK1PQRaX0mHKENT140PFsfM77b8MDZ6A== X-Received: by 2002:a17:903:40c3:b0:17a:d2b:fac2 with SMTP id t3-20020a17090340c300b0017a0d2bfac2mr1644362pld.5.1664427752775; Wed, 28 Sep 2022 22:02:32 -0700 (PDT) Received: from skynet-linux.local ([2a09:bac0:579::681d:4237]) by smtp.googlemail.com with ESMTPSA id rm13-20020a17090b3ecd00b0020263b7177csm1895962pjb.3.2022.09.28.22.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 22:02:32 -0700 (PDT) From: Sireesh Kodali To: devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-kernel@vger.kernel.org Cc: andersson@kernel.org, krzysztof.kozlowski+dt@linaro.org, Vladimir Lypak , Sireesh Kodali , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier Subject: [PATCH v5 1/5] remoteproc: qcom: qcom_wcnss: Add support for pronto-v3 Date: Thu, 29 Sep 2022 10:32:05 +0530 Message-Id: <20220929050209.1464526-2-sireeshkodali1@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929050209.1464526-1-sireeshkodali1@gmail.com> References: <20220929050209.1464526-1-sireeshkodali1@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Vladimir Lypak Pronto-v3 is similar to pronto-v2. It requires two power domains, and it requires the xo clock. It is used on the MSM8953 platform. Signed-off-by: Vladimir Lypak Signed-off-by: Sireesh Kodali --- drivers/remoteproc/qcom_wcnss.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index 68f37296b151..ff18bfae5eb6 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c @@ -141,6 +141,18 @@ static const struct wcnss_data pronto_v2_data = { .num_vregs = 1, }; +static const struct wcnss_data pronto_v3_data = { + .pmu_offset = 0x1004, + .spare_offset = 0x1088, + + .pd_names = { "mx", "cx" }, + .vregs = (struct wcnss_vreg_info[]) { + { "vddpx", 1800000, 1800000, 0 }, + }, + .num_pd_vregs = 2, + .num_vregs = 1, +}; + static int wcnss_load(struct rproc *rproc, const struct firmware *fw) { struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv; @@ -675,6 +687,7 @@ static const struct of_device_id wcnss_of_match[] = { { .compatible = "qcom,riva-pil", &riva_data }, { .compatible = "qcom,pronto-v1-pil", &pronto_v1_data }, { .compatible = "qcom,pronto-v2-pil", &pronto_v2_data }, + { .compatible = "qcom,pronto-v3-pil", &pronto_v3_data }, { }, }; MODULE_DEVICE_TABLE(of, wcnss_of_match); From patchwork Thu Sep 29 05:02:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sireesh Kodali X-Patchwork-Id: 12993504 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F522C07E9D for ; Thu, 29 Sep 2022 05:02:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234797AbiI2FC4 (ORCPT ); Thu, 29 Sep 2022 01:02:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234523AbiI2FCp (ORCPT ); Thu, 29 Sep 2022 01:02:45 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51ACA1257B5; Wed, 28 Sep 2022 22:02:44 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id z20so283316plb.10; Wed, 28 Sep 2022 22:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=4vPO8b21g54ppVNZ6kKzOgGtpA0MaVizSpoU9mqP8V0=; b=poDukDIvTJizeCLZDcOyl1sED/i1Y57XdTGSOrNLptZEQUj/zBzxun9ms0pOu0j4Dq AhYLmWqQBpbfCGIV5sP+PRNQWSPfz2hMjA8Un8TMWVMaI9ryHhpaZpN2pkNnjZfXXImy +7NquQCaWxnzr8oH6BlMMkAqxHobgf0CK5CO3/WQrlGzc3Im8+Ll/GLFJU+U6z9bOHYt /LGgCjzNihJsQVVv/QRunlY4eSluZbumGr14q5MSk/aqy56tYzMhRX5kAlxoK0h4YbMp 4QmpiBmxL00+06BpPTRhgMOESQYRvR6Y3dXxhnADwaDclKjRP3EDMoNK4Xg7aF2cU+My 80Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=4vPO8b21g54ppVNZ6kKzOgGtpA0MaVizSpoU9mqP8V0=; b=s0sNx0qfFUOKHvgOoq1eKZIqc7/JbSfu2lTBbT/g/9omCN6HZOOnEbZMprWvbfr4LM HOu/0Tj63jH2g11NI1QAwBSUGaaqtXYTaeqR9zeLcu6NzWO0h+vBbRybVcT+I3vZa692 gYb9pFqicFA/qjPVu+cOM24K3jiV55wsJp5LWjnrXYIehmkbuVzuiGCHnqkAGjA11Z3h zO83GiKBYkV7zLaSyHY/oziBUer2GiTyKck003cJWuKSj0HkCT81ykkL6LHS5nV/BQHE hIzRD8lE7NOga6YDiMyX6NpQBPHS3BfP4BU9a2tgHt0H6tnKZofIbc+6GwO+GkhEGjzJ xC8Q== X-Gm-Message-State: ACrzQf3+zuek4QqBTvTv6qyUh+tyKP83/Jkr6UECpFEa5thip+o1HCOh kALQnmBcQpP2Sr36mN6lRiWS4GeNOspDmF6W X-Google-Smtp-Source: AMsMyM5ELHTvl1Dz9HpUky49RXnPAFJTCi3lcOpe0rAsQkmN2M93lwL5s6Fd8GkmGkBEKrq/t+LP3A== X-Received: by 2002:a17:90b:3a90:b0:202:d341:bf81 with SMTP id om16-20020a17090b3a9000b00202d341bf81mr14094109pjb.179.1664427763232; Wed, 28 Sep 2022 22:02:43 -0700 (PDT) Received: from skynet-linux.local ([2a09:bac0:579::681d:4237]) by smtp.googlemail.com with ESMTPSA id rm13-20020a17090b3ecd00b0020263b7177csm1895962pjb.3.2022.09.28.22.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 22:02:42 -0700 (PDT) From: Sireesh Kodali To: devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-kernel@vger.kernel.org Cc: andersson@kernel.org, krzysztof.kozlowski+dt@linaro.org, Sireesh Kodali , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring Subject: [PATCH v5 2/5] dt-bindings: remoteproc: qcom: Convert wcnss documentation to YAML Date: Thu, 29 Sep 2022 10:32:06 +0530 Message-Id: <20220929050209.1464526-3-sireeshkodali1@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929050209.1464526-1-sireeshkodali1@gmail.com> References: <20220929050209.1464526-1-sireeshkodali1@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This is a direct conversion of the existing txt documentation to YAML. It is in preparation for the addition of pronto-v3 to the docs. This patch doesn't document any of the existing subnodes/properties that are not documented in the existing txt file. That is done in a separate patch. Signed-off-by: Sireesh Kodali Reviewed-by: Krzysztof Kozlowski --- .../bindings/remoteproc/qcom,wcnss-pil.txt | 177 ------------ .../bindings/remoteproc/qcom,wcnss-pil.yaml | 269 ++++++++++++++++++ 2 files changed, 269 insertions(+), 177 deletions(-) delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt deleted file mode 100644 index ac423f4c3f1b..000000000000 --- a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt +++ /dev/null @@ -1,177 +0,0 @@ -Qualcomm WCNSS Peripheral Image Loader - -This document defines the binding for a component that loads and boots firmware -on the Qualcomm WCNSS core. - -- compatible: - Usage: required - Value type: - Definition: must be one of: - "qcom,riva-pil", - "qcom,pronto-v1-pil", - "qcom,pronto-v2-pil" - -- reg: - Usage: required - Value type: - Definition: must specify the base address and size of the CCU, DXE and - PMU register blocks - -- reg-names: - Usage: required - Value type: - Definition: must be "ccu", "dxe", "pmu" - -- interrupts-extended: - Usage: required - Value type: - Definition: must list the watchdog and fatal IRQs and may specify the - ready, handover and stop-ack IRQs - -- interrupt-names: - Usage: required - Value type: - Definition: should be "wdog", "fatal", optionally followed by "ready", - "handover", "stop-ack" - -- firmware-name: - Usage: optional - Value type: - Definition: must list the relative firmware image path for the - WCNSS core. Defaults to "wcnss.mdt". - -- vddmx-supply: (deprecated for qcom,pronto-v1/2-pil) -- vddcx-supply: (deprecated for qcom,pronto-v1/2-pil) -- vddpx-supply: - Usage: required - Value type: - Definition: reference to the regulators to be held on behalf of the - booting of the WCNSS core - -- power-domains: - Usage: required (for qcom,pronto-v1/2-pil) - Value type: - Definition: reference to the power domains to be held on behalf of the - booting of the WCNSS core - -- power-domain-names: - Usage: required (for qcom,pronto-v1/2-pil) - Value type: - Definition: must be "cx", "mx" - -- qcom,smem-states: - Usage: optional - Value type: - Definition: reference to the SMEM state used to indicate to WCNSS that - it should shut down - -- qcom,smem-state-names: - Usage: optional - Value type: - Definition: should be "stop" - -- memory-region: - Usage: required - Value type: - Definition: reference to reserved-memory node for the remote processor - see ../reserved-memory/reserved-memory.txt - -= SUBNODES -A required subnode of the WCNSS PIL is used to describe the attached rf module -and its resource dependencies. It is described by the following properties: - -- compatible: - Usage: required - Value type: - Definition: must be one of: - "qcom,wcn3620", - "qcom,wcn3660", - "qcom,wcn3660b", - "qcom,wcn3680" - -- clocks: - Usage: required - Value type: - Definition: should specify the xo clock and optionally the rf clock - -- clock-names: - Usage: required - Value type: - Definition: should be "xo", optionally followed by "rf" - -- vddxo-supply: -- vddrfa-supply: -- vddpa-supply: -- vdddig-supply: - Usage: required - Value type: - Definition: reference to the regulators to be held on behalf of the - booting of the WCNSS core - - -The wcnss node can also have an subnode named "smd-edge" that describes the SMD -edge, channels and devices related to the WCNSS. -See ../soc/qcom/qcom,smd.yaml for details on how to describe the SMD edge. - -= EXAMPLE -The following example describes the resources needed to boot control the WCNSS, -with attached WCN3680, as it is commonly found on MSM8974 boards. - -pronto@fb204000 { - compatible = "qcom,pronto-v2-pil"; - reg = <0xfb204000 0x2000>, <0xfb202000 0x1000>, <0xfb21b000 0x3000>; - reg-names = "ccu", "dxe", "pmu"; - - interrupts-extended = <&intc 0 149 1>, - <&wcnss_smp2p_slave 0 0>, - <&wcnss_smp2p_slave 1 0>, - <&wcnss_smp2p_slave 2 0>, - <&wcnss_smp2p_slave 3 0>; - interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack"; - - power-domains = <&rpmpd MSM8974_VDDCX>, <&rpmpd MSM8974_VDDMX>; - power-domain-names = "cx", "mx"; - - vddpx-supply = <&pm8941_s3>; - - qcom,smem-states = <&wcnss_smp2p_out 0>; - qcom,smem-state-names = "stop"; - - memory-region = <&wcnss_region>; - - pinctrl-names = "default"; - pinctrl-0 = <&wcnss_pin_a>; - - iris { - compatible = "qcom,wcn3680"; - - clocks = <&rpmcc RPM_CXO_CLK_SRC>, <&rpmcc RPM_CXO_A2>; - clock-names = "xo", "rf"; - - vddxo-supply = <&pm8941_l6>; - vddrfa-supply = <&pm8941_l11>; - vddpa-supply = <&pm8941_l19>; - vdddig-supply = <&pm8941_s3>; - }; - - smd-edge { - interrupts = <0 142 1>; - - qcom,ipc = <&apcs 8 17>; - qcom,smd-edge = <6>; - qcom,remote-pid = <4>; - - label = "pronto"; - - wcnss { - compatible = "qcom,wcnss"; - qcom,smd-channels = "WCNSS_CTRL"; - - qcom,mmio = <&pronto>; - - bt { - compatible = "qcom,wcnss-bt"; - }; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml new file mode 100644 index 000000000000..c22a6090220f --- /dev/null +++ b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml @@ -0,0 +1,269 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/remoteproc/qcom,wcnss-pil.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm WCNSS Peripheral Image Loader + +maintainers: + - Bjorn Andersson + +description: + This document defines the binding for a component that loads and boots + firmware on the Qualcomm WCNSS core. + +properties: + compatible: + enum: + - qcom,riva-pil + - qcom,pronto-v1-pil + - qcom,pronto-v2-pil + + reg: + maxItems: 3 + description: + The base address and size of the CCU, DXE and PMU register blocks + + reg-names: + items: + - const: ccu + - const: dxe + - const: pmu + + interrupts: + minItems: 2 + maxItems: 5 + + interrupt-names: + minItems: 2 + items: + - const: wdog + - const: fatal + - const: ready + - const: handover + - const: stop-ack + + firmware-name: + $ref: /schemas/types.yaml#/definitions/string + description: + Relative firmware image path for the WCNSS core. Defaults to + "wcnss.mdt". + + vddpx-supply: + description: + PX regulator to be held on behalf of the booting of the WCNSS core + + vddmx-supply: + description: + MX regulator to be held on behalf of the booting of the WCNSS core. + + vddcx-supply: + description: + CX regulator to be held on behalf of the booting of the WCNSS core. + + power-domains: + maxItems: 2 + + power-domain-names: + items: + - const: cx + - const: mx + + qcom,smem-states: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + States used by the AP to signal the WCNSS core that it should shutdown + items: + - description: Stop the modem + + qcom,smem-state-names: + description: The names of the state bits used for SMP2P output + items: + - const: stop + + memory-region: + maxItems: 1 + description: reserved-memory for the WCNSS core + + smd-edge: + $ref: /schemas/remoteproc/qcom,smd-edge.yaml# + description: + Qualcomm Shared Memory subnode which represents communication edge, + channels and devices related to the ADSP. + + iris: + type: object + description: + The iris subnode of the WCNSS PIL is used to describe the attached RF module + and its resource dependencies. + + properties: + compatible: + enum: + - qcom,wcn3620 + - qcom,wcn3660 + - qcom,wcn3660b + - qcom,wcn3680 + + clocks: + minItems: 1 + items: + - description: XO clock + - description: RF clock + + clock-names: + minItems: 1 + items: + - const: xo + - const: rf + + vddxo-supply: + description: + Reference to the regulator to be held on behalf of the booting WCNSS + core + + vddrfa-supply: + description: + Reference to the regulator to be held on behalf of the booting WCNSS + core + + vddpa-supply: + description: + Reference to the regulator to be held on behalf of the booting WCNSS + core + + vdddig-supply: + description: + Reference to the regulator to be held on behalf of the booting WCNSS + core + + required: + - compatible + - clocks + - clock-names + - vddxo-supply + - vddrfa-supply + - vddpa-supply + - vdddig-supply + + additionalProperties: false + +required: + - compatible + - reg + - reg-names + - interrupts + - interrupt-names + - iris + - vddpx-supply + - memory-region + - smd-edge + +additionalProperties: false + +allOf: + - if: + properties: + compatible: + contains: + const: qcom,riva-pil + then: + required: + - vddcx-supply + - vddmx-supply + + - if: + properties: + compatible: + contains: + enum: + - qcom,pronto-v1-pil + - qcom,pronto-v2-pil + then: + properties: + vddmx-supply: + deprecated: true + description: Deprecated for qcom,pronto-v1/2-pil + + vddcx-supply: + deprecated: true + description: Deprecated for qcom,pronto-v1/2-pil + + required: + - power-domains + - power-domain-names + +examples: + - | + #include + #include + #include + pronto@a21b000 { + compatible = "qcom,pronto-v2-pil"; + reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>; + reg-names = "ccu", "dxe", "pmu"; + + interrupts-extended = <&intc GIC_SPI 149 IRQ_TYPE_EDGE_RISING>, + <&wcnss_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&wcnss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&wcnss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack"; + + power-domains = <&rpmpd MSM8916_VDDCX>, <&rpmpd MSM8916_VDDMX>; + power-domain-names = "cx", "mx"; + + vddpx-supply = <&pm8916_l7>; + + qcom,smem-states = <&wcnss_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + memory-region = <&wcnss_region>; + + pinctrl-names = "default"; + pinctrl-0 = <&wcnss_pin_a>; + + iris { + compatible = "qcom,wcn3620"; + vddxo-supply = <&pm8916_l7>; + vddrfa-supply = <&pm8916_s3>; + vddpa-supply = <&pm8916_l9>; + vdddig-supply = <&pm8916_l5>; + + clocks = <&rpmcc RPM_SMD_RF_CLK2>; + clock-names = "xo"; + }; + + smd-edge { + interrupts = ; + + qcom,ipc = <&apcs 8 17>; + qcom,smd-edge = <6>; + qcom,remote-pid = <4>; + + label = "pronto"; + + wcnss_ctrl: wcnss { + compatible = "qcom,wcnss"; + qcom,smd-channels = "WCNSS_CTRL"; + + qcom,mmio = <&pronto>; + + bluetooth { + compatible = "qcom,wcnss-bt"; + }; + + wifi { + compatible = "qcom,wcnss-wlan"; + + interrupts = , + ; + interrupt-names = "tx", "rx"; + + qcom,smem-states = <&apps_smsm 10>, <&apps_smsm 9>; + qcom,smem-state-names = "tx-enable", "tx-rings-empty"; + }; + }; + }; + }; From patchwork Thu Sep 29 05:02:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sireesh Kodali X-Patchwork-Id: 12993505 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EE75C6FA90 for ; Thu, 29 Sep 2022 05:03:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234840AbiI2FDA (ORCPT ); Thu, 29 Sep 2022 01:03:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234756AbiI2FCw (ORCPT ); Thu, 29 Sep 2022 01:02:52 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2CAF1284AB; Wed, 28 Sep 2022 22:02:49 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id d82so433992pfd.10; Wed, 28 Sep 2022 22:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=OjbUXeviY6YCLLqqd/ejLKx1ctiYSztmp1vKiw+VYlw=; b=Jo1A7O6swPjc0F0f+2xRsgznsiBUTKvJ3WjrBZIGhVas+leC7IU0rnAHf/Cj37cH8F 76KbjOj4xCxZac2cbrNzFHiqKq8z05m8n3ux4MXi2pQOvIp4I3vHtWHjOCWGYYxvuCMh rIEuux109nIr3j0irWhRvhIP8tzmktJwTvL+/ImNYnIjMTzskXgwYBaIfFGMS5H39Zdf G1b+HkvlU67nWzlVLAzYosf/C1iCb/EiXLJf6LwtIkNEBkk/OnvpTPrGkjU+FpF3UFSf PMR/UAeCFprOzysbhT2fpxRjHChXT/zuuU3tmpem3fFuBTSYTbOil4DWKvaGcz+e6v4y GdUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=OjbUXeviY6YCLLqqd/ejLKx1ctiYSztmp1vKiw+VYlw=; b=Kqxtt6Tby4zpiSVBMAybCfprC8Vm5qkdGIb6Os2e1jKJBtUxzD0RHg8FhdlgOOEUx6 94ur72VLPDJYnaSNFXc1K6uaiJJGF+xvHrtpWBxqbiUczwpeFCwL40cwRhaxrJzQjuzv Es8VhNcNEkCuU9MXzQdV7g81H154trRG9YtOP56LsoPFYp0cu8wSvFkrhi19OmamxZk2 1XeL4AfltZ7ENnio9oMCP/Pt29JGj4Sr9Ad5tf4fJUzayS9x1joKikkpRf/xTl9E3Sf+ 0xmXY4aK20k4sq7EEKxs95fL0hARLSYATbws46ABoRxk9bAF/WsBM+kAjGsOc0I7jFJ9 gOFA== X-Gm-Message-State: ACrzQf10dF7YPChFbmKSHrdpKboRf9r64YPLvDqrk3kaRxffEL5NRqdK bgeAO90jmpyIQywNGgZztvAc9pRZt4qyZhLs X-Google-Smtp-Source: AMsMyM4/YAif8eXW7RyhxhKNYSshi6eBzvw3kqm12UBks0lokKEaNBifc656zZ2wXXbUks7fjPHOdQ== X-Received: by 2002:aa7:946f:0:b0:541:fcf0:31d7 with SMTP id t15-20020aa7946f000000b00541fcf031d7mr1505273pfq.35.1664427768501; Wed, 28 Sep 2022 22:02:48 -0700 (PDT) Received: from skynet-linux.local ([2a09:bac0:579::681d:4237]) by smtp.googlemail.com with ESMTPSA id rm13-20020a17090b3ecd00b0020263b7177csm1895962pjb.3.2022.09.28.22.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 22:02:47 -0700 (PDT) From: Sireesh Kodali To: devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-kernel@vger.kernel.org Cc: andersson@kernel.org, krzysztof.kozlowski+dt@linaro.org, Sireesh Kodali , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring Subject: [PATCH v5 3/5] dt-bindings: remoteproc: qcom: wcnss: Add qcom,pronto compatible Date: Thu, 29 Sep 2022 10:32:07 +0530 Message-Id: <20220929050209.1464526-4-sireeshkodali1@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929050209.1464526-1-sireeshkodali1@gmail.com> References: <20220929050209.1464526-1-sireeshkodali1@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This is not a fallback compatible, it must be present in addition to "qcom,pronto-v*". It is also not documented in qcom,wcnss-pil.txt. This is the reason for documenting it in a separate commit. This compatible is used in the wcn36xx driver to determine which register must be accessed. However it isn't immediately clear why the wcn36xx driver relies on this extra compatible string rather than just looking for "qcom,pronto-v*". Signed-off-by: Sireesh Kodali Reviewed-by: Krzysztof Kozlowski --- .../bindings/remoteproc/qcom,wcnss-pil.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml index c22a6090220f..0eb2617e3482 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml @@ -15,10 +15,15 @@ description: properties: compatible: - enum: - - qcom,riva-pil - - qcom,pronto-v1-pil - - qcom,pronto-v2-pil + description: + Append "qcom,pronto" if the device is actually pronto, and not riva + oneOf: + - items: + - enum: + - qcom,pronto-v1-pil + - qcom,pronto-v2-pil + - const: qcom,pronto + - const: qcom,riva-pil reg: maxItems: 3 @@ -200,7 +205,7 @@ examples: #include #include pronto@a21b000 { - compatible = "qcom,pronto-v2-pil"; + compatible = "qcom,pronto-v2-pil", "qcom,pronto"; reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>; reg-names = "ccu", "dxe", "pmu"; From patchwork Thu Sep 29 05:02:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sireesh Kodali X-Patchwork-Id: 12993506 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BB2DC6FA8E for ; Thu, 29 Sep 2022 05:03:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234881AbiI2FDS (ORCPT ); Thu, 29 Sep 2022 01:03:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234810AbiI2FC5 (ORCPT ); Thu, 29 Sep 2022 01:02:57 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91996128A29; Wed, 28 Sep 2022 22:02:55 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id f193so498204pgc.0; Wed, 28 Sep 2022 22:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=juW9wu13y489Hph7sR+dhrqUMWDs6TD8KFYBRB4JbO4=; b=G3Xxu7ZvNGRd8fN9tX/5TWIr9fy++QsTZ7/ZckdyCHzJNHQfUX7TNkreWBeYtOP8SR hoAr7VeQexpBA+KJBcyA4ooRQVKuRnItiwm+Lz6B4NtLW48Yuqq3gkxDG4SAmNiC38Z5 k+6mf3DANeiT4fNzOYMxwTtblfHZ546eCGhC5lK2rjhHPbzVdxfmfX1MGHlHn2PoDL8V C0Nm6MSq5trXpO2gundC4+9xxldV14mISwzB0bPset6oV+XeWwqmmogEIJXle//clAle vX/cKmuYQ6l6sw5ZocUxbfxz7L4++i7wJ9K1ghjEYj4Ct3a6XqcjpKxkGGb+vsTfCv6Z kViA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=juW9wu13y489Hph7sR+dhrqUMWDs6TD8KFYBRB4JbO4=; b=lWpicdgrDIl0SWrmW5aJg2TEDRoxhhI/fdlt0bALFB/02cW0s9RmofUuA6BERb3RfG yxSOCCBsBUE4aXi7M6KoQkDGIuOXoCwNWi/YQ9lpUtCpAnU+vz5u20M6EUw3yT957X4y 5/CbCwAQr3AbPfQwy8fRfJjPAsO9xBymCuefkt+2WveDMceBikt2D8TQr6hC6L+QYMVo jzAThEZKMdBQPjsVAszWZVqL+p0PZ5/nFF6UWmhRcE2mUgZCcf28aEkarGwU5yvHYrnn mCYZXMq++qs41W25KUhk7xOO6b+FejAjwAp8WVV7t0e7HaDxVPsohIwZZsXbppjnzLeu ypUg== X-Gm-Message-State: ACrzQf0w6fOMJtrltGzKwDRTxBK7HCriefAYgsWC9iwSxvincd8lrPgq i24NfvfOeGQkACiJxmDOZ5gpvqikA/Z9KqUK X-Google-Smtp-Source: AMsMyM7Zba0qfDZYMrALKSmvp8fAyCBvTGCUHZhEMQlQtnV4Em8sTbX+B3AA+sqFNC73wbg+wPAi4Q== X-Received: by 2002:a63:cc4a:0:b0:439:1c48:2fed with SMTP id q10-20020a63cc4a000000b004391c482fedmr1317619pgi.618.1664427774356; Wed, 28 Sep 2022 22:02:54 -0700 (PDT) Received: from skynet-linux.local ([2a09:bac0:579::681d:4237]) by smtp.googlemail.com with ESMTPSA id rm13-20020a17090b3ecd00b0020263b7177csm1895962pjb.3.2022.09.28.22.02.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 22:02:53 -0700 (PDT) From: Sireesh Kodali To: devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-kernel@vger.kernel.org Cc: andersson@kernel.org, krzysztof.kozlowski+dt@linaro.org, Sireesh Kodali , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring Subject: [PATCH v5 4/5] dt-bindings: remoteproc: qcom: wcnss: Add compatible for pronto v3 Date: Thu, 29 Sep 2022 10:32:08 +0530 Message-Id: <20220929050209.1464526-5-sireeshkodali1@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929050209.1464526-1-sireeshkodali1@gmail.com> References: <20220929050209.1464526-1-sireeshkodali1@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The pronto v3 remoteproc is similar to pronto v2. It is found on the MSM8953 platform, which is used by SDM450, SDM625, SDM626, APQ8053 and other SoCs. Since the configuration is same on all SoCs, a single compatible is used. Signed-off-by: Sireesh Kodali Reviewed-by: Krzysztof Kozlowski --- .../bindings/remoteproc/qcom,wcnss-pil.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml index 0eb2617e3482..2ba2b6cf11fb 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml @@ -22,6 +22,7 @@ properties: - enum: - qcom,pronto-v1-pil - qcom,pronto-v2-pil + - qcom,pronto-v3-pil - const: qcom,pronto - const: qcom,riva-pil @@ -199,6 +200,21 @@ allOf: - power-domains - power-domain-names + - if: + properties: + compatible: + contains: + enum: + - qcom,pronto-v3-pil + then: + properties: + vddmx-supply: false + vddcx-supply: false + + required: + - power-domains + - power-domain-names + examples: - | #include From patchwork Thu Sep 29 05:02:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sireesh Kodali X-Patchwork-Id: 12993507 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B260DC04A95 for ; Thu, 29 Sep 2022 05:03:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234909AbiI2FDZ (ORCPT ); Thu, 29 Sep 2022 01:03:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234847AbiI2FDC (ORCPT ); Thu, 29 Sep 2022 01:03:02 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7406D1284A6; Wed, 28 Sep 2022 22:03:00 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id bh13so469876pgb.4; Wed, 28 Sep 2022 22:03:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=MAxX3HwZPoIUthNG89lC4GJ6X33ElvjGpgppMP4s59I=; b=ninWtnFr+PZBgoMjKfPm2KhI7Eek3iq7i0ShTtqXXCTWq/ViTXoEomk1Ns+cN/67U9 cguqetWzOJB4M+fcUqekaxXbCr8WuQPPm82o47td59ScllerSWC2nTFDJ608sJKHTNEr CTItMegI7UhtkYpnDBzIZ17KHOlA+I9UNBdtsED2waoN0dk22givZAygMYMBDPYIacKl Hi5Yww4qWtVKKAqAq6yaLBbVK2HhtZkUrLH80nES2BDVJR80aEczepZ3iC8/GFteWnzo GUtikUpn1CKjOvAgc4AIrpII0GeZe83drnnXM1/07mkhY7J4uuxo5PLUx47PhSz2Dxaa I0cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=MAxX3HwZPoIUthNG89lC4GJ6X33ElvjGpgppMP4s59I=; b=C+JNNMbNgcm7KomLrZa5NmygkaZJCRg+b5TOiceSv2rE6xD+7bPjsg11nXLCy7vRQ3 kbs8RI/dgUdSN9KDbMpxynPWtflCBnXzbEmzEgea+cBldGZ+qdsKQHTfG0Y/OM6qFEsS foV/1H1G0A3qIDlLa7svdfZFQj94TK/tRpN6v6AodwyfH+X3nnGzfzyg1ocv0Z1CoT/P qcHMtrXiVk65WA5G+Qy1qzH439zU66bWkPOz/iF/TPqK+DBfKcn9rlkBsbHDTlpQHCSp cx8iz/E5Ib2+BMrdroikjTNwUe94g+69AZCp3qrkHlu6kVUTfbVUBypeVTeKcq4D7rHW pFkA== X-Gm-Message-State: ACrzQf2APssLR3PlDaKBSFUAqHp9dT5KM5jRkN97eB0oqIW/ZYWYERUK QOu4XKpcZ/9/V002lfm/wAfBRwl6Fy8SOm0I X-Google-Smtp-Source: AMsMyM4bry2WOb170Y/tBalWnaBobFDexndbojNbGL6Z3HYWbWbeCb131hsk8dxYRwIrCrPjOVi/Gg== X-Received: by 2002:a05:6a00:14d5:b0:542:9c32:ab27 with SMTP id w21-20020a056a0014d500b005429c32ab27mr1682903pfu.64.1664427779439; Wed, 28 Sep 2022 22:02:59 -0700 (PDT) Received: from skynet-linux.local ([2a09:bac0:579::681d:4237]) by smtp.googlemail.com with ESMTPSA id rm13-20020a17090b3ecd00b0020263b7177csm1895962pjb.3.2022.09.28.22.02.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 22:02:58 -0700 (PDT) From: Sireesh Kodali To: devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, linux-kernel@vger.kernel.org Cc: andersson@kernel.org, krzysztof.kozlowski+dt@linaro.org, Sireesh Kodali , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring Subject: [PATCH v5 5/5] dt-bindings: remoteproc: wcnss-pil: Make supplies optionally required Date: Thu, 29 Sep 2022 10:32:09 +0530 Message-Id: <20220929050209.1464526-6-sireeshkodali1@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929050209.1464526-1-sireeshkodali1@gmail.com> References: <20220929050209.1464526-1-sireeshkodali1@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On MSM8974, power domains are not yet supported. The platform uses regulators. This patch marks either the power-domains or *-supply as required (instead of always requiring the power domains). Signed-off-by: Sireesh Kodali Reviewed-by: Krzysztof Kozlowski --- .../devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml index 2ba2b6cf11fb..45eb42bd3c2c 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml @@ -196,9 +196,13 @@ allOf: deprecated: true description: Deprecated for qcom,pronto-v1/2-pil - required: - - power-domains - - power-domain-names + oneOf: + - required: + - power-domains + - power-domain-names + - required: + - vddmx-supply + - vddcx-supply - if: properties: