From patchwork Fri Oct 27 14:42:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 158977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp656224vqb; Fri, 27 Oct 2023 07:44:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEfkQUxtKbdxQTAVBJYEhLliM4pI6JmnpCjkZZzrkNG/87D7u4RPk0jINfSE3AmkdMtpqHA X-Received: by 2002:aca:1204:0:b0:3b2:ecab:900e with SMTP id 4-20020aca1204000000b003b2ecab900emr2616005ois.15.1698417850993; Fri, 27 Oct 2023 07:44:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698417850; cv=none; d=google.com; s=arc-20160816; b=knjDTlG08QsMlJ2yR4SJgCGiw0A2hECSFBtf4J/iBJtyL5xI1c7rzwWy69zC2VXCS7 Oeq2/+SV11EfbAPTiESH1QBVC2Jo9jlKu/4ICi/jJVB7Q1sYDiX8i1gUmDJBEiPCZw11 RNuMnzkzLNsxLF5Zgcm/dZzurnBy5zsUt+5IHk4Ne1BTX7abGDZqPyRZNf/hHUbKsz3B bMal4RtOZ6AyTklkCnUNTz8bk3b9d4ascNFlskXkaFM6N7oG6fn+yzzAOR5VpoagYzk+ JsbpRc8kN/zWEM21zqSEvwUFSfGTQved9WM5bsGcTYLlZCvdO8SpA1XuScdl9ndk6k9r acYg== 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=9/fZh5UdJD8/BeLWNPYTG6i1dcG4ikcMzlBcvluHN2o=; fh=DWQ2Wn++nCPTn9t2adbobvcLGK04hHpyc6wXSNOnLbM=; b=RhNlfJW1ztZlbI/obt32xoZAOVHWjUptnTRypN9miThOyiHFsXCT+lnpZKnc+2iKti NgYOqR0vQYbEbyVKHONGvO3Gwq/6yuZN3QCPO6g7L/4RRdNULmhMPaVwh8BxJkoaepCd 5Y5ctrYmzGn7xqiItXPxVn5Hg/KURDAZ5LSv2tPzZSH/Xi3IQodjbIeKqmJqR9c+97xY 52oYBaOMVzGFtsLRdf9CMacMT1gFv8LTOrxVin0ZXoHVn/RQyflybbAnyyfv5FYKVBHa UFoYvKO1u49+dW06YsYDzN/d17Ke8aLromziie8riQvaI953BvBD9/JoXb6X0Qs3txoJ Pl4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=vjhEzfNB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id 72-20020a25024b000000b00da0cbb01ee5si2621236ybc.657.2023.10.27.07.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:44:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=vjhEzfNB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 4A6D883896C5; Fri, 27 Oct 2023 07:44:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346102AbjJ0Onr (ORCPT + 25 others); Fri, 27 Oct 2023 10:43:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231678AbjJ0Oni (ORCPT ); Fri, 27 Oct 2023 10:43:38 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EB33E3; Fri, 27 Oct 2023 07:43:36 -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 4343240557; Fri, 27 Oct 2023 19:42:50 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1698417770; bh=OHLRJC/diPfVFt8XwpnQvHWosIsHUiivbV6zXKO3qc0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=vjhEzfNBqX2jogZExWJu9smjWlNjalqWufxvt6mPBlLmiofTQKr+n1gW/qZ2fmxX9 ibhUnclb0yuzOXkbupuJw4kfzorN8n/8R6udUv9vc1jZPVksm+k/9QNXR9RVv6Yyki TdoGbRHCtmdy9aqDBx7aufN+Es/Y3lIIWrBelFJhD25vXt9jvpUtzZ1wqhEXPonTFD +sYtXon6jSnNy1JZ6zbQ5wgQM1qn9Fo45MaHapNjKrJkLbX5kIxXNJQdxNQSeB4Jhs 2lGOaXfrCAEk5+Nm5kzcoeb8+K89RCgd6Ww9p30nCtrLJbZYddWCJwUVDGBqz/PMjD GPMFDOJJZR1bg== From: Nikita Travkin Date: Fri, 27 Oct 2023 19:42:23 +0500 Subject: [PATCH 3/3] arm64: dts: qcom: acer-aspire1: Add sound MIME-Version: 1.0 Message-Id: <20231027-aspire1-sound-v1-3-5ff3cf8b5701@trvn.ru> References: <20231027-aspire1-sound-v1-0-5ff3cf8b5701@trvn.ru> In-Reply-To: <20231027-aspire1-sound-v1-0-5ff3cf8b5701@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=4201; i=nikita@trvn.ru; h=from:subject:message-id; bh=OHLRJC/diPfVFt8XwpnQvHWosIsHUiivbV6zXKO3qc0=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBlO8xc30z+MrENqgfLgqVSE+q+ra7RoCnWdyiz1 6GhE6uWXmGJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZTvMXAAKCRBDHOzuKBm/ dd67D/4pT2ycHdMwd/6ryVt9JVDg9rTTP+IYgpuMiDCjwy/JQbSkqPqigfGqMOwdFhI9L4h6fqt gYa6wqXhCXxADwSfKrvXLSJsszBm5Btrm71ZnhWp+E5gDGYCoO4hjfH3L4Nv9FWJ4rkJe5WQL7Z 3Ya+y6IW5jrKlAQhkr+zdTFhc3cgPKdbvB45jvxncQ5zEXPVQv5rDZ6m+orp42Pft9QWajLr5E5 EOrN61xy36EwCz0zEj5irEOPUQXicR08uheUN/DlJIPppxOVnmfLku0/fO5SIjIQOEe0D20pSf0 IA+VWyXrcE/+dAieOEBT+jN9f2IE25r5urMUMLv9jSjfcUvBufLRya6kRJ97bLOMu1sSW2OWnA4 ZWu27d+nhxE+ux11DeQAvl+9Hs4iKT5cibvCieGVX0OLLjRWl1sFgVRAgc7lFMEyC89YYzTBmOt kaBR56+mNmr+MVA46wlhySWo5phGSniQA9iK6g/XqYREephKV64kJfDK2VysZrf4yfDyJXPS//3 sB7h6sL81NHZkJR1MJ5vlGDWFaDbQ33V2N2rBn6VfcPaoMYCVYA2n/QGo/yWlsrey5E/G42nQ5P UMKEqwzUDkw+V/t66xTROfIN2I/UmtMPnRl1P1VNe9FVihLxSIyeZnIwM0SLCOC7RW4aCu2sA1U z0aJPfUusk+QCPw== X-Developer-Key: i=nikita@trvn.ru; a=openpgp; fpr=C084AF54523FAA837E2EC547431CECEE2819BF75 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 27 Oct 2023 07:44:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780920196519718946 X-GMAIL-MSGID: 1780920196519718946 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. Signed-off-by: Nikita Travkin Reviewed-by: Konrad Dybcio --- 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";