From nobody Wed Dec 24 14:17:14 2025 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2F94130E4E for ; Thu, 25 Jan 2024 16:42:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706200974; cv=none; b=PhuS3yJH/r+AZ93rCuSAboc0OKH1jv+TLiPLtxWCFLCmEApRaq50MTwxuhvicASqGUWsfVgpoCMbMi3+WBByh4XZH0iS484VSJcLFbU7p567LmLhUm67PGlLSP8lc4PVvMvFn6S/qMLgVPeGmjz6DFPw/JDCnY1KkrkcnZFGE1s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706200974; c=relaxed/simple; bh=AtOoBFcIQKgUh5ZyEDGWZhd+aEqLc4+3VKAs3noLf70=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kzJ+8F2ebG6Z7COiEm8nr9veDA3Zqt7WMzQywGnSufSe5/OmWQPAjtP6+qWsA52UtKPsggnBv3bMbzA9ws04TLLxmw1Ic1wEKQSA6G6ydlIYfLwf6QyPmaL4sOI/UTWfLt8keUFjO9ladKaMF2Z5/CM6G+ueOV33wqJNJQd5mYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=WKeaHfOx; arc=none smtp.client-ip=209.85.216.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="WKeaHfOx" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-29036dc3a63so3160071a91.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=vger.kernel.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=WKeaHfOx6kHe6jr0re4UUuJlS43WhZ6/o2TW8zKYPrfWzClZR9DXIC7ZQtQXm90P/R mVulYeS9Mc9RWiy5Eq6h+ysY0bp9BrHQZc86u0DIO9bqOHZN2Ap7vG/vJI7z0nL7eNKc 4v9caJgF31hKLTlYgrHUE/gy2jrUTWPd/D/rTcttC7hDGnwguNGhCBp0hvW4AyzpVpv8 Ue/3hDTp2dMfdPr90CsYGCBJbOdH08uMTyWxUFoPBnyEpQVnjqGI7rk2bd0QJH+q5K/l BysDepgHZimRsuAkEL+izUWG1YYkOOeNI0lGeSzQSVvT5vjcCpvYBkESr8erv/d5TyO/ 3yHA== 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=TvZBeZF5IArFzEzA/k6EgSEE7AOnHTWiHtI3i1se2Cwk0BgrADY/knbILSDc/9Eq24 r2zzz3QUTzUKSaC4KFa6mISqYiZeDdIUH4MdRH1H2GGeXCY328cpYruwej6hhaEzNQVd IPdmcCgp+UieYBamZI2zXmNb6TFPc6SqYYNfblEJ4H+I2iuTX7uFwbbhwRiFLLZCwXv8 uEUvn4p/zKMetPlRdhELgO9pzxggRiBXcfgv4oZErqE5pYhra3oRrrhzgttovaXCY1rD 7pkMJ/bbE6dSK8NdNS82+XQB3hOv9mbgmHozKAUXYL+Pl3Vb7aWPzsg7k7mZgYD4SV/J vuOA== X-Gm-Message-State: AOJu0YynnjU2gRxrXht8CUFEL8qTKKg2ySTp2n2cmHOZ1pcfMaS12h1i IeZvd+6dEBurI7qoEoy2GaJD+msqT0ihsWJF6P+dunRC+p0N/O1gGo4JF7S2A8U= 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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 { }; }; =20 + sound { + compatible =3D "qcom,sm8650-sndcard", "qcom,sm8450-sndcard"; + model =3D "SM8650-QRD"; + audio-routing =3D "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 =3D "WCD Playback"; + + cpu { + sound-dai =3D <&q6apmbedai RX_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai =3D <&wcd939x 0>, <&swr1 0>, <&lpass_rxmacro 0>; + }; + + platform { + sound-dai =3D <&q6apm>; + }; + }; + + wcd-capture-dai-link { + link-name =3D "WCD Capture"; + + cpu { + sound-dai =3D <&q6apmbedai TX_CODEC_DMA_TX_3>; + }; + + codec { + sound-dai =3D <&wcd939x 1>, <&swr2 0>, <&lpass_txmacro 0>; + }; + + platform { + sound-dai =3D <&q6apm>; + }; + }; + + wsa-dai-link { + link-name =3D "WSA Playback"; + + cpu { + sound-dai =3D <&q6apmbedai WSA_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai =3D <&left_spkr>, <&right_spkr>, <&swr0 0>, <&lpass_wsamacro= 0>; + }; + + platform { + sound-dai =3D <&q6apm>; + }; + }; + }; + vph_pwr: vph-pwr-regulator { compatible =3D "regulator-fixed"; =20 @@ -102,6 +168,41 @@ vph_pwr: vph-pwr-regulator { regulator-always-on; regulator-boot-on; }; + + wcd939x: audio-codec { + compatible =3D "qcom,wcd9395-codec", "qcom,wcd9390-codec"; + + pinctrl-0 =3D <&wcd_default>; + pinctrl-names =3D "default"; + + qcom,micbias1-microvolt =3D <1800000>; + qcom,micbias2-microvolt =3D <1800000>; + qcom,micbias3-microvolt =3D <1800000>; + qcom,micbias4-microvolt =3D <1800000>; + qcom,mbhc-buttons-vthreshold-microvolt =3D <75000 150000 237000 500000 5= 00000 500000 500000 500000>; + qcom,mbhc-headset-vthreshold-microvolt =3D <1700000>; + qcom,mbhc-headphone-vthreshold-microvolt =3D <50000>; + qcom,rx-device =3D <&wcd_rx>; + qcom,tx-device =3D <&wcd_tx>; + + reset-gpios =3D <&tlmm 107 GPIO_ACTIVE_LOW>; + + vdd-buck-supply =3D <&vreg_l15b_1p8>; + vdd-rxtx-supply =3D <&vreg_l15b_1p8>; + vdd-io-supply =3D <&vreg_l15b_1p8>; + vdd-mic-bias-supply =3D <&vreg_bob1>; + + #sound-dai-cells =3D <1>; + + mode-switch; + orientation-switch; + + port { + wcd_codec_headset_in: endpoint { + remote-endpoint =3D <&wcd_usbss_headset_out>; + }; + }; + }; }; =20 &apps_rsc { @@ -478,6 +579,14 @@ wcd_usbss_sbu_mux: endpoint { remote-endpoint =3D <&pmic_glink_sbu>; }; }; + + port@1 { + reg =3D <1>; + + wcd_usbss_headset_out: endpoint { + remote-endpoint =3D <&wcd_codec_headset_in>; + }; + }; }; }; }; @@ -525,6 +634,16 @@ &ipa { status =3D "okay"; }; =20 +&lpass_tlmm { + spkr_1_sd_n_active: spkr-1-sd-n-active-state { + pins =3D "gpio21"; + function =3D "gpio"; + drive-strength =3D <16>; + bias-disable; + output-low; + }; +}; + &mdss { status =3D "okay"; }; @@ -743,6 +862,74 @@ touchscreen@0 { }; }; =20 +&swr0 { + status =3D "okay"; + + /* WSA8845, Speaker Left */ + left_spkr: speaker@0,0 { + compatible =3D "sdw20217020400"; + reg =3D <0 0>; + pinctrl-0 =3D <&spkr_1_sd_n_active>; + pinctrl-names =3D "default"; + powerdown-gpios =3D <&lpass_tlmm 21 GPIO_ACTIVE_LOW>; + #sound-dai-cells =3D <0>; + sound-name-prefix =3D "SpkrLeft"; + vdd-1p8-supply =3D <&vreg_l15b_1p8>; + vdd-io-supply =3D <&vreg_l3c_1p2>; + }; + + /* WSA8845, Speaker Right */ + right_spkr: speaker@0,1 { + compatible =3D "sdw20217020400"; + reg =3D <0 1>; + pinctrl-0 =3D <&spkr_2_sd_n_active>; + pinctrl-names =3D "default"; + powerdown-gpios =3D <&tlmm 77 GPIO_ACTIVE_LOW>; + #sound-dai-cells =3D <0>; + sound-name-prefix =3D "SpkrRight"; + vdd-1p8-supply =3D <&vreg_l15b_1p8>; + vdd-io-supply =3D <&vreg_l3c_1p2>; + }; +}; + +&swr1 { + status =3D "okay"; + + /* WCD9395 RX */ + wcd_rx: codec@0,4 { + compatible =3D "sdw20217010e00"; + reg =3D <0 4>; + + /* + * WCD9395 RX Port 1 (HPH_L/R) <=3D> SWR1 Port 1 (HPH_L/R) + * WCD9395 RX Port 2 (CLSH) <=3D> SWR1 Port 2 (CLSH) + * WCD9395 RX Port 3 (COMP_L/R) <=3D> SWR1 Port 3 (COMP_L/R) + * WCD9395 RX Port 4 (LO) <=3D> SWR1 Port 4 (LO) + * WCD9395 RX Port 5 (DSD_L/R) <=3D> SWR1 Port 5 (DSD_L/R) + * WCD9395 RX Port 6 (HIFI_PCM_L/R) <=3D> SWR1 Port 9 (HIFI_PCM_L/R) + */ + qcom,rx-port-mapping =3D <1 2 3 4 5 9>; + }; +}; + +&swr2 { + status =3D "okay"; + + /* WCD9395 TX */ + wcd_tx: codec@0,3 { + compatible =3D "sdw20217010e00"; + reg =3D <0 3>; + + /* + * WCD9395 TX Port 1 (ADC1,2,3,4) <=3D> SWR2 Port 2 (TX SWR_INPU= T 0,1,2,3) + * WCD9395 TX Port 2 (ADC3,4 & DMIC0,1) <=3D> SWR2 Port 2 (TX SWR_INPU= T 0,1,2,3) + * WCD9395 TX Port 3 (DMIC0,1,2,3 & MBHC) <=3D> SWR2 Port 3 (TX SWR_INPU= T 4,5,6,7) + * WCD9395 TX Port 4 (DMIC4,5,6,7) <=3D> SWR2 Port 4 (TX SWR_INPU= T 8,9,10,11) + */ + qcom,tx-port-mapping =3D <2 2 3 4>; + }; +}; + &tlmm { /* Reserved I/Os for NFC */ gpio-reserved-ranges =3D <32 8>, <74 1>; @@ -790,6 +977,14 @@ mdp_vsync_suspend: mdp-vsync-suspend-state { bias-pull-down; }; =20 + spkr_2_sd_n_active: spkr-2-sd-n-active-state { + pins =3D "gpio77"; + function =3D "gpio"; + drive-strength =3D <16>; + bias-disable; + output-low; + }; + ts_irq: ts-irq-state { pins =3D "gpio161"; function =3D "gpio"; @@ -804,6 +999,14 @@ ts_reset: ts-reset-state { drive-strength =3D <8>; bias-pull-up; }; + + wcd_default: wcd-reset-n-active-state { + pins =3D "gpio107"; + function =3D "gpio"; + drive-strength =3D <16>; + bias-disable; + output-low; + }; }; =20 &uart14 { --=20 2.34.1 From nobody Wed Dec 24 14:17:14 2025 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8248131735 for ; Thu, 25 Jan 2024 16:42:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706200977; cv=none; b=XG63c002jvD+F1WLjn9xxmktC2m7FNIn4/pf2QgGsm4lbX/d45vf3BgNU79Zvxa06hpnR/75S+nMJBa2qMirSm4V/1o0XI7hvFdfId8JM0bMwAYbn4UA55IFdE4UgkgKr/QSTmkJHzFMoe1AwH1LAz+7BDRKmS5juOel0B7jPRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706200977; c=relaxed/simple; bh=8FlUAYV0p0Hs9/yKUI+wz2YaT+GWCAARd/3llgD8Z0o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=C6A0xbHh/OUuTY2omlXcw4hVtiK+inc2um8iYYtHPIHWfih4CKQAjmVBR3SiudFyjFQyd3jKeLNanOHaFS7Tn2M4H7GfVRH6X1qoE5GaL9SASufC9eUG+uNNJMn6og3TXzs3kFejm9GP1NuljIBbs6onrztSMz1GbrWwlO7yaP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=kwi/yQ9/; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kwi/yQ9/" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-29036dc3a63so3160115a91.3 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=vger.kernel.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=kwi/yQ9/L8SgSnHwxDc+YmQNQPdODnFpmx1/xmp3QxHkClICh1xcwwwhN1i3y1UvWd 8uP882kGXUEboR3us8+EUU7ElUmrwp4U1qiUfLAglLqQlFoMEyxYkIsuoRN7EJb19aat cnZPv+gZVzStQHlJMBAAOrdZebTKcSf1yBd1RptJMrtlr2vwH28nDNF/ISzSDxCLKPrI hXji+etH1vgraTKAP9It026sOldV760ytphOxbezhsssW+9p5sTtEmnUsRuXk+XpMgl7 9ZJzfkU3ZgEfdPisFDLYVjLZy4AFS0oBa0gghIKXNtGkARajpIX3BzbY23pDXCQiM1cm +3Yg== 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=Bfwt0hlmhfKFVoYgcj/i3nEt4u80O91z2hvRe9KjdFuStqjHIhL9fheyUGsWlyIWkJ mMQTzpIVsST5FlzScLDRgQnt0T7WWuL0f7yskrOzsj6Pt4QHpSJse/MinhjonBRaT4sE jat/KCB5mcQJJy3OQ+BIlc/9ccGER7Dl57KPmfddbhvz0iq9h9omQscA9WgQt7mfMZ6a hTKUf1mBtapOuS+rZqhJ/hJMuhumaYjw2oI0WCuojgj2RpLSLfELEFUn05NN3vEAvSHt 2Mm0eTgfZyF3BPVYrIBql5PHAx5GN/gu9aR7yURcb90Eang4xG4kxtr2nWWvdOiiCnWl fqRA== X-Gm-Message-State: AOJu0Yz/30pHwUf/WoY1MgnyeZbxbDLOgFqeSWTdh8b5ed97OQkxcLPq sdrArXq9MGxzJlwOVSMJhUHtPTBr2PwCSdU6QvyGeChhAIM3QCeB4bhk9uXzsEE= 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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 { }; }; =20 + sound { + compatible =3D "qcom,sm8650-sndcard", "qcom,sm8450-sndcard"; + model =3D "SM8650-MTP"; + audio-routing =3D "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT"; + + wsa-dai-link { + link-name =3D "WSA Playback"; + + cpu { + sound-dai =3D <&q6apmbedai WSA_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai =3D <&left_spkr>, <&right_spkr>, <&swr0 0>, <&lpass_wsamacro= 0>; + }; + + platform { + sound-dai =3D <&q6apm>; + }; + }; + }; + vph_pwr: vph-pwr-regulator { compatible =3D "regulator-fixed"; =20 --=20 2.34.1 From nobody Wed Dec 24 14:17:14 2025 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E9B0133981 for ; Thu, 25 Jan 2024 16:42:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706200980; cv=none; b=BksPC8172VTliVBtB30CA7n/VVNbLMs8U3WuLGxeHILLwhe7ShRXELhXyfAdLifuolNMnuUijXCYZbtU+mYzJNEB6j1FuYG1fpCQz6f1G6FqLLdRQukBrEDtCbaf0/dzzcjrZXt3KtYRjR8haJDmVGOwKuQ0hv88XVEXjzZQrN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706200980; c=relaxed/simple; bh=RA/dywI//b8wbJThXyjIP0zXgcdf9VZeWuhmmKqDdfc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Gos05llPV4n8lxIPxIbw85ik7MunWRu7sg/5NFqxnVYlVuKGsim4Agd3rumDuTeRMQBPHKIShxa06SA55nWWBnNrec6xTfzTpzZuU8X9fXGrVDqQ7C0CAG9oQNQ81eUiQ5s0+C4fx+E7XrdH1+6rigvqW5SYTdpHuWf9wAN67fk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=qmoftmKu; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="qmoftmKu" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2900c648b8bso5236745a91.3 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=vger.kernel.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=qmoftmKunVu7+O5pV0MqzQ/W0lqfyHSfwANG/2C27qIlkTrzFzENYxV9/wcBBv2VXo LQuMCp4WdEdnNSBTXLzSm25zfdlvDfMTAIrq9xusksCtQN8kBOkDZM9ZqtGPOlJtahWj AaehgAZssnL9VAIBCZUygW3hz0I11ORg1mibOWnlJEHqhOkSQGFS2ppkE+r+HOI3SEEd rydQ52VGjowDvVmAfX5oLKs0PS168SvVEut8QaCf0n4X9lM6WxAC8LctNYbU9/hsFoZl eLQbD4SthsgNJvdHWuB9uu99SAodepoDe8ghFe1sIcpOVGSkDxyGyQxr0qu1ZOF81t6r hezg== 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=XpLLD7LWErmTTVsUG+wCHYFqRI7FyMn7E0rgMSWi+q7cvJuY07JxIEm8sxOiALEmJJ xFopMG2rQLFhqlSaVZ+1bIHkhAqsEYUbesLp+djYfhvzOL3mzsVZVzfClmWTnWmJo3KP xikfuD/2ny5h1G5Iggg5ROfaBrmrWpynLKbdAIt5aJDNiGs+cmkFbwkVu1Ei+ZHGjcMu +UOJKtcCz7/oArEihiQgU9q0nIbIbdshnaD/nvR8fF6++6Y/4A4nr0RIidhw7RrvizH8 +7+mDznKUrBWa5LQX2X+R4uqlQ+RDO7VOFcPPhY1stlVrWb8FI1kBwNEx6ALKk/Yuh67 HQ2Q== X-Gm-Message-State: AOJu0YwrkIUNuIk62V7YZp6CRUK+mf+6qLWfxlTP1WWlydRTtgxBv1zE yiwh2A/nO6FhX75VT+zs7pfNj4Owavc2v3cmvnbJsctmfq3mBTeHS2vPU/1nPUo= 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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=3Dm CONFIG_PINCTRL_SM8450_LPASS_LPI=3Dm CONFIG_PINCTRL_SC8280XP_LPASS_LPI=3Dm CONFIG_PINCTRL_SM8550_LPASS_LPI=3Dm +CONFIG_PINCTRL_SM8650_LPASS_LPI=3Dm CONFIG_GPIO_ALTERA=3Dm CONFIG_GPIO_DAVINCI=3Dy CONFIG_GPIO_DWAPB=3Dy @@ -992,6 +993,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=3Dm CONFIG_SND_SOC_TLV320AIC3X_I2C=3Dm CONFIG_SND_SOC_WCD9335=3Dm CONFIG_SND_SOC_WCD934X=3Dm +CONFIG_SND_SOC_WCD939X=3Dm +CONFIG_SND_SOC_WCD939X_SDW=3Dm CONFIG_SND_SOC_WM8524=3Dm CONFIG_SND_SOC_WM8904=3Dm CONFIG_SND_SOC_WM8960=3Dm --=20 2.34.1