From nobody Fri Sep 19 05:27:47 2025 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 BD5A8C433FE for ; Mon, 28 Nov 2022 13:10:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231533AbiK1NK1 (ORCPT ); Mon, 28 Nov 2022 08:10:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230303AbiK1NKW (ORCPT ); Mon, 28 Nov 2022 08:10:22 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F03D31B1CC for ; Mon, 28 Nov 2022 05:10:21 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id c1so17235038lfi.7 for ; Mon, 28 Nov 2022 05:10:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Io1oIDr6QzpJ0cxoJPVwXJRJH17or5F5V6Z/tc/VINw=; b=Y18LohRlpM/lfsw6NlB8x4jMp9FGzuR2TV64IuZJethvKMicv10T4qZwJW0eGOgAlW iDv1Xjm8wZL7cMCfchefTHbVtFXGnT4nogz3w1iMynSGBHRNGdnxRAsCuQRF5QvcGPHZ GYwX274KYvCfPAex7/YeGbT+C8/8MEyP3RMjcjnvKd4EfJtoiy+Q+AuJS0yRhfb7777d GkLJfaDXK/Kix5ynjoE0Sud48yuzqoYey8iXBE8LKHewY7uQ6bqzEQ3d9ZwG1as0toiy Cmgp9Vs8wWIWpRiTrQ8EsfN9BJLujutn6Zy2YAcaqr1PxTLJpJ/vF2QAWlsJmj7HZdwc hPEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Io1oIDr6QzpJ0cxoJPVwXJRJH17or5F5V6Z/tc/VINw=; b=xLu+dp8AJZwQVVKTv8cLe+0mTpUFoXgMA7+gCIkCYHSR22/w4fb3W9muQDo7NDLE0s MpkkESUAYIgvl430lN9V1kMCxl49QCWUrDxaIfHkfzdBv9o2HlQjOrXEhnF2KD5baBb2 /EWZaqSjDnKQPe6msCqZ0ALbvNGpp/tLyT7e1iSOPtFFHCxR65eoa/sYc7330AO+aer0 4qdF1IuCOsF4eSHg9VTPTWPqocdu0/zgfuTuNgK9cJsjmh2V0VdSSW1AKlPB3iQ4ay0j ZS8B9mY1Cn46syd2+3Loz6Mvq1po2TfVLafKMyWm7A3YBO3in0OA1OcjImYoHtgn4wcE 3uLg== X-Gm-Message-State: ANoB5plHwK73iUiLed3lXkq874W8zXQMkOhBrN4wsyWguConyT1mQRJs aciqPYA0KEX1oH9KJQ/VDdod/Q== X-Google-Smtp-Source: AA0mqf4vd6UbZ8J3Ebxgt5xOJwIq8fO+FYv5iyf1fhtgIQt/SC97iOb5c8fLiTlgPYq/r7Co38IF9Q== X-Received: by 2002:a05:6512:c21:b0:4a4:5e42:ea06 with SMTP id z33-20020a0565120c2100b004a45e42ea06mr16153873lfu.408.1669641020251; Mon, 28 Nov 2022 05:10:20 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id j12-20020a056512028c00b004b40c1f1c70sm1725340lfp.212.2022.11.28.05.10.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 05:10:19 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Srinivas Kandagatla , Krzysztof Kozlowski Subject: [PATCH v5 1/3] arm64: dts: qcom: sm8450: add GPR node Date: Mon, 28 Nov 2022 14:10:14 +0100 Message-Id: <20221128131016.127860-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128131016.127860-1-krzysztof.kozlowski@linaro.org> References: <20221128131016.127860-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla Add Generic Packet Router (GPR) device node with ADSP services. Signed-off-by: Srinivas Kandagatla Co-developed-by: Krzysztof Kozlowski Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- Changes since v4: 1. None Changes since v3: 1. Re-order reg. --- arch/arm64/boot/dts/qcom/sm8450.dtsi | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qco= m/sm8450.dtsi index f20db5456765..7b63c56ff2f4 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -13,6 +13,7 @@ #include #include #include +#include #include #include =20 @@ -2127,6 +2128,45 @@ IPCC_MPROC_SIGNAL_GLINK_QMP label =3D "lpass"; qcom,remote-pid =3D <2>; =20 + gpr { + compatible =3D "qcom,gpr"; + qcom,glink-channels =3D "adsp_apps"; + qcom,domain =3D ; + qcom,intents =3D <512 20>; + #address-cells =3D <1>; + #size-cells =3D <0>; + + q6apm: service@1 { + compatible =3D "qcom,q6apm"; + reg =3D ; + #sound-dai-cells =3D <0>; + qcom,protection-domain =3D "avs/audio", + "msm/adsp/audio_pd"; + + q6apmdai: dais { + compatible =3D "qcom,q6apm-dais"; + iommus =3D <&apps_smmu 0x1801 0x0>; + }; + + q6apmbedai: bedais { + compatible =3D "qcom,q6apm-lpass-dais"; + #sound-dai-cells =3D <1>; + }; + }; + + q6prm: service@2 { + compatible =3D "qcom,q6prm"; + reg =3D ; + qcom,protection-domain =3D "avs/audio", + "msm/adsp/audio_pd"; + + q6prmcc: clock-controller { + compatible =3D "qcom,q6prm-lpass-clocks"; + #clock-cells =3D <2>; + }; + }; + }; + fastrpc { compatible =3D "qcom,fastrpc"; qcom,glink-channels =3D "fastrpcglink-apps-dsp"; --=20 2.34.1 From nobody Fri Sep 19 05:27:47 2025 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 2851AC4167D for ; Mon, 28 Nov 2022 13:10:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230032AbiK1NKb (ORCPT ); Mon, 28 Nov 2022 08:10:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230364AbiK1NKZ (ORCPT ); Mon, 28 Nov 2022 08:10:25 -0500 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3DD41C117 for ; Mon, 28 Nov 2022 05:10:23 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id f13so17241074lfa.6 for ; Mon, 28 Nov 2022 05:10:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F+MZFFXQoUg3Z5XDdTQwCe4xWRYWXnsMf0CVDTxJETo=; b=ES4wwhw+HbyFfsdgILeqak2EdPforwx6r76D3oaBVKWkDfcJ/CHiFlwsHzSlMQCGsU RidDxvWiMjTH1rfb7rfTYRU9Q4Z84lXLMIrZ+/vlxAQUIRKIKJWzqys0qFP4JbbgtBNM ODNVJyClwa5PGzpfEHxzKYfUxX370W5eAH6BE/D+R7kshv56yffD2lODJk+EdDRINDxH txmmq5HIJ5SlyhD6MVPul7I7m6Arj4yeRKNkL+Wo0DppqnEfiRhgpHw2qaybxPFesx9Y PVTjTfbt/Pig1t/hh+0XAyD7Ga/x2HFB38sV9ttg0U9NnVt2dPXFgkFAudvm6oUla7xY OPNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F+MZFFXQoUg3Z5XDdTQwCe4xWRYWXnsMf0CVDTxJETo=; b=3MsWUqdx0ZGiUpm9dFCYiYPSrtYLu0YSCXi26ldFU5u53dWarVZEgHVTTClve7DUyI KU5aQ/K4uY2ZETVgu6d+42pdNIS5+UnLGdeZ0HIzsz/0ewm8/uIU+lIONMf4DKErRmGS +as6Qw5ulGcDLqZoakYNoUAJpOz9lIWLjM3AqxHQaewLiMqmaqjs+6+8LK/QPt2bWV/B lJ9uad8Eg6fwTGWf9gFyqlK6DGjmI8/9zLjC6y1ye5IrStKQqo+6UI/aR+5lTYT2jC74 tiToTGsOCY/H10IEcbYg7oDA7Xpwwdr3fzvFS5RVWjySOAH2y0K0jiRcC5EFC43evvww uvaw== X-Gm-Message-State: ANoB5plc3bJv7yxMt0qoF4fxpzpATF5LGa1ugEG6LvuF5UbvkEix2nyA /Mh9t/VkuE93aQcLsmR17A5RHA== X-Google-Smtp-Source: AA0mqf4j+tL8JbuzDrExGUSMTCuPKekebgCSGv4qfhcYBHzy7h6Z1zNeGyz6IIoYCiyfFly7WF0qOQ== X-Received: by 2002:ac2:50cf:0:b0:4aa:6cdf:2aef with SMTP id h15-20020ac250cf000000b004aa6cdf2aefmr12956009lfm.247.1669641021396; Mon, 28 Nov 2022 05:10:21 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id j12-20020a056512028c00b004b40c1f1c70sm1725340lfp.212.2022.11.28.05.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 05:10:20 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Srinivas Kandagatla , Krzysztof Kozlowski Subject: [PATCH v5 2/3] arm64: dts: qcom: sm8450: add Soundwire and LPASS Date: Mon, 28 Nov 2022 14:10:15 +0100 Message-Id: <20221128131016.127860-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128131016.127860-1-krzysztof.kozlowski@linaro.org> References: <20221128131016.127860-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla Add Soundwire controllers, Low Power Audio SubSystem (LPASS) devices and LPASS pin controller. Signed-off-by: Srinivas Kandagatla Co-developed-by: Krzysztof Kozlowski Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- Changes since v4: 1. Re-order few properties between Soundwire nodes, to keep them ordered consistently. 2. Drop unsupported qcom,port-offset. Changes since v3: 1. Re-order reg and sound-dai-cells. Changes since v2: 1. Use lower-case hex. Changes since v1: 1. Whitespace cleanups. 2. Correct include - do not use deprecated one. --- arch/arm64/boot/dts/qcom/sm8450.dtsi | 292 +++++++++++++++++++++++++++ 1 file changed, 292 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qco= m/sm8450.dtsi index 7b63c56ff2f4..380405ec3452 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -15,6 +15,7 @@ #include #include #include +#include #include =20 / { @@ -2090,6 +2091,209 @@ compute-cb@3 { }; }; =20 + wsa2macro: codec@31e0000 { + compatible =3D "qcom,sm8450-lpass-wsa-macro"; + reg =3D <0 0x031e0000 0 0x1000>; + clocks =3D <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_= COUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUP= LE_NO>, + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&vamacro>; + clock-names =3D "mclk", "npl", "macro", "dcodec", "fsgen"; + assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_A= TTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_CO= UPLE_NO>; + assigned-clock-rates =3D <19200000>, <19200000>; + + #clock-cells =3D <0>; + clock-output-names =3D "wsa2-mclk"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&wsa2_swr_active>; + #sound-dai-cells =3D <1>; + }; + + /* WSA2 */ + swr4: soundwire-controller@31f0000 { + compatible =3D "qcom,soundwire-v1.7.0"; + reg =3D <0 0x031f0000 0 0x2000>; + interrupts =3D ; + clocks =3D <&wsa2macro>; + clock-names =3D "iface"; + + qcom,din-ports =3D <2>; + qcom,dout-ports =3D <6>; + + qcom,ports-sinterval-low =3D /bits/ 8 <0x07 0x1f 0x3f 0x07 0x1f 0x3f 0x= 0f 0x0f>; + qcom,ports-offset1 =3D /bits/ 8 <0x01 0x02 0x0c 0x06 0x12 0x0d 0x07 0x= 0a>; + qcom,ports-offset2 =3D /bits/ 8 <0xff 0x00 0x1f 0xff 0x00 0x1f 0x00 0x= 00>; + qcom,ports-hstart =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xf= f>; + qcom,ports-hstop =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff= >; + qcom,ports-word-length =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff= 0xff>; + qcom,ports-block-pack-mode =3D /bits/ 8 <0xff 0xff 0x01 0xff 0xff 0x01 = 0xff 0xff>; + qcom,ports-block-group-count =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xf= f 0xff 0xff>; + qcom,ports-lane-control =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xf= f 0xff>; + + #address-cells =3D <2>; + #size-cells =3D <0>; + #sound-dai-cells =3D <1>; + }; + + rxmacro: codec@3200000 { + compatible =3D "qcom,sm8450-lpass-rx-macro"; + reg =3D <0 0x3200000 0 0x1000>; + clocks =3D <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_C= OUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUP= LE_NO>, + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&vamacro>; + clock-names =3D "mclk", "npl", "macro", "dcodec", "fsgen"; + + assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_A= TTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUP= LE_NO>; + assigned-clock-rates =3D <19200000>, <19200000>; + + #clock-cells =3D <0>; + clock-output-names =3D "mclk"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&rx_swr_active>; + #sound-dai-cells =3D <1>; + }; + + swr1: soundwire-controller@3210000 { + compatible =3D "qcom,soundwire-v1.7.0"; + reg =3D <0 0x3210000 0 0x2000>; + interrupts =3D ; + clocks =3D <&rxmacro>; + clock-names =3D "iface"; + label =3D "RX"; + qcom,din-ports =3D <0>; + qcom,dout-ports =3D <5>; + + qcom,ports-sinterval-low =3D /bits/ 8 <0x03 0x1f 0x1f 0x07 0x00>; + qcom,ports-offset1 =3D /bits/ 8 <0x00 0x00 0x0b 0x01 0x00>; + qcom,ports-offset2 =3D /bits/ 8 <0x00 0x00 0x0b 0x00 0x00>; + qcom,ports-hstart =3D /bits/ 8 <0xff 0x03 0xff 0xff 0xff>; + qcom,ports-hstop =3D /bits/ 8 <0xff 0x06 0xff 0xff 0xff>; + qcom,ports-word-length =3D /bits/ 8 <0x01 0x07 0x04 0xff 0xff>; + qcom,ports-block-pack-mode =3D /bits/ 8 <0xff 0x00 0x01 0xff 0xff>; + qcom,ports-block-group-count =3D /bits/ 8 <0xff 0xff 0xff 0xff 0x00>; + qcom,ports-lane-control =3D /bits/ 8 <0x01 0x00 0x00 0x00 0x00>; + + #address-cells =3D <2>; + #size-cells =3D <0>; + #sound-dai-cells =3D <1>; + }; + + txmacro: codec@3220000 { + compatible =3D "qcom,sm8450-lpass-tx-macro"; + reg =3D <0 0x3220000 0 0x1000>; + clocks =3D <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_C= OUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUP= LE_NO>, + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&vamacro>; + clock-names =3D "mclk", "npl", "macro", "dcodec", "fsgen"; + assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_AT= TRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_CO= UPLE_NO>; + assigned-clock-rates =3D <19200000>, <19200000>; + + #clock-cells =3D <0>; + clock-output-names =3D "mclk"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&tx_swr_active>; + #sound-dai-cells =3D <1>; + }; + + wsamacro: codec@3240000 { + compatible =3D "qcom,sm8450-lpass-wsa-macro"; + reg =3D <0 0x03240000 0 0x1000>; + clocks =3D <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_= COUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUP= LE_NO>, + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&vamacro>; + clock-names =3D "mclk", "npl", "macro", "dcodec", "fsgen"; + + assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_A= TTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_CO= UPLE_NO>; + assigned-clock-rates =3D <19200000>, <19200000>; + + #clock-cells =3D <0>; + clock-output-names =3D "mclk"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&wsa_swr_active>; + #sound-dai-cells =3D <1>; + }; + + /* WSA */ + swr0: soundwire-controller@3250000 { + compatible =3D "qcom,soundwire-v1.7.0"; + reg =3D <0 0x03250000 0 0x2000>; + interrupts =3D ; + clocks =3D <&wsamacro>; + clock-names =3D "iface"; + + qcom,din-ports =3D <2>; + qcom,dout-ports =3D <6>; + + qcom,ports-sinterval-low =3D /bits/ 8 <0x07 0x1f 0x3f 0x07 0x1f 0x3f 0x= 0f 0x0f>; + qcom,ports-offset1 =3D /bits/ 8 <0x01 0x02 0x0c 0x06 0x12 0x0d 0x07 0x= 0a>; + qcom,ports-offset2 =3D /bits/ 8 <0xff 0x00 0x1f 0xff 0x00 0x1f 0x00 0x= 00>; + qcom,ports-hstart =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xf= f>; + qcom,ports-hstop =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff= >; + qcom,ports-word-length =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff= 0xff>; + qcom,ports-block-pack-mode =3D /bits/ 8 <0xff 0xff 0x01 0xff 0xff 0x01 = 0xff 0xff>; + qcom,ports-block-group-count =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xf= f 0xff 0xff>; + qcom,ports-lane-control =3D /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xf= f 0xff>; + + #address-cells =3D <2>; + #size-cells =3D <0>; + #sound-dai-cells =3D <1>; + }; + + swr2: soundwire-controller@33b0000 { + compatible =3D "qcom,soundwire-v1.7.0"; + reg =3D <0 0x33b0000 0 0x2000>; + interrupts-extended =3D <&intc GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH>, + <&intc GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names =3D "core", "wake"; + + clocks =3D <&vamacro>; + clock-names =3D "iface"; + label =3D "TX"; + + qcom,din-ports =3D <4>; + qcom,dout-ports =3D <0>; + qcom,ports-sinterval-low =3D /bits/ 8 <0x01 0x01 0x03 0x03>; + qcom,ports-offset1 =3D /bits/ 8 <0x00 0x00 0x01 0x01>; + qcom,ports-offset2 =3D /bits/ 8 <0x00 0x00 0x00 0x00>; + qcom,ports-hstart =3D /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-hstop =3D /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-word-length =3D /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-block-pack-mode =3D /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-block-group-count =3D /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-lane-control =3D /bits/ 8 <0x01 0x02 0x00 0x00>; + + #address-cells =3D <2>; + #size-cells =3D <0>; + #sound-dai-cells =3D <1>; + }; + + vamacro: codec@33f0000 { + compatible =3D "qcom,sm8450-lpass-va-macro"; + reg =3D <0 0x033f0000 0 0x1000>; + clocks =3D <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUP= LE_NO>, + <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUP= LE_NO>; + clock-names =3D "mclk", "macro", "dcodec", "npl"; + assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRI= BUTE_COUPLE_NO>; + assigned-clock-rates =3D <19200000>; + + #clock-cells =3D <0>; + clock-output-names =3D "fsgen"; + #sound-dai-cells =3D <1>; + }; + remoteproc_adsp: remoteproc@30000000 { compatible =3D "qcom,sm8450-adsp-pas"; reg =3D <0 0x30000000 0 0x100>; @@ -3023,6 +3227,91 @@ qup_uart20_default: qup-uart20-default-state { =20 }; =20 + lpass_tlmm: pinctrl@3440000{ + compatible =3D "qcom,sm8450-lpass-lpi-pinctrl"; + reg =3D <0 0x3440000 0x0 0x20000>, + <0 0x34d0000 0x0 0x10000>; + gpio-controller; + #gpio-cells =3D <2>; + gpio-ranges =3D <&lpass_tlmm 0 0 23>; + + clocks =3D <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + clock-names =3D "core", "audio"; + + wsa_swr_active: wsa-swr-active-state { + clk-pins { + pins =3D "gpio10"; + function =3D "wsa_swr_clk"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-disable; + }; + + data-pins { + pins =3D "gpio11"; + function =3D "wsa_swr_data"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-bus-hold; + }; + }; + + tx_swr_active: tx-swr-active-state { + clk-pins { + pins =3D "gpio0"; + function =3D "swr_tx_clk"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-disable; + }; + + data-pins { + pins =3D "gpio1", "gpio2", "gpio14"; + function =3D "swr_tx_data"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-bus-hold; + }; + }; + + rx_swr_active: rx-swr-active-state { + clk-pins { + pins =3D "gpio3"; + function =3D "swr_rx_clk"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-disable; + }; + + data-pins { + pins =3D "gpio4", "gpio5"; + function =3D "swr_rx_data"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-bus-hold; + }; + }; + + wsa2_swr_active: wsa2-swr-active-state { + clk-pins { + pins =3D "gpio15"; + function =3D "wsa2_swr_clk"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-disable; + }; + + data-pins { + pins =3D "gpio16"; + function =3D "wsa2_swr_data"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-bus-hold; + }; + }; + }; + apps_smmu: iommu@15000000 { compatible =3D "qcom,sm8450-smmu-500", "arm,mmu-500"; reg =3D <0 0x15000000 0 0x100000>; @@ -3501,6 +3790,9 @@ lpass_ag_noc: interconnect@3c40000 { }; }; =20 + sound: sound { + }; + thermal-zones { aoss0-thermal { polling-delay-passive =3D <0>; --=20 2.34.1 From nobody Fri Sep 19 05:27:47 2025 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 E7750C43217 for ; Mon, 28 Nov 2022 13:10:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231560AbiK1NKq (ORCPT ); Mon, 28 Nov 2022 08:10:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231548AbiK1NK1 (ORCPT ); Mon, 28 Nov 2022 08:10:27 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BC131B78B for ; Mon, 28 Nov 2022 05:10:25 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id p8so17235102lfu.11 for ; Mon, 28 Nov 2022 05:10:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x2VDk9WSgKE7gnZ+IZTtTJGUT3TjLU23nEk753LNAQ0=; b=DwqcsW908YXc8KDEdo/A2J4EN4ppOywI9129X6ZcT9BYy9znVcrr9i0J7/Yw3bwBX8 n4h1JKhB1vzupvlKfFERiMOr9vQz+i6zsWLDPBJhVu/Tq42EiEiJJxRLZK0BSbS8vbAZ sHr82f3JtMEjl1dI3/2Ds3ICf/BhIlFYTmr7u3CdHC9gbF+qXUQ0NE5ToA0p2GU5gwy+ aMi8W+fNPFIGPkpUiIjF2SXKS6kEUgBYbFbriHvVaO8/lmz3Uj1+/QnLExY6YsvMBVVX COZGpEfpOASXghSD8WHitpsqU/YIBxxCUF8MAJdoOMqQGePUiGAUNdjZpji6k1XlFW3S FNsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x2VDk9WSgKE7gnZ+IZTtTJGUT3TjLU23nEk753LNAQ0=; b=ROhVSJAp6rqsloApWf7LoZkl9gN/R9bYU7RolO5c39nBqeV5Gh3P0jUyeurPVT6rwL qQ7/NJMl7JMwrHOzqfCqS+5vfFfRKTmTCZM+HHwvxwl9A5dJ4wNuCj291wMrm05qTDN9 5f6Oha1QKXQ2jVsT81kR9udoMknR7JFL5jZkFogElvlli5IGFcOcIEEF+F766vT1M05/ LiSY7ANHL4MDDgLGsO2ryydYbjY2ReTDQtRRfT67hoPw/Bygqlefq3x7j42WQBacIddO o35yoLI7IhoafHghi/e1as2s0qvY3NnPLZt+UG93FVluJ7UA8BIXU9mLFOXCd6B3E8/t HCdQ== X-Gm-Message-State: ANoB5pkuwJ7uGGvK1qRsCPtLlc8CWn8JG2+p+sbdRqx8ixWLylMyJkHV W8oNvroC/Pt2CHeBJfM7J5GrLQ== X-Google-Smtp-Source: AA0mqf6s1nctV4i4RXW1mj8ytVh7NNkyTWpvyXFfwC/ihIV5eP4Uj5nZGDp1RDwa1k9rgh1Rpyt6gg== X-Received: by 2002:ac2:5f49:0:b0:4a4:7db1:b853 with SMTP id 9-20020ac25f49000000b004a47db1b853mr16285157lfz.562.1669641022383; Mon, 28 Nov 2022 05:10:22 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id j12-20020a056512028c00b004b40c1f1c70sm1725340lfp.212.2022.11.28.05.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 05:10:22 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Srinivas Kandagatla , Krzysztof Kozlowski Subject: [PATCH v5 3/3] arm64: dts: qcom: sm8450-hdk: add sound support Date: Mon, 28 Nov 2022 14:10:16 +0100 Message-Id: <20221128131016.127860-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128131016.127860-1-krzysztof.kozlowski@linaro.org> References: <20221128131016.127860-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Konrad Dybcio --- Changes since v3: 1. None. Changes since v2: 1. Use ACTIVE_LOW for qcom,wcd9380-codec reset-gpios. https://lore.kernel.org/all/20221116053817.2929810-11-dmitry.torokhov@gm= ail.com/ Changes since v1: 1. Sort. 2. Correct include - do not use deprecated one and drop q6asm.h (not used). --- arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 160 ++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/= qcom/sm8450-hdk.dts index 4d75f9db08c2..1e1393e732ca 100644 --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts @@ -6,6 +6,7 @@ /dts-v1/; =20 #include +#include #include "sm8450.dtsi" =20 / { @@ -406,6 +407,147 @@ &sdhc_2 { status =3D "okay"; }; =20 +&soc { + wcd938x: codec { + compatible =3D "qcom,wcd9380-codec"; + + 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 43 GPIO_ACTIVE_LOW>; + #sound-dai-cells =3D <1>; + + vdd-buck-supply =3D <&vreg_s10b_1p8>; + vdd-rxtx-supply =3D <&vreg_s10b_1p8>; + vdd-io-supply =3D <&vreg_s10b_1p8>; + vdd-mic-bias-supply =3D <&vreg_bob>; + }; +}; + +&sound { + compatible =3D "qcom,sm8450-sndcard"; + model =3D "SM8450-HDK"; + 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"; + + wcd-playback-dai-link { + link-name =3D "WCD Playback"; + cpu { + sound-dai =3D <&q6apmbedai RX_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai =3D <&wcd938x 0>, <&swr1 0>, <&rxmacro 0>; + }; + + platform { + sound-dai =3D <&q6apm>; + }; + }; + + wcd-playback-dai-link { + link-name =3D "WCD Playback"; + cpu { + sound-dai =3D <&q6apmbedai RX_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai =3D <&wcd938x 0>, <&swr1 0>, <&rxmacro 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>, <&wsamacro 0>; + }; + + platform { + sound-dai =3D <&q6apm>; + }; + }; + + va-dai-link { + link-name =3D "VA Capture"; + cpu { + sound-dai =3D <&q6apmbedai VA_CODEC_DMA_TX_0>; + }; + + platform { + sound-dai =3D <&q6apm>; + }; + }; +}; + +&swr0 { + right_spkr: speaker@0,1{ + compatible =3D "sdw10217020200"; + reg =3D <0 1>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&spkr_1_sd_n_active>; + powerdown-gpios =3D <&tlmm 1 GPIO_ACTIVE_LOW>; + #sound-dai-cells =3D <0>; + sound-name-prefix =3D "SpkrRight"; + #thermal-sensor-cells =3D <0>; + vdd-supply =3D <&vreg_s10b_1p8>; + }; + + left_spkr: speaker@0,2{ + compatible =3D "sdw10217020200"; + reg =3D <0 2>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&spkr_2_sd_n_active>; + powerdown-gpios =3D <&tlmm 89 GPIO_ACTIVE_LOW>; + #sound-dai-cells =3D <0>; + sound-name-prefix =3D "SpkrLeft"; + #thermal-sensor-cells =3D <0>; + vdd-supply =3D <&vreg_s10b_1p8>; + }; +}; + +&swr1 { + status =3D "okay"; + + wcd_rx: codec@0,4 { + compatible =3D "sdw20217010d00"; + reg =3D <0 4>; + qcom,rx-port-mapping =3D <1 2 3 4 5>; + }; +}; + +&swr2 { + status =3D "okay"; + + wcd_tx: codec@0,3 { + compatible =3D "sdw20217010d00"; + reg =3D <0 3>; + /* ports: adc1_2, adc3_4, dmic0_3_mbhc, dmic4_7 */ + qcom,tx-port-mapping =3D <1 1 2 3>; + }; +}; + &tlmm { gpio-reserved-ranges =3D <28 4>, <36 4>; =20 @@ -461,3 +603,21 @@ &usb_1_qmpphy { vdda-phy-supply =3D <&vreg_l6b_1p2>; vdda-pll-supply =3D <&vreg_l1b_0p91>; }; + +&tlmm { + spkr_1_sd_n_active: spkr-1-sd-n-active-state { + pins =3D "gpio1"; + function =3D "gpio"; + drive-strength =3D <4>; + bias-disable; + output-low; + }; + + spkr_2_sd_n_active: spkr-2-sd-n-active-state { + pins =3D "gpio89"; + function =3D "gpio"; + drive-strength =3D <4>; + bias-disable; + output-low; + }; +}; --=20 2.34.1