From patchwork Wed Sep 21 04:36:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sireesh Kodali X-Patchwork-Id: 12983216 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 07D54C32771 for ; Wed, 21 Sep 2022 04:38:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231346AbiIUEiL (ORCPT ); Wed, 21 Sep 2022 00:38:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231283AbiIUEiA (ORCPT ); Wed, 21 Sep 2022 00:38:00 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C806F7C76D; Tue, 20 Sep 2022 21:37:59 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id i15-20020a17090a4b8f00b0020073b4ac27so4536277pjh.3; Tue, 20 Sep 2022 21:37:59 -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=ZBIGadPCYyhCRYzH7/ofjO2x1Ah7RZwTA2RiVAW8qmVzQhefE2bBH/XUwDGAzvN5e0 afk0LALfAj/s2k8RhsPNkbg1z2WHSgPN98rvFWKnji5fG7Es7lPlkVR8znXbTxmkVAog jOo0a6w4/ElCaa2gfvtQN/QDplicjLsHNZXFNv4GFv3w50ILY1Su32a5j+6D90HZ+qju NWa9KMRODZDQaNVkCC922mx+PAf4B0QopLYDrJ+YZWRg3fS2Mp9sIFlE4A1cbu3J3NSZ kUAOD2ubVq5CzeBF4OzZyKhJKNUW5e6sNi/5F4OmVxFpTrP+45RSgxEZM16XweCyDWIT W2yw== 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=UR9ciJQVszxikOEewch/ztAXa2dC7ff1LdFgz6IRftTOIsLT/p2BGgvPS1YcUu3VcO r9WmMWou4oYyB8gcN8Ckg2DJdmfrb/BkVIQJL7wFoWlGiyFkVzvtugV8li6Dd8vX+D0Q IBjW08IN0t4uSSaG4IKNi7EiOKxfAfJznPbKq6hc1PF6nTYyi9xMjq5GAADwR3h/hEXl o3z2kYWsktCRJltmeJ1X5ZkygyqLJapUkwT9FHj1izcX5SJho1SL81mO9YaubQepvD4W oNdgPFjZmmLIHjZvkn4P5o4QPo/zY59VPYyfDLgJgSDgSvdz6u9Ph5BPV8zEXZH3fC7B prCg== X-Gm-Message-State: ACrzQf3/eDY+yxpIMOENndVO0pPEYcw5desJniqr0IUuEHf2pgFwnYkd BuzJ9+4woj4jra+lP/pWQBzErUhSeLJJ3Q== X-Google-Smtp-Source: AMsMyM5DdZX/SFYSUWhTdABDq4D8cN85oFa2HwBqNCo0rcNJEt/EY52OG2GRZZgswAkoPCxqOBrxTg== X-Received: by 2002:a17:90b:2bd3:b0:203:1a03:6b1b with SMTP id ru19-20020a17090b2bd300b002031a036b1bmr7345748pjb.58.1663735078699; Tue, 20 Sep 2022 21:37:58 -0700 (PDT) Received: from skynet-linux.local ([2406:7400:61:8a0f:392d:db19:673c:627a]) by smtp.googlemail.com with ESMTPSA id t185-20020a6378c2000000b0042c0ffa0e62sm821182pgc.47.2022.09.20.21.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 21:37: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, Vladimir Lypak , Sireesh Kodali , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier Subject: [PATCH v4 1/4] remoteproc: qcom: qcom_wcnss: Add support for pronto-v3 Date: Wed, 21 Sep 2022 10:06:45 +0530 Message-Id: <20220921043648.2152725-2-sireeshkodali1@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220921043648.2152725-1-sireeshkodali1@gmail.com> References: <20220921043648.2152725-1-sireeshkodali1@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@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 Wed Sep 21 04:36:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sireesh Kodali X-Patchwork-Id: 12983217 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 91B49C6FA82 for ; Wed, 21 Sep 2022 04:38:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231361AbiIUEiR (ORCPT ); Wed, 21 Sep 2022 00:38:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231298AbiIUEiM (ORCPT ); Wed, 21 Sep 2022 00:38:12 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 019EE7CB65; Tue, 20 Sep 2022 21:38:07 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id b75so4737056pfb.7; Tue, 20 Sep 2022 21:38:06 -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=tI0KkUSNvhGhZYrmwE2JK7mdGhHWeK/tgIx66TUM+Xc=; b=YcGzBfBJLMay6gG0FphGd7sNw4Y32VoDggjauHTNUTkgiOXvR/KWGqpxhWAw0lF6Cf kJTINpUOya3zc61HEQH4ezeeQLeWrBv5laZzb5puMiczInOGgkkj5kOSPHFjcrJ36Mw4 FHowKZ0i3ljFUC31pBUe0PMN+whvtB2T9MdvwkfRMkOCxo12squqzvnLnorhpez8CfrM 33Cy5bsrCE0DtiAwo9DFlxFYbI6aq4CQIs2qpfX0WYbwgUpsxVy5+xxsY6CDb+r4tQTS qFZ6LSeo0N7qbuT0AtH98YERr9SV3439CpYs54zGQb8PH+jb7Lm+wtEAKI0Npt0g8n/4 u+zA== 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=tI0KkUSNvhGhZYrmwE2JK7mdGhHWeK/tgIx66TUM+Xc=; b=C6IfAOtWN8EoPeiOIYOew97Mj3yQhHbjrDznZZ8kdE8l5KkZ/pIu6zCvDh5P6PC9CG p/06Nh90+IXVBPjCD4H0+7N+iRoLgW04TjCsy2XP9F5tJnkbm2ETViNidEVT7LLN6/f3 AfY0UBZ1EsgorA0ufz++F4N6NqhnTn20r6jWqjcm6RrHVOUtllLVo8zPnelFtWisItLw j5K6pJpF16Z/2jg2AA0xQo/aL1bBb4HVL140zqAvwsD8BaV5anSb7Lg2lX+1m6MRjzb5 1+8xSJQFDEARonwE/Ap42l2tngrd827EEDNvViPTE92rVCu88dR2WGnuHgyuB4TA75yy oo3A== X-Gm-Message-State: ACrzQf0ylDRizXlr8/UG8I2SD4TUDpnq84OoXP/A+y93MGe/REhirPxN 6ysAE6LUNL/djsHRB70K+Nm1sflLcMnA3w== X-Google-Smtp-Source: AMsMyM5egigiCc1c0Z5xm4WpnKBpQwwbkYUV3gUFlB1/bBxiO+8WtuQY85RJmxuriU4o5oqLEzbPIA== X-Received: by 2002:a05:6a00:14d5:b0:542:9c32:ab27 with SMTP id w21-20020a056a0014d500b005429c32ab27mr26686304pfu.64.1663735085908; Tue, 20 Sep 2022 21:38:05 -0700 (PDT) Received: from skynet-linux.local ([2406:7400:61:8a0f:392d:db19:673c:627a]) by smtp.googlemail.com with ESMTPSA id t185-20020a6378c2000000b0042c0ffa0e62sm821182pgc.47.2022.09.20.21.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 21:38:05 -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 v4 2/4] dt-bindings: remoteproc: qcom: Convert wcnss documentation to YAML Date: Wed, 21 Sep 2022 10:06:46 +0530 Message-Id: <20220921043648.2152725-3-sireeshkodali1@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220921043648.2152725-1-sireeshkodali1@gmail.com> References: <20220921043648.2152725-1-sireeshkodali1@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@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 --- .../bindings/remoteproc/qcom,wcnss-pil.txt | 177 ------------ .../bindings/remoteproc/qcom,wcnss-pil.yaml | 267 ++++++++++++++++++ 2 files changed, 267 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..a99a1e5242f8 --- /dev/null +++ b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml @@ -0,0 +1,267 @@ +# 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 + +required: + - compatible + - reg + - reg-names + - interrupts-extended + - 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 Wed Sep 21 04:36:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sireesh Kodali X-Patchwork-Id: 12983218 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 0E91AC32771 for ; Wed, 21 Sep 2022 04:38:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231408AbiIUEi1 (ORCPT ); Wed, 21 Sep 2022 00:38:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231416AbiIUEiO (ORCPT ); Wed, 21 Sep 2022 00:38:14 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62F2F7D1DA; Tue, 20 Sep 2022 21:38:11 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id w20so4449334ply.12; Tue, 20 Sep 2022 21:38:11 -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=H9Lyby/AOHYpoRwKIB5rcnp3xciz8PrySMGo21yL8A8=; b=M1eghGyw8JviZ1oXKl1saV4WE/7JIVi7F+pxOHnmQHfJRv7foWtNuJUg+oSWcQXs9c /le3vx2Jnfs3Xbn2dgj3e1HRkE3/NM/BdxREnd5vSwbln+qda7UjXhJgXHx3lQu5Toz9 HxquzCpLSIbHNQkkmDpaeLA+Kx6DBrsCY1n+FlDXlU7/7MHfKPpur431VI8zgUUs2geh FI7mwfzWhSxqlLF/o9Kagi2lRq+bLkc7TwGoVlihGUpE0W2rZovCrGkjtG698LgYBTW8 Lkzeo6vFb0lsm5qVd3vD9pYGghcDU+MAcwJaGww+yVN9UIvfpSi1/F8OED95w5UxSKyS eDvg== 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=H9Lyby/AOHYpoRwKIB5rcnp3xciz8PrySMGo21yL8A8=; b=cmjVOGMYrNRN9F9TXO8j0fR1u42rhmta65/PhtT9Ka38uDPIdggfCI7/vUOlKpK9QV +mNLKErAGuA+qr8VU3w5mpT+c97hvUV/+vsCjF7lFoL9lrbE32Fd/VonjLLhPVnwK//V C5o1ACIBHN6aiLposhVFlA2u3qzzgo49w9OMfOiRW8BpHTltyRq2je5oB0GMoid01sbZ byQX3W8tELW3uFSLyXoEYBYYEpCXegtIr4WZJTF+XUue2fV51vb1INH1nlEX/ukNMLvv s15RPq+5LCifr+N7S47//+xwTceETKnWxieCdx5KqC6yiFo12qTCjKMmMzeJXQzgn2oq v/vw== X-Gm-Message-State: ACrzQf095bj32uzmbkKvTCAgjfeYxljnctkOAy6Qn+J3abIK9ZndeN0+ 0ze5xBHQZ4OAtfV5BAXeMvSkNcACdy7mmQ== X-Google-Smtp-Source: AMsMyM6BuzpcCHEyPpVgq4OMhJIlSePE6NeRODXptVtu0Xp6YIKeBVEiNZuyFXfU+T0AeZJ+eoUUhQ== X-Received: by 2002:a17:902:ea0f:b0:178:23f7:5a30 with SMTP id s15-20020a170902ea0f00b0017823f75a30mr2923586plg.150.1663735090323; Tue, 20 Sep 2022 21:38:10 -0700 (PDT) Received: from skynet-linux.local ([2406:7400:61:8a0f:392d:db19:673c:627a]) by smtp.googlemail.com with ESMTPSA id t185-20020a6378c2000000b0042c0ffa0e62sm821182pgc.47.2022.09.20.21.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 21:38:09 -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 v4 3/4] dt-bindings: remoteproc: qcom: wcnss: Add qcom,pronto compatible Date: Wed, 21 Sep 2022 10:06:47 +0530 Message-Id: <20220921043648.2152725-4-sireeshkodali1@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220921043648.2152725-1-sireeshkodali1@gmail.com> References: <20220921043648.2152725-1-sireeshkodali1@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@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 a99a1e5242f8..31232c59b22b 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 @@ -198,7 +203,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 Wed Sep 21 04:36:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sireesh Kodali X-Patchwork-Id: 12983219 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 2AD00C6FA82 for ; Wed, 21 Sep 2022 04:38:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231320AbiIUEif (ORCPT ); Wed, 21 Sep 2022 00:38:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231158AbiIUEiR (ORCPT ); Wed, 21 Sep 2022 00:38:17 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF0E77D1E4; Tue, 20 Sep 2022 21:38:15 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id p1-20020a17090a2d8100b0020040a3f75eso4533306pjd.4; Tue, 20 Sep 2022 21:38:15 -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=1ZAgs0EUhexlFlK2MZMbzZ6IVMi8WJy1viUVzYD9emk=; b=B9gRFLcUiPoQdLfXFk+lUJ+OgOkhVQf7e/z8hihQoXI4Y4l3r6KEMurIuznQ1TwjXT oNs8yHJiKyt14M/2LgG+gqEMwJsiWGKHuwVwzHuEJcYxenjIn9SMvYpJ8X0Ot7fwUtLb HeuiqZb3EQbrVFYGTUYs7VfGkz5HxrOHWjQiK9YBpLBhWxrpBYwgCJ2KoCfTBqRRZ8CN YGccEvmEfmjEAZzwLpyi2gCiA3cqEsWZbUr/bEhZm0762h2tK27gp6Bery7Pp3f2PsP4 nI5OE3exOijOTTUiows/yqICADZnUrSFGYCeSJYzU62S9PHL2ZKrzmEpnv9Mfwr+Ijv6 hO8w== 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=1ZAgs0EUhexlFlK2MZMbzZ6IVMi8WJy1viUVzYD9emk=; b=7gds61LZ6qZ058pSgHvsDnQa559Ecn00dAS8DYt7RkEN4NB6vYx1lniXs1c7CJAAba Ugctk1+fdjx7v3HYyFMF+xXvr+OOyMJLF1dJKEWXRYJR+GRg8HyaOm0nMXZ526xzQ82I j0kDi6e4uqmVkZE+D30v8u/zmkjnLQOcEsg36A6Xq/dYw7eEQVqyXhDD9yaeh8NtrKiG sWurPr2SYHDOySOFdxBUV/sATQd07L7Q2FNSz4GLbtJL8X+oUJKybhdtRugjgCacSj0A Ij5aDl7Pie+hTqiOPIQeC/OtN1OvKQYRZdBNtVxvtmGHQGrEH2eOx8n1uhgOrxZ0Cp9d Ah4Q== X-Gm-Message-State: ACrzQf3R2afBgjjorJIlmtNeE1X9wXhl/MWanz7mKTBkeXYi55EgV97x Mm7W7DBfzpdHdiw+ebs5oR88aVtkW2YGZQ== X-Google-Smtp-Source: AMsMyM7gTldbBKgeoo+KYBFYwn+kQJCUC9DtOchu7WIkEY62Vl99e1lguy3POjnJvxtEufrAcXveRQ== X-Received: by 2002:a17:902:be01:b0:176:8bc3:b379 with SMTP id r1-20020a170902be0100b001768bc3b379mr3024831pls.109.1663735094713; Tue, 20 Sep 2022 21:38:14 -0700 (PDT) Received: from skynet-linux.local ([2406:7400:61:8a0f:392d:db19:673c:627a]) by smtp.googlemail.com with ESMTPSA id t185-20020a6378c2000000b0042c0ffa0e62sm821182pgc.47.2022.09.20.21.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 21:38:14 -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 v4 4/4] dt-bindings: remoteproc: qcom: wcnss: Add compatible for pronto v3 Date: Wed, 21 Sep 2022 10:06:48 +0530 Message-Id: <20220921043648.2152725-5-sireeshkodali1@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220921043648.2152725-1-sireeshkodali1@gmail.com> References: <20220921043648.2152725-1-sireeshkodali1@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@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 31232c59b22b..639c52284f4f 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 @@ -197,6 +198,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