From patchwork Thu Jan 25 16:42:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13531286 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 29AC8C47422 for ; Thu, 25 Jan 2024 16:43:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0ARsog8xXdSryovBx6pjQRI0QZwS7DeEEqNojekGx6E=; b=COFVUu5R6iB6kT urUpzFod1fTTN0j5Krs8GHoyksDV+7D0A9/ijicvvJRXwtejRNPgMsR+xFitpyk5XjBigeUd/kt/9 NSWAjA/3d6shy4hJshRg8aZ7qcLqpO+5Ukz/X6QFbkJvyqDwUqYFFV8gfLAQqV+5GmH4iZi/ZsFv9 w/27Od4QJ+l32zuv1cwH5fdRE1x339+tl9mQRXP4R+icuzkF0kod9xm4oaEVXzRyzlwSSUKBCCo14 BRNwsV3otGFf9RYHRIz797d+CPgFKQIiKDNL+G3IxmG6qsvudBBXvUn2JexjPo4DP9c0DQkkdd3or urTB2mHQmM7ma9MTocNw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT2ol-00000000rvl-0zfW; Thu, 25 Jan 2024 16:43:07 +0000 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT2oX-00000000rly-452P for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 16:42:55 +0000 Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-5ceb3fe708eso3388730a12.3 for ; Thu, 25 Jan 2024 08:42:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200972; x=1706805772; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=h4FMn289XJfM4JthuVepAmRbmblvDNilSayK8e6lWXw=; b=LdmMhxA3ZjBb1wFhbXwZKnZ8c/6icQ/a7gEK0PsTccoNxRvNHX3f+iNfqDmLhbVRTy m/xVVWQyrf5TJnPWLyL53bGtkp9kM5HAW+/n2aoK4oCvxv3B9OzoCNqGwQdcJPoIwiCT GiL9nh11heBCgFoJE1BHlXbVrv4HMpqemXtKNTHiw7+BRanmA18nOIL+ZHuRCCrAGA17 nQK6VecamJKYcImifLRsWrsckmkBMjbFsKeLJcObPo19hztuaAADkGauI2RAWffJgaFz mN/d7d2GyzYgCvaQnbPNIcY6V+Hu155/xdV7dHiZkVXiUESg8Qd0TZZTJGIvYk4RlYKM F4+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200972; x=1706805772; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h4FMn289XJfM4JthuVepAmRbmblvDNilSayK8e6lWXw=; b=rag1g4Aq0yhPDRYUZNCTmxMY6HBY87nk4ARIzXDTdzq5lEfRIXXkr0Gg5Hj6uaAMFT 3CvBOi5NW+8VkTB+Y9n5KgNUg8Keqtq2xr9H0eCTF+Y6hxlWnjx7S12o4nTBZh7X8vxI nmD+gb93MsQqITCsF2o/nY/CQX+pcjHzDP5qBjgH8vaEec9XKf2E4Ly1gvLwb6Sd1OW/ 5/NmZAJmyFj1annP4/QmWMKcW7pl8fuZjLC+w8Mrhww3tt1TQJ7UdvUnFPehc61xMRoI aH4yKntXLOhF5HDMSeGAN1uycIv9BTCb9zn/yycFyRFKeOdHNFcGwQsI837CZS0XMyrJ /KDA== X-Gm-Message-State: AOJu0Yw+8+DpdrWDfRDgIm6KbgboeT5iBKkatz0W7S6RQWOyQDyvtPve Ha1hSGbgcbq7V28YSq/e/U2WXHsLWL7udzHAum29coqjMpuedUOV2v5Msiw0vrU= X-Google-Smtp-Source: AGHT+IGiG3YsRuhlsrT8kgsnSYoO/2eV4afPGq+FUn/0K5PhA614vzTZW1qtdJ9HT0TN0hVxI9yBng== X-Received: by 2002:a17:90a:6e42:b0:290:3b83:8897 with SMTP id s2-20020a17090a6e4200b002903b838897mr1064385pjm.40.1706200971989; Thu, 25 Jan 2024 08:42:51 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id u15-20020a17090ac88f00b0028c89122f8asm1769170pjt.6.2024.01.25.08.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:42:51 -0800 (PST) From: Neil Armstrong Date: Thu, 25 Jan 2024 17:42:41 +0100 Subject: [PATCH 1/3] arm64: dts: qcom: sm8650-qrd: add Audio nodes MIME-Version: 1.0 Message-Id: <20240125-topic-sm8650-upstream-audio-dt-v1-1-c24d23ae5763@linaro.org> References: <20240125-topic-sm8650-upstream-audio-dt-v1-0-c24d23ae5763@linaro.org> In-Reply-To: <20240125-topic-sm8650-upstream-audio-dt-v1-0-c24d23ae5763@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Catalin Marinas , Will Deacon Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=6723; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=AtOoBFcIQKgUh5ZyEDGWZhd+aEqLc4+3VKAs3noLf70=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBlso+FrwlSsmsjFNd6JFDd4+HcThBnKiqtDxP4W4dB yX/6IbuJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZbKPhQAKCRB33NvayMhJ0XDJEA CVxqdti9xDFRC71wo4EqbZlQfDjl+ZI2/4xyjQsiwYHAfXePZC+bBF6ZoR9MGFtAdQ4yTLYeGjbthZ ByaDOU2KpS9J1Afbel8IzPqdsQjXbwzON/gt1YRUVzptboauwOl1phzFlJrWtdZsK5ZkT9ote/E67Z 4H4Vt75umLM0TX2mWjSEIHDJTYZcq0kRdfKg9rA+tYu3mUpGVj5dvqliF8FynmzQtvdj/lsoM6PG4h v9L7LUOtgVQYffH/mBb1VdbxTrKvf0pqTyvIB0ZY0nMrs4JIWsS1yasVK8jFlCbo3Mc3oS67tvXNen m+IPmGUu7DKf8LnnxMLoQMXzCPU+M9vVjRyp+CigZs6OZU0iS1ujmpd6xhVsm2YGP+vnqPDiYXj4mS nX5pM/3G/a4jwIzQ8F19UXdOs65xGJdKX/QKzY80MxFfu5eujh620d2nVgA4enjbT4MHq8aMREEXfq FFp0uZmfFzwgWTy4YkL5dNX2S27kU1ItdMNmpZQueL5mcKEqHeWcPKzMBqjXAkJy1oQYbFNLRBwN+p VKklnWadzqaumZlRdbMh1yWjS0BxxronqwrIR6I22hRm5Ky5nlPnXHjF4/VEUL2mhQ/JEO/p9Kxv0W j6n6h9d5feGctQ0I8X4/FjJsccPL2kt8pWUP2R3Zw0i2XjTeq5ZzuKBrU4Sw== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_084254_089364_E8E6420E X-CRM114-Status: GOOD ( 12.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the remaining Audio nodes on the SM8650-QRD board including: - Qualcomm Aqstic WCD9395 audio codec on the RX & TX Soundwire interfaces - WSA8845 Left & Right Speakers - Link the WCD9395 Codec node to the WCD9395 USB SubSystem node to handle the USB-C Audio Accessory Mode events & lane swapping - Sound card with routing for Speakers and Microphones Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 203 ++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts index 8515498553bf..277b1ba81685 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts @@ -92,6 +92,72 @@ pmic_glink_sbu: endpoint { }; }; + sound { + compatible = "qcom,sm8650-sndcard", "qcom,sm8450-sndcard"; + model = "SM8650-QRD"; + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT", + "IN1_HPHL", "HPHL_OUT", + "IN2_HPHR", "HPHR_OUT", + "AMIC1", "MIC BIAS1", + "AMIC2", "MIC BIAS2", + "AMIC3", "MIC BIAS3", + "AMIC4", "MIC BIAS3", + "AMIC5", "MIC BIAS4", + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT3", "ADC4_OUTPUT"; + + wcd-playback-dai-link { + link-name = "WCD Playback"; + + cpu { + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai = <&wcd939x 0>, <&swr1 0>, <&lpass_rxmacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wcd-capture-dai-link { + link-name = "WCD Capture"; + + cpu { + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; + }; + + codec { + sound-dai = <&wcd939x 1>, <&swr2 0>, <&lpass_txmacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wsa-dai-link { + link-name = "WSA Playback"; + + cpu { + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&lpass_wsamacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + }; + vph_pwr: vph-pwr-regulator { compatible = "regulator-fixed"; @@ -102,6 +168,41 @@ vph_pwr: vph-pwr-regulator { regulator-always-on; regulator-boot-on; }; + + wcd939x: audio-codec { + compatible = "qcom,wcd9395-codec", "qcom,wcd9390-codec"; + + pinctrl-0 = <&wcd_default>; + pinctrl-names = "default"; + + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; + qcom,rx-device = <&wcd_rx>; + qcom,tx-device = <&wcd_tx>; + + reset-gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; + + vdd-buck-supply = <&vreg_l15b_1p8>; + vdd-rxtx-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l15b_1p8>; + vdd-mic-bias-supply = <&vreg_bob1>; + + #sound-dai-cells = <1>; + + mode-switch; + orientation-switch; + + port { + wcd_codec_headset_in: endpoint { + remote-endpoint = <&wcd_usbss_headset_out>; + }; + }; + }; }; &apps_rsc { @@ -478,6 +579,14 @@ wcd_usbss_sbu_mux: endpoint { remote-endpoint = <&pmic_glink_sbu>; }; }; + + port@1 { + reg = <1>; + + wcd_usbss_headset_out: endpoint { + remote-endpoint = <&wcd_codec_headset_in>; + }; + }; }; }; }; @@ -525,6 +634,16 @@ &ipa { status = "okay"; }; +&lpass_tlmm { + spkr_1_sd_n_active: spkr-1-sd-n-active-state { + pins = "gpio21"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; +}; + &mdss { status = "okay"; }; @@ -743,6 +862,74 @@ touchscreen@0 { }; }; +&swr0 { + status = "okay"; + + /* WSA8845, Speaker Left */ + left_spkr: speaker@0,0 { + compatible = "sdw20217020400"; + reg = <0 0>; + pinctrl-0 = <&spkr_1_sd_n_active>; + pinctrl-names = "default"; + powerdown-gpios = <&lpass_tlmm 21 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrLeft"; + vdd-1p8-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l3c_1p2>; + }; + + /* WSA8845, Speaker Right */ + right_spkr: speaker@0,1 { + compatible = "sdw20217020400"; + reg = <0 1>; + pinctrl-0 = <&spkr_2_sd_n_active>; + pinctrl-names = "default"; + powerdown-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrRight"; + vdd-1p8-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l3c_1p2>; + }; +}; + +&swr1 { + status = "okay"; + + /* WCD9395 RX */ + wcd_rx: codec@0,4 { + compatible = "sdw20217010e00"; + reg = <0 4>; + + /* + * WCD9395 RX Port 1 (HPH_L/R) <=> SWR1 Port 1 (HPH_L/R) + * WCD9395 RX Port 2 (CLSH) <=> SWR1 Port 2 (CLSH) + * WCD9395 RX Port 3 (COMP_L/R) <=> SWR1 Port 3 (COMP_L/R) + * WCD9395 RX Port 4 (LO) <=> SWR1 Port 4 (LO) + * WCD9395 RX Port 5 (DSD_L/R) <=> SWR1 Port 5 (DSD_L/R) + * WCD9395 RX Port 6 (HIFI_PCM_L/R) <=> SWR1 Port 9 (HIFI_PCM_L/R) + */ + qcom,rx-port-mapping = <1 2 3 4 5 9>; + }; +}; + +&swr2 { + status = "okay"; + + /* WCD9395 TX */ + wcd_tx: codec@0,3 { + compatible = "sdw20217010e00"; + reg = <0 3>; + + /* + * WCD9395 TX Port 1 (ADC1,2,3,4) <=> SWR2 Port 2 (TX SWR_INPUT 0,1,2,3) + * WCD9395 TX Port 2 (ADC3,4 & DMIC0,1) <=> SWR2 Port 2 (TX SWR_INPUT 0,1,2,3) + * WCD9395 TX Port 3 (DMIC0,1,2,3 & MBHC) <=> SWR2 Port 3 (TX SWR_INPUT 4,5,6,7) + * WCD9395 TX Port 4 (DMIC4,5,6,7) <=> SWR2 Port 4 (TX SWR_INPUT 8,9,10,11) + */ + qcom,tx-port-mapping = <2 2 3 4>; + }; +}; + &tlmm { /* Reserved I/Os for NFC */ gpio-reserved-ranges = <32 8>, <74 1>; @@ -790,6 +977,14 @@ mdp_vsync_suspend: mdp-vsync-suspend-state { bias-pull-down; }; + spkr_2_sd_n_active: spkr-2-sd-n-active-state { + pins = "gpio77"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; + ts_irq: ts-irq-state { pins = "gpio161"; function = "gpio"; @@ -804,6 +999,14 @@ ts_reset: ts-reset-state { drive-strength = <8>; bias-pull-up; }; + + wcd_default: wcd-reset-n-active-state { + pins = "gpio107"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; }; &uart14 { From patchwork Thu Jan 25 16:42:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13531292 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C05FAC48260 for ; Thu, 25 Jan 2024 16:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+m9CXHhEcTqB5oI2lmoqNcgys5vXougR380Y8IUXe8s=; b=zioyhL52FR9OKi Z565cnOiDUp9MyQUnumSE4B1PlGtu+GxaalSX6tdNxTlDSvE69J2GrPsMKdx55xDHj7rHAcI1dJnp 0wOVeHPtm2q7yCuR1v/Q1ObZoF3+Rjrfdrr04s5yaI4mAH5lZfFWZ10CPAUDFPfJDqYGcy5J2HK8L StczUDzss6s7lfHCg7FY/3tTtk0Cd8PJiOKp7nJx2OJ6ZAPZjC89RHqPEhQmm1fCc2UJw9BoXWP4P yQo16u2CAJRi928MZDJV2WnGagzPXYlY2UIys1T4kkqVu2yhre39TsP2Kj7Je3HQXb6i0TWIg7QDw AyjTYA1iMaAlYeLslw/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT2oz-00000000s6a-2llP; Thu, 25 Jan 2024 16:43:21 +0000 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT2ob-00000000rnS-0fwA for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 16:43:00 +0000 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-5c229dabbb6so2875479a12.0 for ; Thu, 25 Jan 2024 08:42:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200975; x=1706805775; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=HW8KVIWPvb9RNP/RwAD0mzXVj1bYagG9oDeU8ueoS0E=; b=TpBqh5BkYiKI6sFRHC/9yH1TEyyCqTFO6FCQ0bAxMwarVvgPANj0byx5WZMGGAfs5f g9vcSdOvp+6pthbVXvJOgkO5C4oDy2QthUumqlp5AGTJKaFf3XbKmV2NI9Ze7nRKdix1 1fOsOk9f+V5u/DmwXmTRhjb1gqIbVVfRee68iakVGBi4ipfaoQBtERSkQhr1vHBOjfwX Gvi6tbhqaDycvBzWJbQzO64oh3jE9K1dbseknczOi2Q6fQYciP1167WABi7dCNIFMSU3 PAElS7b33A0H1+TjWT3aFxTfM0qta8hYSBWt+JbB9qAHBtL4M+IZJM2BWpPMWU4Mp+le P28Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200975; x=1706805775; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HW8KVIWPvb9RNP/RwAD0mzXVj1bYagG9oDeU8ueoS0E=; b=TcxTBU188hgfaTRWrOv8ZCrDvQK8VEW6KcZL5+tNymN1ICVTLSJENnTvCjichh3VsE EGm5O78jWQS3KKw4iri2caXRCymdngHdAeY+4v0mMToDcbfLHGfKhgtZR32jEx8oqmZP dd45ZjO1d2hMVkN0AjCBQoc40NoRYv1y4TJ6hIjpSmes0cgNDbez/0NnKvrt97/TvQDY SofrOOCEcX4VcDqyqfl1A9rdEJhBUdAeEb0XsY0bsqJFsc2heuMy2AnalhO728N9IB6+ Kcesnw/maLK11NEU4EYLLsyTlAECtxXfMrYI456UeSYAgeQZ5rLe1T6c/GhJreymFxkn BSDw== X-Gm-Message-State: AOJu0YyngfsC1A5vNiRnRQjfW4V/OUPTTb6VYNH+EHuusmpFvi9CQMvi Vc9PPyTY6cpFXJ+6pIZ4IZcgAoWYv5/lgiyO2CgCW+oQSAZEVfJhPS0apKN1Jsc= X-Google-Smtp-Source: AGHT+IGv+bm0MrgPVzsYpMj5FuNOOYvH6ACHIPweMQLlA7IaqFyVTMiqNs34Q8k7JE+cNROnK1gOmg== X-Received: by 2002:a17:90a:de96:b0:290:44c7:96e8 with SMTP id n22-20020a17090ade9600b0029044c796e8mr1052303pjv.93.1706200975096; Thu, 25 Jan 2024 08:42:55 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id u15-20020a17090ac88f00b0028c89122f8asm1769170pjt.6.2024.01.25.08.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:42:54 -0800 (PST) From: Neil Armstrong Date: Thu, 25 Jan 2024 17:42:42 +0100 Subject: [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: add Audio sound card node MIME-Version: 1.0 Message-Id: <20240125-topic-sm8650-upstream-audio-dt-v1-2-c24d23ae5763@linaro.org> References: <20240125-topic-sm8650-upstream-audio-dt-v1-0-c24d23ae5763@linaro.org> In-Reply-To: <20240125-topic-sm8650-upstream-audio-dt-v1-0-c24d23ae5763@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Catalin Marinas , Will Deacon Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1119; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=8FlUAYV0p0Hs9/yKUI+wz2YaT+GWCAARd/3llgD8Z0o=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBlso+FxBZdlhNgMVaTGjGaEisz1j+jr9VFtXIyARuh 8OBDTE2JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZbKPhQAKCRB33NvayMhJ0fnkD/ 9/Jm1GOPyM73Qp9AzGkEha2x1ZU9pmvKPvwz+B0cU2UQkQI5MH7O0XxMA/mlHCzsbFWcY9Zg7GqK0P Tw7nOzbg6Vo+S5JmWj9g+YoJiwX5Uxvi5OsH4q8L5sF1WGOlAiNVUIWu/UP2uVA1OV6oL8EVfyGWSB OBEkJ25ICDg1WxzHZw7kDk3Q1S9zOnSS+CiizOnHDqsa5SWzToR/Bh5K1aRAsXaxHZJfO2fVHOty1I s/DopaeH4BwXW3hQSn4B/C8ONzylaoyAGXTwlK99Ks8xztErSq21NFZenz7zPnIYJQzpvJIsxK7raK gltBjG0cmVMx6krGd8weNSxT2NWYHAXQvAXqIl0VTCZZZpUhk59LSVUa2BTlq8OmSxvaf6i1+agfzx vpnuiMu10q2nwTxAf0eIJVwli1RpgFow17xtwOefAfVM4rSlnbpjeWmFzCPjA3oE9/JEUJKsOE/sIZ M7VleI00zWIm9d0eoYf6hNJBCVvnGvsbEQs9T7aVSyUGmMfRlQHTGDzEtqTDD3NEOD1zVI2A3Pyn3d 5Yta+5nciyX7Z0DzpOFBJ5HplZTNIWaooeEqU3kwEQ9nN4FJ00nwEnQP7CQLDW0xX2HaAH8FnKhHEL 1uVVuxuMEg2UrMmjl+YkUXK2u8oJJoPS6JzEcL3+Gx/wyAVqkxT2u8dmgAVQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_084257_870691_EB850F7A X-CRM114-Status: GOOD ( 10.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the sound card of SM8650-MTP board with the routing for Speakers. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts index be133a3d5cbe..d2ec0cfecba9 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts @@ -66,6 +66,29 @@ pmic_glink_ss_in: endpoint { }; }; + sound { + compatible = "qcom,sm8650-sndcard", "qcom,sm8450-sndcard"; + model = "SM8650-MTP"; + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT"; + + wsa-dai-link { + link-name = "WSA Playback"; + + cpu { + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&lpass_wsamacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + }; + vph_pwr: vph-pwr-regulator { compatible = "regulator-fixed"; From patchwork Thu Jan 25 16:42:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13531289 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 274AAC47422 for ; Thu, 25 Jan 2024 16:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CaDOJWbIsR5jAyizbnAA1syeQ/BxQ7IsO/8Wxjme2Ho=; b=2bdxGBQz4V4U/L BOVMKdRfKJ19o1JJKeiy3Xz/eGtMndAHvlqxd+obljJurmGUKwrhdLJHDDL4MkWSMlM0tdchnoubi QZtJzhmegygSfLVzimY33ypvuqM8btJ79+bS0Aca0IdR4Oz7jdVOp3AGuiy4KC6aPoJ3MUulp+/sR D+hm/nGT6CGXPOPPQAobSYySKEDN7DHIIOY2TmPYR1PT6RhJLxCvAz7HjAtj0xgOB6Yo0JWwKW0Is XvWo8TMe3QCeeKzEnO+nG8XXLWW3t2irhx6a5Xhb5OYDuTNcl35rqeVGRzDAkelyogpe9ad/mWmc3 kC5mpSyKhbKHCu+Tp7RQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT2p1-00000000s88-0NKm; Thu, 25 Jan 2024 16:43:23 +0000 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT2od-00000000rpd-48HP for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 16:43:02 +0000 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-28e79182570so5238261a91.2 for ; Thu, 25 Jan 2024 08:42:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200978; x=1706805778; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=AUoJ3ddc9e3JLhAMVuimNZikRZg+KeQcTa0lsEDkqvU=; b=QHt6FpvzcaOfpz1wN+2Z8QcDNsPVt4YoYytbU1m/V/TeZtwJe8xxiXoLK2NOdw6ApL q7E5B6tIOGNeafbJhcWw01+jh45CKENmSuAlJaDN2JXCO7A3aMFHmkR/TPZJqzfeMpDx lipb+z1mrJvpUih43sNvFJiUJTByF8Dfgz5OmeYPL3YhCPAkMYEXpDC8GIzyUqgl7bYw IqTt8ej2doLW0KZDyse6IS9UxsvqyxuUNhxrvAoSyWEW98G/FQemPjiYv0m5Bz+Mlyhc I+mCX3Z2F38SbV4BqTsiamhYEcV4sxYE8lOLG8RIG/n+6kL9zg3Omu/9CM0ezXtPFBUd gXdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200978; x=1706805778; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AUoJ3ddc9e3JLhAMVuimNZikRZg+KeQcTa0lsEDkqvU=; b=G1QjGciHg/ucVAF8AbO61mWyfcMih3NCvsij8u0gCERK4QQ5A+YzGvVy8eMEzTmGM9 2t5lPB5G46h1goNmjUMryovOxn9BsIZp1qe13Sc186qk0JvsqFmzcx9MrqGi084ImFGo m6menSlEZgqXJW3/mgoyeLVfehJaHtxipoeIFag13go3u0WdzAIVJGJSmFg/kaTb/QDa rCSZn0VDdRXuqqGL5JxtyCexslGYGNO6DNVWBNC2CVkIi8S1uuJyrwU4aNbe8cHXOIw4 TclGCFT1y6Oscr3bxVXWd+XrPuuVoWAYGlgqCdQazeWVMMC1QCYcAecbvNosTjotEqrt hpuQ== X-Gm-Message-State: AOJu0YwkUmyaQ9up9m9gLTp+JI6kgxX7KRKuAHh25IacnD0VnbHlZqF5 yzhFByzBGBPgquY+IOZuD0A8OhAEuFaJskv8X2tloNwBRCK6cf0rJhpC6Wdh3uY= X-Google-Smtp-Source: AGHT+IEepz3BMfPNOyvpg5nL+cVmUDpDXFngYmuO367eAXReN/+4XkVqPSwF+8qpIsQRVpURpQK04w== X-Received: by 2002:a17:90a:db8e:b0:28f:fc6e:7ecc with SMTP id h14-20020a17090adb8e00b0028ffc6e7eccmr941017pjv.41.1706200978007; Thu, 25 Jan 2024 08:42:58 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id u15-20020a17090ac88f00b0028c89122f8asm1769170pjt.6.2024.01.25.08.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:42:57 -0800 (PST) From: Neil Armstrong Date: Thu, 25 Jan 2024 17:42:43 +0100 Subject: [PATCH 3/3] arm64: defconfig: enable audio drivers for SM8650 QRD board MIME-Version: 1.0 Message-Id: <20240125-topic-sm8650-upstream-audio-dt-v1-3-c24d23ae5763@linaro.org> References: <20240125-topic-sm8650-upstream-audio-dt-v1-0-c24d23ae5763@linaro.org> In-Reply-To: <20240125-topic-sm8650-upstream-audio-dt-v1-0-c24d23ae5763@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Catalin Marinas , Will Deacon Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1023; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=RA/dywI//b8wbJThXyjIP0zXgcdf9VZeWuhmmKqDdfc=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBlso+FzUzXr6EEozwn0lUxfe+CLrYHnIVUiTRaL9hn eRdNipqJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZbKPhQAKCRB33NvayMhJ0T5hEA CHQJglHouUdo4/OzFYRlYbi6ra+tX8c+gXpIkSBPrsdFpBe3ezha3i5QTimq7uP3p+SQPrUqoZqCCI 4MGxHiukM065uJQ+4xia2uxbyQ+bi4r7rtqpMmfhHz/sYZBD3iGEWiA5Cc3CSQOG2Q5L1Dpw0wbE9m ryO4jmz3g5hf1O1Yk+5SpgLrbW6o2fWDOxh9Hyn01a83RdRMBPF2mnJMmudytYUx7rhGOH9gNsKevt qUeYejb1ob334ZEU/Xt5fPDpvRT0WXFCiZa8fNrWE7BQ/FfyPRRes9XMG3iQAT8x64iGpXDM0YGkdp mlneSEmNUMexqsEEBH75ZKsu4kG42Og6+QoiIsQgrw2Jvaglt9Jk3jfJrTleOFTF4ssAbQXl2MaU5Z cIDTpMU4i84meJenlJki73Tw2K8w4lpf+L+J7dOZPd2WpHAQxfb3iUg++7okhQ5azkMHTagD8QG1oq BqtBas4utXoGuu9nJLY1alwpPf2Jv4E0MQTN4Rbts1BI6EwaNnQQr7XaTQwesg9XDHB0/wrezisND3 FiSVUwLNQslFj/Js26oVONyOnZfkgr/uE2OPw1MCsZgYFL1ohRvRQrAWRUycpf4RIkN6j8oeFrxQR4 ikaNUdeS/FqoMiKno3L2NQFDsB4vUlF2A/3SC+eKyG82571S5WuycN+3Q8dQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_084300_105769_02A65BAF X-CRM114-Status: GOOD ( 10.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Enable the SM8650 LPASS driver and the WCD939x codec driver as module which are used to support Audio on the SM8650 QRD board. Signed-off-by: Neil Armstrong Reviewed-by: Konrad Dybcio --- arch/arm64/configs/defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 5c8777fb5a29..d13d0fb8517a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -620,6 +620,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m CONFIG_PINCTRL_SM8550_LPASS_LPI=m +CONFIG_PINCTRL_SM8650_LPASS_LPI=m CONFIG_GPIO_ALTERA=m CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_DWAPB=y @@ -992,6 +993,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m CONFIG_SND_SOC_TLV320AIC3X_I2C=m CONFIG_SND_SOC_WCD9335=m CONFIG_SND_SOC_WCD934X=m +CONFIG_SND_SOC_WCD939X=m +CONFIG_SND_SOC_WCD939X_SDW=m CONFIG_SND_SOC_WM8524=m CONFIG_SND_SOC_WM8904=m CONFIG_SND_SOC_WM8960=m