From patchwork Thu Sep 7 10:02:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 720654 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 E6C1EEC874D for ; Thu, 7 Sep 2023 17:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245521AbjIGRsJ (ORCPT ); Thu, 7 Sep 2023 13:48:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245662AbjIGRsA (ORCPT ); Thu, 7 Sep 2023 13:48:00 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9CBE1FCD; Thu, 7 Sep 2023 10:47:40 -0700 (PDT) Received: from authenticated-user (box.trvn.ru [194.87.146.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.trvn.ru (Postfix) with ESMTPSA id D924541787; Thu, 7 Sep 2023 15:03:05 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1694080986; bh=pm8ZM7bBeQBKsa4OPWQEylcBIFC5Xf4nYLFzqlL388I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=s0gM2fxjGfV+St9BdOloZLMaExEG3oFKdIQPxV3SDoIF/xO2VkKGVz7xXeABJA95Q eQkgyYYAoKrtI7DS828LCItiiz/Mmj8wlMZnwQe7i+geaEoTHpcsV2Z3bgtot2u7Jy bkxBTZjYn5/0JysIV1s23iS7TPVZZvQ3F96piotFPgEUFQyEQXlR9bKEprZg2aYAD/ 6pDyScLpfWt4xkrK0/VyaRWg+ZLEIw0Fa03LzGKta4YfMGgsWt2jnJOqtJJ1zRMn1U SZYe9iAS/bVOzMBYatPPdJhbXtDMGotXzagY9Y5CGoQPWWp3ue0fhUh0OKL2E+7J0y jD784KC7lmqEw== From: Nikita Travkin Date: Thu, 07 Sep 2023 15:02:34 +0500 Subject: [PATCH v3 1/4] dt-bindings: remoteproc: qcom: sc7180-pas: Add ADSP compatible MIME-Version: 1.0 Message-Id: <20230907-sc7180-adsp-rproc-v3-1-6515c3fbe0a3@trvn.ru> References: <20230907-sc7180-adsp-rproc-v3-0-6515c3fbe0a3@trvn.ru> In-Reply-To: <20230907-sc7180-adsp-rproc-v3-0-6515c3fbe0a3@trvn.ru> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: David Wronek , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Nikita Travkin , Krzysztof Kozlowski X-Developer-Signature: v=1; a=openpgp-sha256; l=3285; i=nikita@trvn.ru; h=from:subject:message-id; bh=pm8ZM7bBeQBKsa4OPWQEylcBIFC5Xf4nYLFzqlL388I=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBk+Z/XJ/vTxCamBOQhP7BjTybQrgkfYGsTLkJ7D mpFwKj0olmJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZPmf1wAKCRBDHOzuKBm/ dQnID/9Ah/OuJD2tpbhNR6p0WjG2sRU9vxP7wYChZDk6ASgsLgUfl7W21G3nGa3R/aIg76tz/49 1MUNTeI/MBvj56B1npedqFiKNvzPBBseMc2u9Hcgn0N8mD5zVhf9tgybKmqBQygKHyC+384x3JA FTQJ9cDonOjqL8fUpK01Cl1c9nskRvavBwb5AuVUWwzPL/IoIDY3ekNsv0AiJchpsHPIMO973ZZ qKGNLnUP3khjyh3AYi8254uQs5SH5ea3hiriraxQUqnPnPSS5vuClH1Oz40SJnU5vDJd8+nlScS Xw3v+3VJqMW576TCf5t0ASy2e/Mr+sgzZXNBN/jG8FZEAsR5uZ86I3r182IUw/f5rwI6nhHAbc2 kpIscD7YXb9BjfxURulmGauBw9KUoctpcoDrcgauaLdd/d8G/1w8ZSBnPv5hF6tMznWRFR54ykm 5DXSVyrP4ibNyrHbt6ALodDwXTfUjsH2mAjdcnbR1tJ2OORJS9gbWWXUTzg/R36PV1NibNlupFf U38BJDjI3BUXeURP0zmTTDHas893POMv+za/kf7Wu2iyb6yLG2H9fRf0dyz82Kf4ARDUK9EXFhe Xfd743tL3ZueWfFYL6mg2M+q7mp6FSUW+nkqGSb4Sv9Xp6s/rIKqxktIZSRo6CtKHzqoyW1X/da Qy4G534+Rsu6Zag== X-Developer-Key: i=nikita@trvn.ru; a=openpgp; fpr=C084AF54523FAA837E2EC547431CECEE2819BF75 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org SC7180 has an ADSP remoteproc. Add it's compatible to the bindings and refactor the schema conditionals to fit the ADSP. Signed-off-by: Nikita Travkin Reviewed-by: Krzysztof Kozlowski --- v2: Refactor similar to qcom,sm8150-pas.yaml --- .../bindings/remoteproc/qcom,sc7180-pas.yaml | 81 +++++++++++++++------- 1 file changed, 56 insertions(+), 25 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml index 689d5d535331..f10f329677d8 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml @@ -16,6 +16,7 @@ description: properties: compatible: enum: + - qcom,sc7180-adsp-pas - qcom,sc7180-mpss-pas - qcom,sc7280-mpss-pas @@ -30,26 +31,6 @@ properties: items: - const: xo - interrupts: - minItems: 6 - - interrupt-names: - minItems: 6 - - power-domains: - minItems: 2 - items: - - description: CX power domain - - description: MX power domain - - description: MSS power domain - - power-domain-names: - minItems: 2 - items: - - const: cx - - const: mx - - const: mss - memory-region: maxItems: 1 description: Reference to the reserved-memory for the Hexagon core @@ -71,6 +52,40 @@ required: allOf: - $ref: /schemas/remoteproc/qcom,pas-common.yaml# + - if: + properties: + compatible: + enum: + - qcom,sc7180-adsp-pas + then: + properties: + interrupts: + maxItems: 5 + interrupt-names: + maxItems: 5 + else: + properties: + interrupts: + minItems: 6 + interrupt-names: + minItems: 6 + + - if: + properties: + compatible: + enum: + - qcom,sc7180-adsp-pas + then: + properties: + power-domains: + items: + - description: LCX power domain + - description: LMX power domain + power-domain-names: + items: + - const: lcx + - const: lmx + - if: properties: compatible: @@ -79,15 +94,31 @@ allOf: then: properties: power-domains: - minItems: 3 + items: + - description: CX power domain + - description: MX power domain + - description: MSS power domain power-domain-names: - minItems: 3 - else: + items: + - const: cx + - const: mx + - const: mss + + - if: + properties: + compatible: + enum: + - qcom,sc7280-mpss-pas + then: properties: power-domains: - maxItems: 2 + items: + - description: CX power domain + - description: MX power domain power-domain-names: - maxItems: 2 + items: + - const: cx + - const: mx unevaluatedProperties: false From patchwork Thu Sep 7 10:02:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 720892 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 C80ADEC8750 for ; Thu, 7 Sep 2023 17:48:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245627AbjIGRsL (ORCPT ); Thu, 7 Sep 2023 13:48:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245657AbjIGRsA (ORCPT ); Thu, 7 Sep 2023 13:48:00 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B1A1FCA; Thu, 7 Sep 2023 10:47:40 -0700 (PDT) Received: from authenticated-user (box.trvn.ru [194.87.146.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.trvn.ru (Postfix) with ESMTPSA id 9C77442458; Thu, 7 Sep 2023 15:03:06 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1694080987; bh=FNIibyarmPCAlhz6Ut7njgzIVJSbI2KFycVZdOK+Y8k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hHanS4TA/Iznd0l18LShVGXLxevYyPmWfjmxKJNP+QCwba+tWrL1LDH5KospReRel Zod6gB3MSGX7gbpHMv0qIe8Ki8BV8E0RlDaeYODC9HDbGFpo+twJWqFbotzWSpx9B9 BqEumZCcTJYGTZ7MJI0JPif5oEgZ0uUaffe9atkd5fdTX4hDXbkBm9EM7iwCm5ufFA uM2BlqJxGnQd9kjr/oD+1SCVxA5gM0ygWQx40Wbi9s7AMHrRZI/99JjAx9EFAvGX8f cff8vJfgpcGfO/vnnfilFuAh/P492FRBzOXt3kcVIFsDEyx3E4tz2jr4l4x66NkdVY U9Dnggsob9Q+Q== From: Nikita Travkin Date: Thu, 07 Sep 2023 15:02:35 +0500 Subject: [PATCH v3 2/4] remoteproc: qcom: pas: Add sc7180 adsp MIME-Version: 1.0 Message-Id: <20230907-sc7180-adsp-rproc-v3-2-6515c3fbe0a3@trvn.ru> References: <20230907-sc7180-adsp-rproc-v3-0-6515c3fbe0a3@trvn.ru> In-Reply-To: <20230907-sc7180-adsp-rproc-v3-0-6515c3fbe0a3@trvn.ru> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: David Wronek , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Nikita Travkin X-Developer-Signature: v=1; a=openpgp-sha256; l=1130; i=nikita@trvn.ru; h=from:subject:message-id; bh=FNIibyarmPCAlhz6Ut7njgzIVJSbI2KFycVZdOK+Y8k=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBk+Z/XWGIHKV9LtS/kaJFlmhh9V6OSlR4C636Cj 6LqFciJPx6JAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZPmf1wAKCRBDHOzuKBm/ dWqiD/wKDJvYnFP+A/getQteeoWbURpaqo/5aKW8AOtEo/CsT6UA/ZgP49NNXSLPnhM9Fet8QPB Z+rDe2ATJigMcxuT14NJuhe4UlPFpWpzIcn54H691eXriRnpmC+CVNmxJll5IFMUYbeFj/c7stq j5PIg/aDmQ3lUmhpusvSOYnnJdK/SrbzXDwhdT8/kQehr1WqSW03m14Pf8JQ4/So2YzkXCN7KQI ZwURZFwO2uQdw0s775ofXERFOAa/cm2qBmmcq7r7+Mgp/fnmj+SHDKIKbF7Ctpo/uOHlkWlvUwz aLGa3gGgRnGkEFl9AWS6HzH5XUwSxnFDnPHuDSzw+QLpB0YV/CSPTrC/pc0jyu6hhyrvcEr/bMC +etPPEZnDKNO2s886+toVyxy5vSLE8inWBZZuEPUaEIDN+PsA0miSiDCyI5o+ITv66aR5q+Qkbr HZ8E/1nIlG2QhT76afM3OY9TNRha/MSTkUaHQRknZL5dseOpLsDhbBM9QHWs38FHjifJgTxV+KO vH3cKllPJSVFYod6TzvYKL+G5+lSRjlQuvnQhzU2gooUS0UJhJVYF/tKypK1+84ZHZsOP9uB6Hu z3o8nvGtHrcWPgtWgOfXqaYT3166XBEELZ9ARTNOOzPbuyucyajr4n9pYT+v/wOK9InROIH799y yw5alrt1fAXzXJg== X-Developer-Key: i=nikita@trvn.ru; a=openpgp; fpr=C084AF54523FAA837E2EC547431CECEE2819BF75 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org sc7180 has a dedicated ADSP similar to the one found in sm8250. Add it's compatible to the driver reusing the existing config so the devices that use the adsp can probe it. Signed-off-by: Nikita Travkin --- drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index b5447dd2dd35..55fafc68200e 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -1161,6 +1161,7 @@ static const struct of_device_id adsp_of_match[] = { { .compatible = "qcom,qcs404-adsp-pas", .data = &adsp_resource_init }, { .compatible = "qcom,qcs404-cdsp-pas", .data = &cdsp_resource_init }, { .compatible = "qcom,qcs404-wcss-pas", .data = &wcss_resource_init }, + { .compatible = "qcom,sc7180-adsp-pas", .data = &sm8250_adsp_resource}, { .compatible = "qcom,sc7180-mpss-pas", .data = &mpss_resource_init}, { .compatible = "qcom,sc7280-mpss-pas", .data = &mpss_resource_init}, { .compatible = "qcom,sc8180x-adsp-pas", .data = &sm8150_adsp_resource}, From patchwork Thu Sep 7 10:02:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 720894 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 A15A1EC8753 for ; Thu, 7 Sep 2023 17:48:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245582AbjIGRsK (ORCPT ); Thu, 7 Sep 2023 13:48:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245653AbjIGRr7 (ORCPT ); Thu, 7 Sep 2023 13:47:59 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B8E1FCC; Thu, 7 Sep 2023 10:47:40 -0700 (PDT) Received: from authenticated-user (box.trvn.ru [194.87.146.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.trvn.ru (Postfix) with ESMTPSA id 4A47D42459; Thu, 7 Sep 2023 15:03:07 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1694080988; bh=i1gk8JxNVLETk27EA9LrnzcpBehXDaBm+IlRLdJDN/Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=u0KlIlCjEyFQ/R0nNYQyXOnuhQbPxf5Ji00AtK5s+HwlKOz6KYdOaSWKXs5BN0Gfy hjtwYeBi9BWSOf0y2PJ/v54DEGr4Iz5JPiQTz93tC0ivdYCC3oJAkiaGOAwTkq+d0f QUGe0yWL8R/0O6T8vgXZlFEktQURv4tK973EmqnswrCAbvBm/XMBN2yoJg2lstLo6L +PmG81T70PnfpCXULiIAJJeTFvakbKoq/pILbKpiQuvg+nlPKTzqJbQ2eeEgT0k1pE znUrLR5XyFHmNb4dTyDMlthoc23hxj04i+jmEu6Kd1hWmPQUG1o3LNVuQL/Qus7pwP NHVJ3zU2fJ78Q== From: Nikita Travkin Date: Thu, 07 Sep 2023 15:02:36 +0500 Subject: [PATCH v3 3/4] arm64: dts: qcom: sc7180: Add tertiary mi2s pinctrl MIME-Version: 1.0 Message-Id: <20230907-sc7180-adsp-rproc-v3-3-6515c3fbe0a3@trvn.ru> References: <20230907-sc7180-adsp-rproc-v3-0-6515c3fbe0a3@trvn.ru> In-Reply-To: <20230907-sc7180-adsp-rproc-v3-0-6515c3fbe0a3@trvn.ru> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: David Wronek , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Nikita Travkin X-Developer-Signature: v=1; a=openpgp-sha256; l=902; i=nikita@trvn.ru; h=from:subject:message-id; bh=i1gk8JxNVLETk27EA9LrnzcpBehXDaBm+IlRLdJDN/Q=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBk+Z/XWAZ81NG9cEWoNg/arlUET6ey+BLy29toe Wr9tHGgESaJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZPmf1wAKCRBDHOzuKBm/ dZrBD/40ON6dfhALiXYIP2wA8AEpmPlhYxum0hVFhtLUEp2SrmrFrNDn3zGTI3NJu1lbw4pd3SQ bkRptK1wxvCRSqvzchrkIK5/+KkO3Ps10s9TRYykKHRcN1+kWqOTj6LeWOJw2iVKHRedWzFN+RF UHdNuoOjVOMO8Mso/6N1IMHNYUzMgrOm3xnPp5Is49Ejv5I4YjQFFPkv0ak6dsKlYZBMfGy/iJm 2LJQPBYJWia+5gqoMWL6oI/XOr41HuWlKFrxruGWoPRu5/fxQWu1qlX27YmTM/N1Cc6DjXzg/h0 7g/yKTxlN3D4sebbFhEc8hOgLit+nxUG3IwjNiwAi78ESs86i1sTZ256ORDZPlkZAnU42P82ku4 iz/Apz1wHgmML9G2UaH73/1jOJinKO/Wzd4jNC33FHHR2yY5mQwEA9hGA1FQD1GZ1qkONcb5cyy ui+FZmhralwjDsd7Iroe7Lcqg95a7LAUXFq59wvpLNdpmqFDFLcLMCXGppOcJJFlGW47FJhuOg1 QvPidWEFhk0BpB89Ckn+IwXG1dSYqN8+h1jXHdTINP7X4eJL6e00jscuZf6+vh1DiEN/v74x8u2 Ne4cTR0Oh+VxGqHx0bQSjzorpbCld4hpIhhrvjxYhLSMhssLMwQWiLVAV9ei0maYqDsHCqPVjXu S64vG9dKwwTjvsw== X-Developer-Key: i=nikita@trvn.ru; a=openpgp; fpr=C084AF54523FAA837E2EC547431CECEE2819BF75 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Some devices use tertiary mi2s to connect external audio codec. Add it near the other two i2s pinctrl definitions so the devices don't have to duplicate it. Signed-off-by: Nikita Travkin --- v3: reorder the node to sort by pins --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index a79c0f2e1879..322fa478515f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -2042,6 +2042,11 @@ pri_mi2s_mclk_active: pri-mi2s-mclk-active-state { pins = "gpio57"; function = "lpass_ext"; }; + + ter_mi2s_active: ter-mi2s-active-state { + pins = "gpio63", "gpio64", "gpio65", "gpio66"; + function = "mi2s_2"; + }; }; remoteproc_mpss: remoteproc@4080000 { From patchwork Thu Sep 7 10:02:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 720893 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 99316EC8743 for ; Thu, 7 Sep 2023 17:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245625AbjIGRsK (ORCPT ); Thu, 7 Sep 2023 13:48:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245660AbjIGRsA (ORCPT ); Thu, 7 Sep 2023 13:48:00 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9F1A1FFC; Thu, 7 Sep 2023 10:47:40 -0700 (PDT) Received: from authenticated-user (box.trvn.ru [194.87.146.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.trvn.ru (Postfix) with ESMTPSA id DC57B4245A; Thu, 7 Sep 2023 15:03:09 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1694080990; bh=StFemIF/2ACZvZh/Pxi85yeBz6CK2ME+JWLfl5kUCzw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=f30AMxqbk0xdk+4TMKvlx5bJI2pcI93dY8gIwoTAdmuKrWOEPpCM3CngiMIIKVEJK 8mObrrMSKoMUr9kdiNJbQFijLj0qziTT5EIVYmOVYjN55NGOy4jycWx+1p7tuLSfbN 1oc+3SYWs3tlRpOGow2zT9UR+mTh47PPfLP+5uM2UxhGV0GaXHgvuvK3mf8pBzZwuB Esy0UEmH15dAzSwRL1IwoNBGXvf+RFA7U4oDUv0F4pfs3e/utQUXL14fF41J6JXs8i 71I6uMOMRgEAgXV5R8MyvXoRJBc49kzLbcTmRnQ2b3IXpoQapDl+1Ka8GliaUwEp/I YBZWvHVnxRwVg== From: Nikita Travkin Date: Thu, 07 Sep 2023 15:02:37 +0500 Subject: [PATCH v3 4/4] arm64: dts: qcom: sc7180: Add ADSP MIME-Version: 1.0 Message-Id: <20230907-sc7180-adsp-rproc-v3-4-6515c3fbe0a3@trvn.ru> References: <20230907-sc7180-adsp-rproc-v3-0-6515c3fbe0a3@trvn.ru> In-Reply-To: <20230907-sc7180-adsp-rproc-v3-0-6515c3fbe0a3@trvn.ru> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: David Wronek , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Nikita Travkin X-Developer-Signature: v=1; a=openpgp-sha256; l=4341; i=nikita@trvn.ru; h=from:subject:message-id; bh=StFemIF/2ACZvZh/Pxi85yeBz6CK2ME+JWLfl5kUCzw=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBk+Z/XXACb1HQKlfdqcudVWbdURrRzfhFbQvUWq VfnEkqxIfqJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZPmf1wAKCRBDHOzuKBm/ dbkMD/4hGWIxQrkM2fnC2ef1yMyx8LWMltMVgtwmULrymGHd76pRuIH1Ecra8sCFayqiV/Q5mFk /9XIxv/RMMlwtVuLD82MsAC+btLCWeELNhTyDMj2wD2nC4aab/sHGbLv3mwCw0rtGnN7ehB4aq5 kzsgVMNBweT6ese3thUdNwSw9NPmbgnVkWDeGNMyj8AtNzl17697FYotkjS27CBcSp5Z34zFXEM HeRxrB9Fu/1TH66SPNvx8njJ9mWn2iDQ3oi4Ze5A6quXmJq+18nrkgj/yv99jR6eAclXDtF2n70 eBF5iXoAPI95b9qDZH4Y6l3oRI5vZ4FihMlg2B/dfhpf3bRaJMyPv0RmK2q8nLAoWdYMGHKvozE dYBUCYh3TfB3VOC/rlz9wBfSQsqRjih6OKU5DLZAZq/xNh+GmlKv4GaLWXunet6tdoHBh2bQ1En JkNrUlQwNIwOihxpifpGU5VJ1VIIj+llSyrIyos3SSUKJwg6OrpM/zsAs/ahC5egRivDuiChV48 Qta3QA6XRrHxMOyzuLFmnAtW0iT9FDAOlUk8B9G4QuaDfpwDY3k3BvkeyNHQ5e8lUlSUvOa7a4C 6gF8pdoY6TYQKjMLknZsfRM86d+rSgtyKRnThmYTANqI7oI6w+Wi+I7MjmMO3KKs2UblsWwh8Te qQ3xsLEZMhRxT5Q== X-Developer-Key: i=nikita@trvn.ru; a=openpgp; fpr=C084AF54523FAA837E2EC547431CECEE2819BF75 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org sc7180 has an ADSP remoteproc that exclusively controls the audio hardware on devices that use Qualcomm firmware. Add it along with the relevant audio services. Signed-off-by: Nikita Travkin Reviewed-by: Konrad Dybcio --- v2: rename service nodes according to the schema, reorder properties --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 122 +++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 322fa478515f..eca1c34d2306 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include / { @@ -3781,6 +3783,126 @@ wifi: wifi@18800000 { status = "disabled"; }; + remoteproc_adsp: remoteproc@62400000 { + compatible = "qcom,sc7180-adsp-pas"; + reg = <0 0x62400000 0 0x100>; + + interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", + "fatal", + "ready", + "handover", + "stop-ack"; + + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; + + power-domains = <&rpmhpd SC7180_LCX>, + <&rpmhpd SC7180_LMX>; + power-domain-names = "lcx", "lmx"; + + qcom,qmp = <&aoss_qmp>; + qcom,smem-states = <&adsp_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + glink-edge { + interrupts = ; + label = "lpass"; + qcom,remote-pid = <2>; + mboxes = <&apss_shared 8>; + + apr { + compatible = "qcom,apr-v2"; + qcom,glink-channels = "apr_audio_svc"; + qcom,domain = ; + #address-cells = <1>; + #size-cells = <0>; + + service@3 { + compatible = "qcom,q6core"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + }; + + q6afe: service@4 { + compatible = "qcom,q6afe"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + q6afedai: dais { + compatible = "qcom,q6afe-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + }; + + q6afecc: clock-controller { + compatible = "qcom,q6afe-clocks"; + #clock-cells = <2>; + }; + }; + + q6asm: service@7 { + compatible = "qcom,q6asm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + q6asmdai: dais { + compatible = "qcom,q6asm-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + iommus = <&apps_smmu 0x1001 0x0>; + }; + }; + + q6adm: service@8 { + compatible = "qcom,q6adm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + q6routing: routing { + compatible = "qcom,q6adm-routing"; + #sound-dai-cells = <0>; + }; + }; + }; + + fastrpc { + compatible = "qcom,fastrpc"; + qcom,glink-channels = "fastrpcglink-apps-dsp"; + label = "adsp"; + #address-cells = <1>; + #size-cells = <0>; + + compute-cb@3 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <3>; + iommus = <&apps_smmu 0x1003 0x0>; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + iommus = <&apps_smmu 0x1004 0x0>; + }; + + compute-cb@5 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <5>; + iommus = <&apps_smmu 0x1005 0x0>; + qcom,nsessions = <5>; + }; + }; + }; + }; + lpasscc: clock-controller@62d00000 { compatible = "qcom,sc7180-lpasscorecc"; reg = <0 0x62d00000 0 0x50000>,