From patchwork Tue Sep 5 10:41:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 720166 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 D51C6CA0FE2 for ; Tue, 5 Sep 2023 16:07:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239185AbjIEQH0 (ORCPT ); Tue, 5 Sep 2023 12:07:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354315AbjIEKle (ORCPT ); Tue, 5 Sep 2023 06:41:34 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85AB219B; Tue, 5 Sep 2023 03:41:29 -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 C7B8B40901; Tue, 5 Sep 2023 15:41:24 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1693910485; bh=5X6bS83dR5lb+qK0sMD+3oG1cICPkLl1zwdMx6oXekY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=QWCSGcKum8S1MQh/1yjncjlJMRDvr5yCtUESE5uP6hr32+dhow5Qh0KOUG2uZ93tM 77vHFsn62BbnLYzX4Y1G9Wkvzd/n8syp6f2k7RNlU9uxSxSmx77VlYuBMe8sswK6v8 miCHLMEWQ4yyDuhUi4PXPWLVXqoDsGxz30Bl+aqPEv3bYBxQLOc2VzzEM9Nli1yCUD ay6j7DGeXru2x/quCeKv06GTJ6Jveeb+Xm63B5S8e71fMuFS21psLIwGWIrB5Lc/zQ KqEwpKJSxKI5+j5/vWLACj23A6a8FTLXoDTpckEjfOGgF/YCVVNJrdhpsg2PnwCbrv G+U5tosQdCzSA== From: Nikita Travkin Date: Tue, 05 Sep 2023 15:41:04 +0500 Subject: [PATCH v2 1/4] dt-bindings: remoteproc: qcom: sc7180-pas: Add ADSP compatible MIME-Version: 1.0 Message-Id: <20230905-sc7180-adsp-rproc-v2-1-8ab7f299600a@trvn.ru> References: <20230905-sc7180-adsp-rproc-v2-0-8ab7f299600a@trvn.ru> In-Reply-To: <20230905-sc7180-adsp-rproc-v2-0-8ab7f299600a@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=3218; i=nikita@trvn.ru; h=from:subject:message-id; bh=5X6bS83dR5lb+qK0sMD+3oG1cICPkLl1zwdMx6oXekY=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBk9wXS9a4u1GPmPNECBLFyPNyHqh0AKohOSUsl2 zXxfcghlJiJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZPcF0gAKCRBDHOzuKBm/ da8BD/wJEL+X116C8CeY1MXML5i47+rfkWYLhk/GHMTpv6zXdITpB0YWX/7tiZH1BW15tnBQhjB 6hezr5uvN9Ez5P3B0dJZ4nbXpRK/78aL45YVFAME8VQ4t/V34IqnQRGz7UqzjrQBc1YQFmIeCGy +vZPOHwKkK99DVKhvcjYnLjOu8sKPRZEJbPvIotRi3L686GhQAT+cOfKsYA6W7Ls0T5n6YYkPjG ndFkT2rT9JPVJTuY0zGWBCeOO1PNO2hovdaAEu60GUGmNZS4CEe7PMmtpLNbjCXm4l1bdRwEm6Z 1vFytGhsH7SHF4zrj5MDmHK6JQucoAcjVsF9WAtdhd3ie3wwuyoL/hta5AFuMoDED86kEA2e6hG Z9t25ACZTPACvtpWHF2EkKcP5YzvhuT4wkYF0JXbm9yKRKKHSQcVnlzz1I6ojFh/n+n4dpTQfgv Dl9Zqnfx4IZHsxj/iDv6G7IBJqTpIutbR3Y3+8F0E9sSnl188aEUxUe4FiTVPBsZLZ/SbfPRWCC vmkC0LCeU84D5IdCB3mG4Pl+nsEuaMTYaCSHi3JgpO2jod7T/gDLe4a9qtA71NLqLRRDR/HnYbe SB4pVWTjjbdNxPEH2d4c6acULENypzdOOBLPD7tOhdpNRWSvDOQ1SnQVhcnJSYU8fmc9ecRy6Ht aMMYX+XqSCfflug== 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 Tue Sep 5 10:41:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 720446 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 EC9A7CA0FE2 for ; Tue, 5 Sep 2023 16:06:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238692AbjIEQGq (ORCPT ); Tue, 5 Sep 2023 12:06:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354318AbjIEKle (ORCPT ); Tue, 5 Sep 2023 06:41:34 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A45AA1AE; Tue, 5 Sep 2023 03:41:29 -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 782EA42425; Tue, 5 Sep 2023 15:41:25 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1693910486; bh=FNIibyarmPCAlhz6Ut7njgzIVJSbI2KFycVZdOK+Y8k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jVRHYAPuFwcBzBq3OM4gqA2V1jKYKbe7tl4k8iQL0B3hP7g6v0yPMIrVUSCsCWM14 6Ulya6cHdZmB/5c8XrrEWhTOYOlkfUwobCRKE2GZBYr/zBx3PxJohtEOY41fEy4r5H aUNAA7bfNdWuM+L9b8uVeaZWzRCrfq1gat5uV+8dl0yRWgQ+PlCbmVHHO92HbSkEx+ 6gD3F91RfavcoLHigg1lcl0wNlGNaTw9yZUilgi05djKh9Dkt91849zkOEsCgWaxBy 8y8wRgu/t/V7Upd01hjg05sGERkpi8C+TLr4kQ+TYthMW38qTy5hEoffbD7o/ZneX8 96NXjdfPGES2g== From: Nikita Travkin Date: Tue, 05 Sep 2023 15:41:05 +0500 Subject: [PATCH v2 2/4] remoteproc: qcom: pas: Add sc7180 adsp MIME-Version: 1.0 Message-Id: <20230905-sc7180-adsp-rproc-v2-2-8ab7f299600a@trvn.ru> References: <20230905-sc7180-adsp-rproc-v2-0-8ab7f299600a@trvn.ru> In-Reply-To: <20230905-sc7180-adsp-rproc-v2-0-8ab7f299600a@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/ZANAwAIAUMc7O4oGb91AcsmYgBk9wXSdXpuqquc9zOeOuVZKyipoF7wARAYEaovj 6NrvwsAXoCJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZPcF0gAKCRBDHOzuKBm/ dV7hEACgIYyv1e5XGRTTLqaKQs7YYbjQVpET7tHenKQF9hm6XJWZ3XJ2JOhasO/s4YC5QMpTc7p WTxHmGiTkfu373RgkULXYk+ndTECVFpArH6TmednqlOHuLOhFAtVxwPwvicxaPbz4Un0g6XGdcc MZAhtsL8CeakenfOWfBiLPec1aP9uOIwuCRGjkXfcFKwdOcuTwfmM+3Eoe0TJUl8WO1tngQ3w92 Bnhstjzpk8VAK0HFsKXpQgBwnhdOYXl8+lRtF+s2qMXpaKIpQOKpWxOSC6INInbX44lx3puSvjW GuD0Gy2GwAkNsuTtZYibPMfI1BS90u6HFuxDdMNQb4P67bvLQuTh4BpkFtD4SKRpW6peA6QU2ix sT4oI7v6R+Xcu29MpuZ4yK5WdEj0SreOyvsNVCytaxBD5McsvgN9xUgQGJI0YrISn1hl0sXPzn/ RF/JJ32TGuiH2ZmyxNt9iiFDgEHskzGvYSrFAuGy6xt77wXkoDO12lEVghvO9zMfwFqsgll61rb UCeoW2c859qJs/XUogBjvp5A76C/pqoqu8oKQ2ixQjo3Jzu1EwGjNYxABCfCMpg7Y1SRLK5gn6j 3ySoseJe+ysKImwq64zC6gfDKv4rMaXdGR90yqUEKWLsgTU8Qm8mFvA8AJDzZENXDTG2znxc8m8 4ekcc1wWfEsDEBQ== 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 Tue Sep 5 10:41:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 720438 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 F18D2CA101D for ; Tue, 5 Sep 2023 16:17:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239433AbjIEQHz (ORCPT ); Tue, 5 Sep 2023 12:07:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354319AbjIEKle (ORCPT ); Tue, 5 Sep 2023 06:41:34 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B7F2199; Tue, 5 Sep 2023 03:41:30 -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 2F2FD4242B; Tue, 5 Sep 2023 15:41:26 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1693910486; bh=94WYtO7i7RiviKXkVzwc9KKusQ2/IejlQ7IgqMIIY1A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=L80XpvZU7H7SvQt2ecdc898YK/WBUHJHnwHKmNwTZ2/WEgxV1+RWk1VNsFQGhI0pc 0iT3j7DBHu3CSfFQIB+HCOZIqnvv3NxzSAa3p1EuVMOAINBNMO1OCnzLCQ+dm9KcIj fIkX7r+Kv81tyYExW5i2tp1tn/vE/JPTVHjK5cSJUTATONI1ARdJMmqFZ8zhmZhWoF kW47GxDuuUO6ZbRPJG7ek79CWskn1/Ff51xbWwgAanUMHZrhXjQsGtNVQHv0OP2X4I LN/zhOBGCTh647odYTSWztbo2Fr4By7Ic5D5o/4/BRwRIk3UO9/fb655EDX+PPf7jk Z8IBZuDi/WP7Q== From: Nikita Travkin Date: Tue, 05 Sep 2023 15:41:06 +0500 Subject: [PATCH v2 3/4] arm64: dts: qcom: sc7180: Add tertiary mi2s pinctrl MIME-Version: 1.0 Message-Id: <20230905-sc7180-adsp-rproc-v2-3-8ab7f299600a@trvn.ru> References: <20230905-sc7180-adsp-rproc-v2-0-8ab7f299600a@trvn.ru> In-Reply-To: <20230905-sc7180-adsp-rproc-v2-0-8ab7f299600a@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=900; i=nikita@trvn.ru; h=from:subject:message-id; bh=94WYtO7i7RiviKXkVzwc9KKusQ2/IejlQ7IgqMIIY1A=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBk9wXTsVlB9eNjv/aj1o7kXK7yZ7p9bFsUk6VH6 6c9KvgEiZiJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZPcF0wAKCRBDHOzuKBm/ dZVSD/4pbLCXZoltv+ovAsy2xX5qonlpOXEjzAzwzfDgsV5xwBND0zuHByzRO2B8hZXRQ0fFIE6 kWcVMHxV/MgE4w4x3LEJyt13MqWGb4s+Ltas2yESsWZ5xDfpkVq/sfB64ZNCHcldIrmrJlKDAIs viH7wlO+MBgnnr3ZnY4q30tyekLkaQ+p83ZrBSErxOAY/MDaGWFz+VFb96jEigdhYw/2iG74Lqo u0WruZdEvZuXL3QxWz09xqIpAWP/A0XrNuJmrUXJvbxUnXYJx9VGgYTJ7yyBFYHTmE7Qu6LRTyt MDVl3XBGxtMJ5pli6AA5MwG/zav0YfF8AblFNswUBf9prRkL9I/SnuqKHEjVbvR9tPpB3hl+18d 3jThIgKr4zoay5daajLHGse6b/8VYNYUNXd836bvQRfnl7w4egl2lRyIOB0FS20My/zEpVl2Gf2 CoOpXa+hFANluxZMTmCCzu1ueqJhVKO/T2nEca9i1Z+GXeBXUaN7rpP4Y/qalUCltNn7fkPgkSa zUBuh3HMYh+IcGOOBZLE3LF2ev4+mXCy2IDSUgcOKGa915TliDdnL3gbHLTXHOihUAvEMGE08H5 KFiDTZ39TZTKVAtqyj7JxwPinjy9rEL7X23td3qL6wdxCfUF1NkVcfRHoK0cJxn8w14pc9WcA4B UxMx9/6ej979Nyw== 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 --- 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..9f68b5ff0030 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -2033,6 +2033,11 @@ sec_mi2s_active: sec-mi2s-active-state { function = "mi2s_1"; }; + ter_mi2s_active: ter-mi2s-active-state { + pins = "gpio63", "gpio64", "gpio65", "gpio66"; + function = "mi2s_2"; + }; + pri_mi2s_active: pri-mi2s-active-state { pins = "gpio53", "gpio54", "gpio55", "gpio56"; function = "mi2s_0"; From patchwork Tue Sep 5 10:41:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 720169 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 10B42CA0FF3 for ; Tue, 5 Sep 2023 16:06:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235174AbjIEQGr (ORCPT ); Tue, 5 Sep 2023 12:06:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354317AbjIEKle (ORCPT ); Tue, 5 Sep 2023 06:41:34 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B376B1B6; Tue, 5 Sep 2023 03:41:30 -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 A9D2E42435; Tue, 5 Sep 2023 15:41:27 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1693910488; bh=5Mic3gNnqOTFzu14E8NR8/OpHSVXkykG/cgWNUdKaw8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=s7wB6NCL3RZjwbiCisJyZ/QIjry3x0tKsHpyF+tJnd7si1zT4HSaXkiKjpVMTk05m de8knKUnzuUs1WxP2O36oJk0WqVCjHP/KC53gm4XWNS7BSGTT8Xwdr5YSV9NrDchDd 23laBjHNSAthKIPRhNanaZ4m6NaRN9/JHMsrcw92fJuGG26wC7nPXJ7Rjqgw4kyknU LrdejzaW2byxqGwig/cmxBfD0KJMDn12xyWXCnIJZjKrL469RNrIhPmymj9hgJ0Yno DdzBfeVpzbZf9ajNTTqvKmZ+mClSCGGnQl14DJUpWtpHmKrMKCBm4gznHmdq/iCZSh 6dvD9DY6J1xzA== From: Nikita Travkin Date: Tue, 05 Sep 2023 15:41:07 +0500 Subject: [PATCH v2 4/4] arm64: dts: qcom: sc7180: Add ADSP MIME-Version: 1.0 Message-Id: <20230905-sc7180-adsp-rproc-v2-4-8ab7f299600a@trvn.ru> References: <20230905-sc7180-adsp-rproc-v2-0-8ab7f299600a@trvn.ru> In-Reply-To: <20230905-sc7180-adsp-rproc-v2-0-8ab7f299600a@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=4331; i=nikita@trvn.ru; h=from:subject:message-id; bh=5Mic3gNnqOTFzu14E8NR8/OpHSVXkykG/cgWNUdKaw8=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBk9wXTXjtBs1SiekyJhoXzzqVXZlv2oJwck52U/ Ja49pfBrr2JAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZPcF0wAKCRBDHOzuKBm/ dU+/D/9HkUq1DPOWHsIeVXgw9BJdDz2Rne+0+p9YFrCxY67TAYimr2fU1QTcm7He93ZHdDdwbxu /72zLwdrogKVxSLI0DMuLXP/s4UisOrO7692baVtkNEFzACaAgWDIhlfF4lnTTNg5WZOoPFqU3k FdWDRhF7X9pAomgRg2Ghx+hmNaRXwFgk9TlGlg9X1kD671BCZs1EvIcM0q38bBU3r2KJdwiNcoY QW41iz27MYw698MGOOR4gtet4VYyr1uqBAlrLPkFGZmPuVNMhATLCPSImOvZUpxzy2oekpW1F+5 mmnfRdtqUB88fXndYLDJHinAPy/Ggjmtl5wGTq6xuX36zTbaFM3zQboe2IWfJ3v5Rlqz0qRNEND RdOp7CDV9i2G/xLVmA/cMlIbzJqSnJkLTrZpBejOUlXgo5xfPrD+qkJftI+AtmwkUPLAVbH6WJR iFvQ/NcvAdSgAW9vqgaxp1ycmUDSiG/cewMH4aBz8jDtldQLPc9CepmSBFPLYufH6bWPre2M2uI 12H0VO/qU4hGOqyEig3p+5GcLRbhIvod6bnIGNyIapGqyq26L4XbXzt7eEltSspVJu439D2DVJ8 LUBuyS7KMHH0wd7WQEZAh7+EP+os5aJwEKeWD1vn6mMwaoOKQEN0nqdTQryPNfm5V+YfFyoFyoi 3PG9uGgZReB2rpw== 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 --- 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 9f68b5ff0030..174e7e18bb4d 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,apr-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: cc { + 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>,