From mboxrd@z Thu Jan 1 00:00:00 1970 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 860C2C4332F for ; Mon, 14 Nov 2022 15:40:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237098AbiKNPkK (ORCPT ); Mon, 14 Nov 2022 10:40:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbiKNPkD (ORCPT ); Mon, 14 Nov 2022 10:40:03 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E982EF26 for ; Mon, 14 Nov 2022 07:40:01 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id j16so19856581lfe.12 for ; Mon, 14 Nov 2022 07:40:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=nT6MgmNBvZWKRQFDoYARVRQ41WCdAZRAjkt/TvnRGaU=; b=cjmkbQ564vxesHH2AB77D897AVaKI5Ejrrdy0+4HI7NFl32fb9SIJ9l9wMSCm5qXfX f62rrso0vEVC5D9MMsQoZT/tZ6Mhb6vq0t71AvMkyxhM4f/Avh6Q6ofdwxT7HKB0FMTJ lOGtWCs6EgQoZBpw4jf1Y2XCaJTfL8+RGUFsfLZ03sPqMp0ff1WT3aSsyortAtibN3FJ PaPNvdkxjqwb/VzgkJTJVgZ/NNwtKBRBAcvmjBXti2wyHilvo1ovnEHV+XIOAuIvNMXf UY5JRp+MdYsgNhwHAbuQOIw1V+LlLOcPro80a84kvoHVGWJFFv6wH+bZfh9XrNGPmj4Y nilw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=nT6MgmNBvZWKRQFDoYARVRQ41WCdAZRAjkt/TvnRGaU=; b=t1Hm+6vKkbflZHHJu0HY5AQ5X7tfLVVQQAxUzLgl7m+Or9JI6VKGLVih4j34Wdgd/J fT3BXhmPWOKVkZcFNu64J6M2tWlSoroV/qXDxuEt+qM57Q2KS461xFRIVTJi6AdWkEsE S0ErkRVbzOq7N5lrqP1tLglqWPd8lUkfIvp69G0xomrAZnyMKM/wROzKTcSRTVa6QQqL lpJbO0JGxEBkqq5Bsw/lktPTykT0hIIROzW275FjycdZe5yAloUYNnSASeCzHNLRITia SLg6XWsIn5vixyZWRQZqEcNyXPlRuZDQzW/bDoS+eyIXPiMPteMPmFhxfEXyBajcFvCo XurQ== X-Gm-Message-State: ANoB5pk8BmYqyZdOpNyx5SwmmnMFR0pbE32wdEZ8hvGApu/4bQwDZNPW MI2xTO+4Tm3REQNhPjZUYnNuIA== X-Google-Smtp-Source: AA0mqf6rMbuavD6VLXj06hA0/KezQJEXmLeavpaO/odyLjFvQ+qwF1ysjMMUHp97jmpFlqDSDaWkoA== X-Received: by 2002:a05:6512:3ac:b0:4a2:25b5:a2aa with SMTP id v12-20020a05651203ac00b004a225b5a2aamr4968464lfp.531.1668440400258; Mon, 14 Nov 2022 07:40:00 -0800 (PST) Received: from [192.168.31.208] ([194.29.137.22]) by smtp.gmail.com with ESMTPSA id o22-20020ac25e36000000b0049fbf5facf4sm1853204lfg.75.2022.11.14.07.39.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Nov 2022 07:39:59 -0800 (PST) Message-ID: Date: Mon, 14 Nov 2022 16:39:56 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH 3/3] arm64: dts: qcom: sm8450-hdk: add sound support To: Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Srinivas Kandagatla References: <20221114152130.385871-1-krzysztof.kozlowski@linaro.org> <20221114152130.385871-4-krzysztof.kozlowski@linaro.org> From: Konrad Dybcio In-Reply-To: <20221114152130.385871-4-krzysztof.kozlowski@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 14/11/2022 16:21, Krzysztof Kozlowski wrote: > From: Srinivas Kandagatla > > Add sound support to SM8450 HDK board. Tested setup so far is only two > speakers (working) and head-phones (only one channel working). > > Signed-off-by: Srinivas Kandagatla > Co-developed-by: Krzysztof Kozlowski > Signed-off-by: Krzysztof Kozlowski > --- > arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 161 ++++++++++++++++++++++++ > 1 file changed, 161 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > index 4d75f9db08c2..c177283b6764 100644 > --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > @@ -6,6 +6,8 @@ > /dts-v1/; > > #include > +#include > +#include > #include "sm8450.dtsi" > > / { > @@ -421,6 +423,147 @@ &uart7 { > status = "okay"; > }; > > +&soc { soc should go before uart alphabetically. Other than that: Reviewed-by: Konrad Dybcio Konrad > + wcd938x: codec { > + compatible = "qcom,wcd9380-codec"; > + > + 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 43 GPIO_ACTIVE_HIGH>; > + #sound-dai-cells = <1>; > + > + vdd-buck-supply = <&vreg_s10b_1p8>; > + vdd-rxtx-supply = <&vreg_s10b_1p8>; > + vdd-io-supply = <&vreg_s10b_1p8>; > + vdd-mic-bias-supply = <&vreg_bob>; > + }; > +}; > + > +&sound { > + compatible = "qcom,sm8450-sndcard"; > + model = "SM8450-HDK"; > + 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"; > + > + wcd-playback-dai-link { > + link-name = "WCD Playback"; > + cpu { > + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; > + }; > + > + codec { > + sound-dai = <&wcd938x 0>, <&swr1 0>, <&rxmacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + wcd-playback-dai-link { > + link-name = "WCD Playback"; > + cpu { > + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; > + }; > + > + codec { > + sound-dai = <&wcd938x 0>, <&swr1 0>, <&rxmacro 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>, <&wsamacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + va-dai-link { > + link-name = "VA Capture"; > + cpu { > + sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > +}; > + > +&swr0 { > + right_spkr: speaker@0,1{ > + compatible = "sdw10217020200"; > + reg = <0 1>; > + pinctrl-names = "default"; > + pinctrl-0 = <&spkr_1_sd_n_active>; > + powerdown-gpios = <&tlmm 1 GPIO_ACTIVE_LOW>; > + #sound-dai-cells = <0>; > + sound-name-prefix = "SpkrRight"; > + #thermal-sensor-cells = <0>; > + vdd-supply = <&vreg_s10b_1p8>; > + }; > + > + left_spkr: speaker@0,2{ > + compatible = "sdw10217020200"; > + reg = <0 2>; > + pinctrl-names = "default"; > + pinctrl-0 = <&spkr_2_sd_n_active>; > + powerdown-gpios = <&tlmm 89 GPIO_ACTIVE_LOW>; > + #sound-dai-cells = <0>; > + sound-name-prefix = "SpkrLeft"; > + #thermal-sensor-cells = <0>; > + vdd-supply = <&vreg_s10b_1p8>; > + }; > +}; > + > +&swr1 { > + status = "okay"; > + > + wcd_rx: codec@0,4 { > + compatible = "sdw20217010d00"; > + reg = <0 4>; > + qcom,rx-port-mapping = <1 2 3 4 5>; > + }; > +}; > + > +&swr2 { > + status = "okay"; > + > + wcd_tx: codec@0,3 { > + compatible = "sdw20217010d00"; > + reg = <0 3>; > + /* ports: adc1_2, adc3_4, dmic0_3_mbhc, dmic4_7 */ > + qcom,tx-port-mapping = <1 1 2 3>; > + }; > +}; > + > &ufs_mem_hc { > status = "okay"; > > @@ -461,3 +604,21 @@ &usb_1_qmpphy { > vdda-phy-supply = <&vreg_l6b_1p2>; > vdda-pll-supply = <&vreg_l1b_0p91>; > }; > + > +&tlmm { > + spkr_1_sd_n_active: spkr-1-sd-n-active-state { > + pins = "gpio1"; > + function = "gpio"; > + drive-strength = <4>; > + bias-disable; > + output-low; > + }; > + > + spkr_2_sd_n_active: spkr-2-sd-n-active-state { > + pins = "gpio89"; > + function = "gpio"; > + drive-strength = <4>; > + bias-disable; > + output-low; > + }; > +};