From patchwork Wed Dec 2 18:07:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 11946557 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08C5DC71155 for ; Wed, 2 Dec 2020 18:08:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5E2422201 for ; Wed, 2 Dec 2020 18:08:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387496AbgLBSIf (ORCPT ); Wed, 2 Dec 2020 13:08:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727108AbgLBSIe (ORCPT ); Wed, 2 Dec 2020 13:08:34 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7308EC0617A6 for ; Wed, 2 Dec 2020 10:07:54 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id g185so10794001wmf.3 for ; Wed, 02 Dec 2020 10:07:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g6nXFxwui6LlgkzThdMNjZ7jNWTIQtA3MqnNk7x+FbA=; b=eCfisf3scDZboHsfmTrU9hQL3m3FB9sjSJHws8ZskY7oNjwUnzr3djiDKnorRanFOj BOxWeh648P014c1o2sHr6O62S1FMuHlj983nPwDpp15vb7mKHF2B0jg0A81VkaZLp0Yt jypoZZzyeyzSVD9PJZbE8sEsYVu3WCLoVIkAPu+C68/yqYwIQ/EyVYXyXetzrsWFfpRU fj9Z58i1tFUcg+cVlWWzR+H7Lt9DfdA8Lwkyw/YUMF5Yvjt/z9Oldd3GEDECo0ZsKCBG 5QOuLrmJzf4xAZjCv/pzGJEwrCbPMkS3SURQG7xVOztgiil4fHpUOJFyWkwdyvO0luYt Jv4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g6nXFxwui6LlgkzThdMNjZ7jNWTIQtA3MqnNk7x+FbA=; b=X8xVasrBxd2eNp63SwQU4V6bIqlJHRNx50da9XR6HyvAfAVB53cav5okVdjh4eJwIn o9ha4RcOGvNfQ25nFKy070/BRHHosx0bMeWywcoWcWaB+9ZU2PxrbpKKdzPp/ATa8D0u 7jJDkJESfZG33fzIGtyaS5e5G6pKI+PX9zyDrPMynvNMGJ6okrKcioK0gf80CBwMrPBz 2YWLXK2CIAsWUeQVSn2zvk5gOgEVsbhH4QNOvN3eGC/dHb4Cvcmdc9Mwg3tuOiJOeNbE sBhDcrd1U29hjfbtiPpSiumavG95hzHkmlt0/LFHisZVFzTLVHA/sIUvguxxRJByB+5Q nn+w== X-Gm-Message-State: AOAM5334sQn5B77G3mwPoOZlZ2OlT0Md3ckC7huwJkdPMloOzJWilYXt TzI6LLIpv0Ec/+hdSwgDZuKfgQ== X-Google-Smtp-Source: ABdhPJxExSgM6GM/aAxAthga7OMPmTb2ZJL3oUkFTfcdhhckmEtj62dmQ1Dsh1lJcgvC5hBSPZ9nLw== X-Received: by 2002:a1c:f405:: with SMTP id z5mr4319430wma.93.1606932473145; Wed, 02 Dec 2020 10:07:53 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id a18sm3004404wrr.20.2020.12.02.10.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 10:07:52 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla , Dmitry Baryshkov Subject: [PATCH v2 1/6] arm64: dts: qcom: sm8250: add apr and its services Date: Wed, 2 Dec 2020 18:07:36 +0000 Message-Id: <20201202180741.16386-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> References: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add apr node and its associated services required for audio on RB5. Signed-off-by: Srinivas Kandagatla Tested-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 65acd1f381eb..d44120a6eadb 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -11,7 +11,9 @@ #include #include #include +#include #include +#include #include / { @@ -2620,6 +2622,60 @@ label = "lpass"; qcom,remote-pid = <2>; + apr { + compatible = "qcom,apr-v2"; + qcom,glink-channels = "apr_audio_svc"; + qcom,apr-domain = ; + #address-cells = <1>; + #size-cells = <0>; + + apr-service@3 { + reg = ; + compatible = "qcom,q6core"; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + }; + + q6afe: apr-service@4 { + compatible = "qcom,q6afe"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + q6afedai: dais { + compatible = "qcom,q6afe-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + }; + + q6afecc: cc { + compatible = "qcom,q6afe-clocks"; + #clock-cells = <2>; + }; + }; + + q6asm: apr-service@7 { + compatible = "qcom,q6asm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + q6asmdai: dais { + compatible = "qcom,q6asm-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + iommus = <&apps_smmu 0x1801 0x0>; + }; + }; + + q6adm: apr-service@8 { + compatible = "qcom,q6adm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + q6routing: routing { + compatible = "qcom,q6adm-routing"; + #sound-dai-cells = <0>; + }; + }; + }; + fastrpc { compatible = "qcom,fastrpc"; qcom,glink-channels = "fastrpcglink-apps-dsp"; From patchwork Wed Dec 2 18:07:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 11946561 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50F28C71155 for ; Wed, 2 Dec 2020 18:09:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E33A5221FC for ; Wed, 2 Dec 2020 18:09:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387826AbgLBSJP (ORCPT ); Wed, 2 Dec 2020 13:09:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387640AbgLBSJP (ORCPT ); Wed, 2 Dec 2020 13:09:15 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0741C061A48 for ; Wed, 2 Dec 2020 10:07:55 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id a6so9845311wmc.2 for ; Wed, 02 Dec 2020 10:07:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rNKqlORltziU7c3DN3fZG1eTqDwrx8ly3QE5W9hpJ70=; b=IeAmutYYU1MsJRHVWXY7jAkd7WUtsNwPemBO7pQurZqSJXlakZ1aNm888uOR3xypK9 S2AI1ravNYkot7M8SWf2fNwLRLgT4nWH+6gIN2uHL484qOElRMFnVvtE9pt7SvTTE0Ao SUCFPDQ2zmmP0i4YvsYYXwPdcAC3TIw7rSbnHMe8PI+9Cl+ipWXJ3t/qSRHAfFKflebt qiOQuXwFbUh5XDvbUwunCvZn3merjeSma7wcnaJZDMiAMbaJ3VIYd74NkeY/85tr0t20 RBkqc7iEWH8kz9UwFIe1TIJGDa4M/LZEsLsPjgGfike5pG/GB1huC+4v42i2uq6c5wlF yGDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rNKqlORltziU7c3DN3fZG1eTqDwrx8ly3QE5W9hpJ70=; b=pb+9WCc7B9+8RvKv/GaCQsMBshtCm5RP0P4gH27F7o7MBLK9d80JTl3zMylt2E85Th aL7Et7lBpFNSY38aAOW3PDpIlmw8aGEdpra6sjg98jKT9gUEv+YvzMjFjJmPvI5oajYc ViFKeyP/d4r4yZuUmYhy+WxcKzVPIPlYTFoCh09fTY1Cik2xybdMugilKOETy7Tzp9o8 //Jzlpl/oL+tAJTvbg1GkM9kQfbvsRg+0XwOqUbhPJkyqpUdF/XlHNWTJpZuO+Xguv61 RdjTejtmznk0d6NjNyjdmlCv+DZQ7UQ3Wrp0egIOh1elr+kKdpoamO2gRrfv9f/d9FL/ dojQ== X-Gm-Message-State: AOAM531v2mfLD26FjbEy4Qi79RnZMaJt1QVV0jgIandw4rbguykSVnD1 S+9HsNDQAMrRxlaIL+l6Vc2R8/GWb/T8XFZS X-Google-Smtp-Source: ABdhPJzQRg+gKMvgYx6GpPFaAIOa+lxCOS/e3Q2BEz8+J8T+557IxLGIzx5ApPX8qyUByZsF8MZTuA== X-Received: by 2002:a1c:4904:: with SMTP id w4mr4338823wma.140.1606932474442; Wed, 02 Dec 2020 10:07:54 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id a18sm3004404wrr.20.2020.12.02.10.07.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 10:07:53 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla , Dmitry Baryshkov Subject: [PATCH v2 2/6] arm64: dts: qcom: sm8250: add audio clock controllers Date: Wed, 2 Dec 2020 18:07:37 +0000 Message-Id: <20201202180741.16386-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> References: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add audiocc and aoncc clock controller nodes required for audio on RB5. Signed-off-by: Srinivas Kandagatla Tested-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index d44120a6eadb..cddbb53db193 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include #include #include @@ -2585,6 +2587,26 @@ ; }; + audiocc: clock-controller@3300000 { + compatible = "qcom,sm8250-lpass-audiocc"; + reg = <0 0x03300000 0 0x30000>; + #clock-cells = <1>; + clocks = <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + clock-names = "core", "audio", "bus"; + }; + + aoncc: clock-controller@3380000 { + compatible = "qcom,sm8250-lpass-aoncc"; + reg = <0 0x03380000 0 0x40000>; + #clock-cells = <1>; + clocks = <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_CLK_ID_TX_CORE_NPL_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + clock-names = "core", "audio", "bus"; + }; + adsp: remoteproc@17300000 { compatible = "qcom,sm8250-adsp-pas"; reg = <0 0x17300000 0 0x100>; From patchwork Wed Dec 2 18:07:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 11946565 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F3DAC64E7C for ; Wed, 2 Dec 2020 18:09:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BD9C22249 for ; Wed, 2 Dec 2020 18:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389123AbgLBSJZ (ORCPT ); Wed, 2 Dec 2020 13:09:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388871AbgLBSJZ (ORCPT ); Wed, 2 Dec 2020 13:09:25 -0500 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3810C061A4C for ; Wed, 2 Dec 2020 10:07:56 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id d3so9853952wmb.4 for ; Wed, 02 Dec 2020 10:07:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jZdt1XQOEk+ZY/4QVRoY/euZTi8U5G4IRCAkmQbGs68=; b=b1ZnkVrON3czjvAmME3sv+C1Q2DlMtLC018KTMqgiMzkOEiyoNgmxWx0O4MnKysUuq rJfMglKwVlNglsnW3WVyF8USxs7dvXQW/ncaDXSdM8xMNJe06BfHY3D9TN9sjuacF+VY XSP+/XGsDJg4G9Pkc89NUoDNYKVPpv7F+WZrZv6QqXWIpfNhqmu9s70iPPF3XSj7GX7q 6V9bTof7fjUqxln6UdRy4/zzAl4bUwXzL3h6JIHsy+8+d3s8FRoJmM/0Hv0Rfrp3mtii DYvLRcJNy5s80Y6sUMbb+Depks/OrHuEcis5NkGNcnwyfXOxUC+yY8F/4NBx2U9g3f05 LJaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jZdt1XQOEk+ZY/4QVRoY/euZTi8U5G4IRCAkmQbGs68=; b=ahdsTQxwzRWy3Wbyoqgi7SdPY3pHeDFTMJ1s2gvPQzUNFSxQWsEZLIpd+80rgxNkAp 1O/f3oWCFQyPWW1/hfooPcPMG7KnmessZGShqfxH6BsRkwa70Le8AlqGuNpjY9wgUcMz Q5JgrMTabtiFnLJRXbLwlGYbQ+d1SeaddCnINKBnDA/7+azuHwuuM2a9BgV0RuWRMzEg NQ/xOn4GFuluau8yALFYAxiymtRtRLV4aXz7RUBqOFSBR3LBhOT2WBu/wOsU+9ziHpGT ruKG8f+O6gbvDoLpxnixKJPyvGRqfd4VMq+9FNnjipEMd8g2VBBe5NsdJ0BNkg/0u1qW T/hQ== X-Gm-Message-State: AOAM532vXokVjEfsyyY22J0B+ibHEupThg1pnCIMX8EKqxKZK46eupRu lrHV5zlPFI8I4ODbTwx3iXZ/JQ== X-Google-Smtp-Source: ABdhPJxSGpBeUXOr+9w//0NOH2Tf2tOuLBRM6VP7bM7bPUVu4oWFO2vpp+O5rtcaKy21hEsR5aoOwg== X-Received: by 2002:a05:600c:255:: with SMTP id 21mr4382233wmj.69.1606932475722; Wed, 02 Dec 2020 10:07:55 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id a18sm3004404wrr.20.2020.12.02.10.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 10:07:54 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla , Dmitry Baryshkov Subject: [PATCH v2 3/6] arm64: dts: qcom: sm8250: add lpass lpi pin controller node Date: Wed, 2 Dec 2020 18:07:38 +0000 Message-Id: <20201202180741.16386-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> References: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add LPASS LPI pinctrl node required for Audio functionality on RB5. Signed-off-by: Srinivas Kandagatla Tested-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 84 ++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index cddbb53db193..ce8ae776160d 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2607,6 +2607,90 @@ clock-names = "core", "audio", "bus"; }; + lpass_tlmm: pinctrl@33c0000{ + compatible = "qcom,sm8250-lpass-lpi-pinctrl"; + reg = <0 0x33c0000 0x0 0x20000>, + <0 0x3550000 0x0 0x10000>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&lpass_tlmm 0 0 14>; + + clocks = <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + clock-names = "core", "audio"; + + wsa_swr_active: wsa-swr-active-pins { + clk { + pins = "gpio10"; + function = "wsa_swr_clk"; + drive-strength = <2>; + slew-rate = <1>; + bias-disable; + }; + + data { + pins = "gpio11"; + function = "wsa_swr_data"; + drive-strength = <2>; + slew-rate = <1>; + bias-bus-hold; + + }; + }; + + wsa_swr_sleep: wsa-swr-sleep-pins { + clk { + pins = "gpio10"; + function = "wsa_swr_clk"; + drive-strength = <2>; + input-enable; + bias-pull-down; + }; + + data { + pins = "gpio11"; + function = "wsa_swr_data"; + drive-strength = <2>; + input-enable; + bias-pull-down; + + }; + }; + + dmic01_active: dmic01-active-pins { + clk { + pins = "gpio6"; + function = "dmic1_clk"; + drive-strength = <8>; + output-high; + }; + data { + pins = "gpio7"; + function = "dmic1_data"; + drive-strength = <8>; + input-enable; + }; + }; + + dmic01_sleep: dmic01-sleep-pins { + clk { + pins = "gpio6"; + function = "dmic1_clk"; + drive-strength = <2>; + bias-disable; + output-low; + }; + + data { + pins = "gpio7"; + function = "dmic1_data"; + drive-strength = <2>; + pull-down; + input-enable; + }; + }; + }; + adsp: remoteproc@17300000 { compatible = "qcom,sm8250-adsp-pas"; reg = <0 0x17300000 0 0x100>; From patchwork Wed Dec 2 18:07:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 11946563 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4711C8300F for ; Wed, 2 Dec 2020 18:09:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6567F22201 for ; Wed, 2 Dec 2020 18:09:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388899AbgLBSJU (ORCPT ); Wed, 2 Dec 2020 13:09:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388871AbgLBSJT (ORCPT ); Wed, 2 Dec 2020 13:09:19 -0500 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DB24C061A4F for ; Wed, 2 Dec 2020 10:07:58 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id a3so10772902wmb.5 for ; Wed, 02 Dec 2020 10:07:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n+Hx6pLobOGXXs8wOkryQ0MlQmOPmFt3/oj9+AjGRak=; b=orYhDey/HNLXhEUKG3mH9p6941gEfUTzV/eMnt8Zg86fsz5haRD/1ujt0qiOTVQFCn VFpsBnRhohyYjJtpjFfZ7ABZulP+e2xHOC/TgTuj7kuaJk1GLurt2Hf8h7HD0JN+YS8m VKYi5LEOxMISfwrmQl898ZV6CF3xu6KXKYFWZcBdACw2UFuoLLiTMFdDIKOQ6uTY0pju pyc2lnSaFBOPf621PPArjWNssG6mCkoQR0ViD92RDg6iNh2cHYkf7YP6o/uJ11JbbLfN owx1rbJ7nQNaU1+Q/m5CBg/pocOhzM++sv47jTl/nrxT98hfhDvHrlsIqw6BigSxd5o2 xiVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n+Hx6pLobOGXXs8wOkryQ0MlQmOPmFt3/oj9+AjGRak=; b=tI9F6/iwgl7uLXfR5XE0FO/YcliRWbVR5578K71K/LMdvp0FhefAFZ1Cp9l/hWBNm5 wm89fuaC1DegqH2p3rlcvq9FBajtaZrHHkqlgQ9qQwthl8DeM249kf8X85mG3Y2E/rOs e7FnAD2yoy2VIp4p7cHJ1Sb4tVpDFBQ1lkwNoup5VvFL83qY2VjZXvbHPugrY2QcSxmw 81k/0NE4w8lr5koyN91KHEH/oddsZzRMUVQPb/EMrO+tDA0X+3SImBZbm7RX8f96n0np xFUl5NSZqA4pnMw+JK6oezcJIT6YcokYFOUs/vdvSd8lmZi3BnQAzhXv36EP2gisAMLB GSog== X-Gm-Message-State: AOAM530L4NuIuQyDAlIH37KwMlJyPeCD1snRiLOH8C2RCePAasu+U4Ts a3FM5B2zatSV6vE5WXJlPPys1g== X-Google-Smtp-Source: ABdhPJy+/qQh2geEM6pGiEsN3COZIp9Vix8PdY/OkdfYpYeZPrcwAG6AWWTZB4BQXyGfn+vcEQvh5Q== X-Received: by 2002:a1c:3902:: with SMTP id g2mr4311294wma.117.1606932476951; Wed, 02 Dec 2020 10:07:56 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id a18sm3004404wrr.20.2020.12.02.10.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 10:07:56 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla , Dmitry Baryshkov Subject: [PATCH v2 4/6] arm64: dts: qcom: sm8250: add wsa and va codec macros Date: Wed, 2 Dec 2020 18:07:39 +0000 Message-Id: <20201202180741.16386-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> References: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support for WSA and VA codec macros along with WSA soundwire controller required for getting audio on RB5. Signed-off-by: Srinivas Kandagatla Tested-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index ce8ae776160d..d2ade3ab3389 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2691,6 +2691,62 @@ }; }; + wsamacro: codec@3240000 { + pinctrl-names = "default"; + pinctrl-0 = <&wsa_swr_active>; + + compatible = "qcom,sm8250-lpass-wsa-macro"; + reg = <0 0x3240000 0 0x1000>; + clocks = <&audiocc LPASS_CDC_WSA_MCLK>, + <&audiocc LPASS_CDC_WSA_NPL>, + <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&aoncc LPASS_CDC_VA_MCLK>, + <&vamacro>; + + clock-names = "mclk", "npl", "macro", "dcodec", "va", "fsgen"; + + #clock-cells = <0>; + clock-frequency = <9600000>; + clock-output-names = "mclk"; + #sound-dai-cells = <1>; + }; + + swr0: soundwire-controller@3250000 { + reg = <0 0x3250000 0 0x2000>; + compatible = "qcom,soundwire-v1.5.1"; + interrupts = ; + clocks = <&wsamacro>; + clock-names = "iface"; + + qcom,din-ports = <2>; + qcom,dout-ports = <6>; + + qcom,ports-sinterval-low = /bits/ 8 <0x07 0x1F 0x3F 0x07 0x1F 0x3F 0x0F 0x0F>; + qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0C 0x06 0x12 0x0D 0x07 0x0A >; + qcom,ports-offset2 = /bits/ 8 <0xFF 0x00 0x1F 0xFF 0x00 0x1F 0x00 0x00>; + qcom,ports-block-pack-mode = /bits/ 8 <0x0 0x0 0x1 0x0 0x0 0x1 0x0 0x0>; + + #sound-dai-cells = <1>; + #address-cells = <2>; + #size-cells = <0>; + }; + + vamacro: codec@3370000 { + compatible = "qcom,sm8250-lpass-va-macro"; + reg = <0 0x3370000 0 0x1000>; + clocks = <&aoncc LPASS_CDC_VA_MCLK>, + <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + + clock-names = "mclk", "macro", "dcodec"; + + #clock-cells = <0>; + clock-frequency = <9600000>; + clock-output-names = "fsgen"; + #sound-dai-cells = <1>; + }; + adsp: remoteproc@17300000 { compatible = "qcom,sm8250-adsp-pas"; reg = <0 0x17300000 0 0x100>; From patchwork Wed Dec 2 18:07:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 11946567 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A77EC71156 for ; Wed, 2 Dec 2020 18:10:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 26FE022261 for ; Wed, 2 Dec 2020 18:10:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389306AbgLBSKA (ORCPT ); Wed, 2 Dec 2020 13:10:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389249AbgLBSKA (ORCPT ); Wed, 2 Dec 2020 13:10:00 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B4F1C061A52 for ; Wed, 2 Dec 2020 10:07:59 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id e7so5049134wrv.6 for ; Wed, 02 Dec 2020 10:07:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CqM9q6N4Zo+VkJ7lg9KQfgHn+D5C3chvwEDQouNf3x8=; b=MZbOjrD+wIo7l/H/D3+/L62fRo2GJL2/P1FX1b7sNlW6LlTKgNxsxLDqlRQgVV+4o7 aZLuDyLhAmAP+HL5VnCL92DsnsB1wU1RNsnh4X1yAWQA0s4Xbp0cXNureLXOFQn+nhwj +E1wAk5v5BdeaPH93sGth468fFyVpl2Hcd8ZtWP3bA6pnZKOigAIhYTuKQJjtQfV0r01 wp9pz5JsCSMNFq48nx48NclkdeA0XGTrg7h6YgR7YGlDN8VBPPMPpzklmMGMDOeSrqiR YOK2FjTEPbAGoYdx8X8M3GX5PH/krJ1PdYgOadeb28UzyUPGpJ1oYnSm1/pZ/9I7XJeR Fmwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CqM9q6N4Zo+VkJ7lg9KQfgHn+D5C3chvwEDQouNf3x8=; b=IsOh32VsovkHXC/mMpFHkhokryL9egZl4K0j84QsRDq0KHCxtPJs/PYTbFUnLNeXVe ACawZQPO1g9bu1OqcH/fGYs/mew/LkpUS6sXtOLXPvd6GdLwFjobTFAVybaDEIgu+ub/ v4g2A93onYAYhN8qvKN0dgL+iDXj76YYOcxXyMB3ungmXvKabbcqfojmXICS6SaQXrep GhcdAjX+p3FPaxuaOHp2WGLRGe6nt64MtxQMpB/fPn2PDdQiemdnJLnjukkupkyzeEk2 yR1ADpRMt+YL3XUlp4rS/kf4ZQKxTZk4WTq22Q/HNe/Q/YofMUCLxqo+5xiAarJwZkV5 8RSw== X-Gm-Message-State: AOAM532blUjLhcjxoYp775Tm8fyWBtP8UyPs/6aDsH8vGAvv2wLKpwgu T8GQ8Si/CpNJhKd0KgM2AKmt/g== X-Google-Smtp-Source: ABdhPJy3z9DpLEev3Hi7BG7XtQENGi/zx5Vx6nm8QcxzKTYVgjCa/XY9xIXOwyIDx4sQ5UCROV+6Kg== X-Received: by 2002:adf:e481:: with SMTP id i1mr4771642wrm.282.1606932478279; Wed, 02 Dec 2020 10:07:58 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id a18sm3004404wrr.20.2020.12.02.10.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 10:07:57 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla , Dmitry Baryshkov Subject: [PATCH v2 5/6] arm64: dts: qcom: sm8250: add mi2s pinconfs Date: Wed, 2 Dec 2020 18:07:40 +0000 Message-Id: <20201202180741.16386-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> References: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add primary and tertinary mi2s pinconfs required to get I2S audio. Signed-off-by: Srinivas Kandagatla Tested-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 55 ++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index d2ade3ab3389..51cffdae631c 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -1884,6 +1884,37 @@ gpio-ranges = <&tlmm 0 0 180>; wakeup-parent = <&pdc>; + pri_mi2s_active: pri-mi2s-active { + sclk { + pins = "gpio138"; + function = "mi2s0_sck"; + drive-strength = <8>; + bias-disable; + }; + + ws { + pins = "gpio141"; + function = "mi2s0_ws"; + drive-strength = <8>; + output-high; + }; + + data0 { + pins = "gpio139"; + function = "mi2s0_data0"; + drive-strength = <8>; + bias-disable; + output-high; + }; + + data1 { + pins = "gpio140"; + function = "mi2s0_data1"; + drive-strength = <8>; + output-high; + }; + }; + qup_i2c0_default: qup-i2c0-default { mux { pins = "gpio28", "gpio29"; @@ -2480,6 +2511,30 @@ function = "qup18"; }; }; + + tert_mi2s_active: tert-mi2s-active { + sck { + pins = "gpio133"; + function = "mi2s2_sck"; + drive-strength = <8>; + bias-disable; + }; + + data0 { + pins = "gpio134"; + function = "mi2s2_data0"; + drive-strength = <8>; + bias-disable; + output-high; + }; + + ws { + pins = "gpio135"; + function = "mi2s2_ws"; + drive-strength = <8>; + output-high; + }; + }; }; apps_smmu: iommu@15000000 { From patchwork Wed Dec 2 18:07:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 11946569 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5638AC71155 for ; Wed, 2 Dec 2020 18:10:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ECC312225E for ; Wed, 2 Dec 2020 18:10:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389331AbgLBSJ4 (ORCPT ); Wed, 2 Dec 2020 13:09:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389306AbgLBSJz (ORCPT ); Wed, 2 Dec 2020 13:09:55 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B71A1C061A55 for ; Wed, 2 Dec 2020 10:08:00 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id 23so5008994wrc.8 for ; Wed, 02 Dec 2020 10:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KNwBh5Oi//J2Be7LIJjV0b/+HNUbYnjVRXKUnYFcgws=; b=M23B4Idvf4R9I2mTXqkuRiffExFxPJzSnsO0ztMVTMwuIgumwn6JLkI9Bz6PRa6e86 QSyVdAOME43qSqmlEl3PQ7LQrbz1h/fJujoTvAWCdYgRE/lpcg+7Z6eJ7WipseTZy0Bd gnNiD33grSx6CG2XxpKH12aLwE/bmjXCTimXwc4mlHgwflfpHoN29NdoAyaCO3T6gCtS nCRpncL6fnO3PAvFZhLJS9KEnPmzaOIkjeJ/oFUe1DKWXDjkj6Uoe7dbVtlWmsA/1Et2 FwRFzfF+A5lnLQGyjD4NAD31GCPrNdSOApShhCcZIVy82v2FOzJbBUsy6L74KbQlh0t2 PJEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KNwBh5Oi//J2Be7LIJjV0b/+HNUbYnjVRXKUnYFcgws=; b=I3twg7g2hAV7AdytbVfgFfa6NpqANSDQfzIBunrXPvkudb7bCQSnTea5VorU5Zoecj 2HOQodVZf83wav4W4Oa+k3Z7Mg6KcvQ9IScYrhAMopAsspXSf+SxnjrwOUi6Eg9mcenQ pcrnUkzzmnWs0K2syFj50OhW6vhkMBRd72zvUE8L4Pjs/Lqk2NLHtp0HhgIl/9wJWhgY c22dRDgx3ZRrPuksc6x3VciEUUB1UTIXlyFq0dceftVNjXB1DF05X+6UwTTU9ygOABiJ OS4lfC9t6NbQXK6E7b03tJ8SBtPsYrsa9P+LYQA7g9PMA83viRc41r5/LCi95NkyJ+jj X5YA== X-Gm-Message-State: AOAM530rNZV9y7Io7aYHCeH+2LsYaPjZieJiN6r4Y5DI5nn4xhxunz0y MMiLbt8pTaZ7h0YS0gb6IXoQVbImoBIR46EQ X-Google-Smtp-Source: ABdhPJxW7ACqll1VfNJl6wS8dgps8ICPjpYYUy8BXaGNxAPi73N8yjZTjHdceTIKtiO8Jt+l8pBAUQ== X-Received: by 2002:adf:916e:: with SMTP id j101mr4842869wrj.55.1606932479522; Wed, 02 Dec 2020 10:07:59 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id a18sm3004404wrr.20.2020.12.02.10.07.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 10:07:58 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla , Dmitry Baryshkov Subject: [PATCH v2 6/6] arm64: dts: qcom: qrb5165-rb5: Add Audio support Date: Wed, 2 Dec 2020 18:07:41 +0000 Message-Id: <20201202180741.16386-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> References: <20201202180741.16386-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This patch add support for two WSA881X smart speakers attached via Soundwire and a DMIC0 on the main board. Signed-off-by: Srinivas Kandagatla Tested-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 121 +++++++++++++++++++++++ arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 + 2 files changed, 124 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts index ce22d4fa383e..475542afecea 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -7,6 +7,8 @@ #include #include +#include +#include #include "sm8250.dtsi" #include "pm8150.dtsi" #include "pm8150b.dtsi" @@ -120,6 +122,11 @@ }; }; +&adsp { + status = "okay"; + firmware-name = "qcom/sm8250/adsp.mbn"; +}; + &apps_rsc { pm8009-rpmh-regulators { compatible = "qcom,pm8009-rpmh-regulators"; @@ -483,6 +490,35 @@ status = "okay"; }; +&q6afedai { + qi2s@16 { + reg = <16>; + qcom,sd-lines = <0 1 2 3>; + }; +}; + +/* TERT I2S Uses 1 I2S SD Lines for audio on LT9611 HDMI Bridge */ +&q6afedai { + qi2s@20 { + reg = <20>; + qcom,sd-lines = <0>; + }; +}; + +&q6asmdai { + dai@0 { + reg = <0>; + }; + + dai@1 { + reg = <1>; + }; + + dai@2 { + reg = <2>; + }; +}; + &sdhc_2 { status = "okay"; pinctrl-names = "default"; @@ -497,6 +533,84 @@ no-emmc; }; +&swr0 { + left_spkr: wsa8810-left{ + compatible = "sdw10217211000"; + reg = <0 3>; + powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>; + #thermal-sensor-cells = <0>; + sound-name-prefix = "SpkrLeft"; + #sound-dai-cells = <0>; + }; + + right_spkr: wsa8810-right{ + compatible = "sdw10217211000"; + reg = <0 4>; + powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>; + #thermal-sensor-cells = <0>; + sound-name-prefix = "SpkrRight"; + #sound-dai-cells = <0>; + }; +}; + +&sound { + compatible = "qcom,qrb5165-rb5-sndcard"; + pinctrl-0 = <&tert_mi2s_active>; + pinctrl-names = "default"; + model = "Qualcomm-RB5-WSA8815-Speakers-DMIC0"; + audio-routing = + "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT", + "VA DMIC0", "vdd-micb", + "VA DMIC1", "vdd-micb", + "MM_DL1", "MultiMedia1 Playback", + "MultiMedia3 Capture", "MM_UL3"; + + mm1-dai-link { + link-name = "MultiMedia1"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + mm3-dai-link { + link-name = "MultiMedia3"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; + }; + }; + + dma-dai-link { + link-name = "WSA Playback"; + cpu { + sound-dai = <&q6afedai WSA_CODEC_DMA_RX_0>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&wsamacro 0>; + }; + }; + + va-dai-link { + link-name = "VA Capture"; + cpu { + sound-dai = <&q6afedai VA_CODEC_DMA_TX_0>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&vamacro 0>; + }; + }; +}; + /* CAN */ &spi0 { status = "okay"; @@ -792,3 +906,10 @@ vdda-phy-supply = <&vreg_l9a_1p2>; vdda-pll-supply = <&vreg_l18a_0p92>; }; + +&vamacro { + pinctrl-0 = <&dmic01_active>; + pinctrl-names = "default"; + vdd-micb-supply = <&vreg_s4a_1p8>; + qcom,dmic-sample-rate = <600000>; +}; diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 51cffdae631c..336a4efab0b4 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -1561,6 +1561,9 @@ }; }; + sound: sound { + }; + usb_1_hsphy: phy@88e3000 { compatible = "qcom,sm8250-usb-hs-phy", "qcom,usb-snps-hs-7nm-phy";