From patchwork Tue Dec 5 11:48:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 174014 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3371252vqy; Tue, 5 Dec 2023 03:49:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7JAIJoN6mMgpJPY1MEcXRdAtfCRTiw2bj8MHmkYWtBa+Y8rdx0qDJ2Ri7TxKrzN5OQF0d X-Received: by 2002:a17:90a:c28a:b0:286:6cd8:ef12 with SMTP id f10-20020a17090ac28a00b002866cd8ef12mr1237690pjt.42.1701776983832; Tue, 05 Dec 2023 03:49:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701776983; cv=none; d=google.com; s=arc-20160816; b=pVFN7sbmTClk8hPqYovX90kuRD6zkxPzSSzjZgD4AemzpXx1e6kndOClzh0+ZAr8Bk uqwFrmsBy805c+h+yb51q5XRNDx5NG9xaYZm3vTGVZZ75ILgTE7i+wpgTz1XwvqUiB/l YUwzjRXa7J96wPpBZlQFMtKPFnAQTECcPjLLcNG2GYk5UhSHz4acDR6bMhiyPWukwckH 0dZsBaQIx2V7Xj+Nf7G0uYde7GrrcCCUeuAH14KR7QdSvg7TtzBJj3qaeQv1vBfIQ1zq 9/VgLkn4QuZL4+yRIWuCyFqm1wD3VlZIa3v0iCJmmBHEEXSevzIXMDi/wVCMEfl4PRPx aXBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=lss6aGkSrbudaXCR8JCT+1l7nU6QGq0xa0hg4A69WMA=; fh=DWQ2Wn++nCPTn9t2adbobvcLGK04hHpyc6wXSNOnLbM=; b=U+BFUg0YXNCztp86arjIzGlPM63rco//Lf4VzGaULI/NCqrapOS79qDVMRrOVnOPMD E1f8AiCaxzKda3b2gO6yy2kTe11nFI5pdzcZlCi9YuHqPDbLyHJ64Gkr/FlGfGU7GjCF 57K3Z9DmgKuYLs+IU9S4SfVW8fWc2Ask4VyVTXn/yZMFXOyM187BTRUJ5oHz2uGju/vo 8tw7VajZnlhI+A08GNKCoj4JSTiZrdFuGynlFIBzcg075PxLlx52UQr6a4v+3CF2j0Tq rrIEPQ4cU1YQufeWScHpyYcy5BN9GS0m2doq36MgwpdMrUhS6q1EsNjLaEdliZn/jdM5 vt+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=NnBFjljv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id h23-20020a17090ac39700b002847b85bbeasi5217788pjt.150.2023.12.05.03.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 03:49:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=NnBFjljv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id EC9AF8132A65; Tue, 5 Dec 2023 03:49:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442156AbjLELtH (ORCPT + 99 others); Tue, 5 Dec 2023 06:49:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347030AbjLELtG (ORCPT ); Tue, 5 Dec 2023 06:49:06 -0500 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB5A4113; Tue, 5 Dec 2023 03:49:09 -0800 (PST) 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 4372742C13; Tue, 5 Dec 2023 16:49:02 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1701776942; bh=2YlEH17x0fXPJQGFbxpn1F9mXGkbqkQe722jCjLtYlw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NnBFjljv2PALU/9IV+T5k+t1o3Gelj+dZGkA1GXrN/OgGPjqzzNjwWdvDUO1CtjSr KMikRWAhjrmYwAEuhaaAx1tkHbmdDpR0+506H06Pot3VeyP3QMX1yyyavF7J4UKWNX 7GSWWl/ih10U7VWTDEFeEqY+kjqmECPR4TCkFtzUTUrJ9rdOn2L67h+5rN5ZddepqW SBCBMC8OJciCLSRT8XB3A4yFL5VV6VcXHJMfu1WJ9ny4/CZj0BsPQQsB5npgYGUiPA FeYPKnvMhCzr7lcYCaCltUeeDPv1F0ae0NtYsgndkdKwyoebSkX5DhxY3DRpQDiehz FZHpasiZqxynQ== From: Nikita Travkin Date: Tue, 05 Dec 2023 16:48:12 +0500 Subject: [PATCH v2 3/3] arm64: dts: qcom: acer-aspire1: Add sound MIME-Version: 1.0 Message-Id: <20231205-aspire1-sound-v2-3-443b7ac0a06f@trvn.ru> References: <20231205-aspire1-sound-v2-0-443b7ac0a06f@trvn.ru> In-Reply-To: <20231205-aspire1-sound-v2-0-443b7ac0a06f@trvn.ru> To: cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nikita Travkin X-Developer-Signature: v=1; a=openpgp-sha256; l=4256; i=nikita@trvn.ru; h=from:subject:message-id; bh=2YlEH17x0fXPJQGFbxpn1F9mXGkbqkQe722jCjLtYlw=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBlbw4sE8TzyTJM+HH5EZDQVLp9W5ULqH1EIdFep U/ZinB2YS2JAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZW8OLAAKCRBDHOzuKBm/ dWZfD/999H6Mw3B3dvjxDLvGJXyUFRz37yZeN4sd99k/gmbo6CC6tcWGynpw1CSsl86u79cthmF RwqR85vi1GvG5uT1vt6muskltUc16NOpr3Sr/BZw8OFE7KLIqgfmdL3bhPEZcsGVRFmCttqIrWs R1dhtqH6N151wThTyUUHEahoVSgNK/QbvXTw6WOqIuXW/VAigy2YtauMHvWljk6JuqZYibnTyDs mZIRw4nnGjLLLbT7rQoaKFgu16cGuZrGaEBJSTabYLOhC8zW/35xD44IfpKSkuS4dsZP7FajuGE EXw729E6+d6GEdvf/y3SRJd+KCIAwvp5MMd2X20uQ54YzrsxNBu6Wv/TPZNeBzqS6Bch5au0ed7 3MfxOjfkb5nrNEyMZLX9CVXnJJWLlS3ND++tsdz9WWlrYVj9K5FYYZqAYlEnhz8e4SZEQl7Jvzp BE65HyzQvNuq3WPuok6XXLKUwkD2L9bw6d4OHi9q/80kvQiB8w9UZ8/x2MuxQEH0njqKqDOf2Y0 rDdpeqlsa8WC3Dk83gFbxzk3RldWFsYTyTm9Od/KEL8L0dusD82XE2wmppV8nPuG9u6VxgrIVVj 6U6GxuACCctZps8FMdNT9It1olK/0roP0bVSLpV64mVbDZ0BXzFt+Yspyzi/UdYprJEKG8AtdFi X8gEVXk/uW+3GBw== X-Developer-Key: i=nikita@trvn.ru; a=openpgp; fpr=C084AF54523FAA837E2EC547431CECEE2819BF75 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Tue, 05 Dec 2023 03:49:41 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784442502553854855 X-GMAIL-MSGID: 1784442502553854855 This laptop has two i2s speakers; an i2s audio codec for the headset jack; two DMIC microphones in the lid and the displayport audio channel. This commit adds the audio node that describes all of the above with the exception of the DMICs that require in-SoC digital codec to be brought up, which will be done later. Note that the displayport channel is connected here for completeness, but the displayport can't be used yet since the HPD signal is created by the embedded controller, which will be added later. Reviewed-by: Konrad Dybcio Signed-off-by: Nikita Travkin --- arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 153 +++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts index 00b442696618..5afcb8212f49 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts @@ -3,6 +3,7 @@ /dts-v1/; #include +#include #include #include "sc7180.dtsi" @@ -129,6 +130,113 @@ reg_lcm_3p3: panel-regulator { pinctrl-names = "default"; }; + sound: sound { + compatible = "qcom,sc7180-qdsp6-sndcard"; + pinctrl-0 = <&pri_mi2s_active>, <&pri_mi2s_mclk_active>, <&ter_mi2s_active>; + pinctrl-names = "default"; + model = "Acer-Aspire-1"; + + audio-routing = + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; + + multimedia1-dai-link { + link-name = "MultiMedia1"; + + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + multimedia2-dai-link { + link-name = "MultiMedia2"; + + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; + }; + }; + + multimedia3-dai-link { + link-name = "MultiMedia3"; + + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; + }; + }; + + multimedia4-dai-link { + link-name = "MultiMedia4"; + + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA4>; + }; + }; + + primary-rx-dai-link { + link-name = "Primary MI2S Playback"; + + cpu { + sound-dai = <&q6afedai PRIMARY_MI2S_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&alc5682 0>; + }; + }; + + primary-tx-dai-link { + link-name = "Primary MI2S Capture"; + + cpu { + sound-dai = <&q6afedai PRIMARY_MI2S_TX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&alc5682 0>; + }; + }; + + tertiary-rx-dai-link { + link-name = "Tertiary MI2S Playback"; + + cpu { + sound-dai = <&q6afedai TERTIARY_MI2S_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&max98357a>; + }; + }; + + displayport-rx-dai-link { + link-name = "DisplayPort Playback"; + + cpu { + sound-dai = <&q6afedai DISPLAY_PORT_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&mdss_dp>; + }; + }; + }; + reg_tp_3p3: touchpad-regulator { compatible = "regulator-fixed"; regulator-name = "tp_3p3"; @@ -368,6 +476,45 @@ &pm6150_rtc { status = "okay"; }; +&q6afedai { + dai@16 { + reg = ; + qcom,sd-lines = <1>; + }; + + dai@17 { + reg = ; + qcom,sd-lines = <0>; + }; + + dai@20 { + reg = ; + qcom,sd-lines = <0>; + }; + + dai@104 { + reg = ; + }; +}; + +&q6asmdai { + dai@0 { + reg = <0>; + }; + + dai@1 { + reg = <1>; + }; + + dai@2 { + reg = <2>; + }; + + dai@3 { + reg = <3>; + }; +}; + &qupv3_id_0 { status = "okay"; }; @@ -376,6 +523,12 @@ &qupv3_id_1 { status = "okay"; }; +&remoteproc_adsp { + memory-region = <&adsp_mem>; + firmware-name = "qcom/sc7180/acer/aspire1/qcadsp7180.mbn"; + status = "okay"; +}; + &remoteproc_mpss { firmware-name = "qcom/sc7180/acer/aspire1/qcmpss7180_nm.mbn"; status = "okay";