From patchwork Fri Aug 11 13:29:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 109866 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp917001qge; Fri, 11 Aug 2017 06:30:30 -0700 (PDT) X-Received: by 10.101.69.205 with SMTP id m13mr15242422pgr.105.1502458230563; Fri, 11 Aug 2017 06:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502458230; cv=none; d=google.com; s=arc-20160816; b=SvyqBgXUwZTc3Qeazqm4tE2Ad9Kam2LO+Phh24dLyJxR9UgbrAtJ8Fxr1RH3NYNjOb BvIkukiaQGiTH6f2if3gq8IS+c8yFrwFB/0lek7Z5cv+x24HIsb9fiTvZ9d8shQ+hjo7 /qCNIWz4mMYpPRZWc8i+FnPG2mKcF43HekUj/Qw/Cyq3ziINsaP5riYsaNFY2VLt5rCw EXfT7o8M/26V9UFm60SvH6j+E15TV+0S66Xxv02vrjtdwHilWe2Xg6AZkdVT5RO5MZUV JtBd0rGl8/Hs83iG+9qYqcUI6iwB88EuoaJauQ/WlFXCnOe4bx4QtZYQzvyUYs+EWZdE 1h/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=xY718JSm530KPBX3nqtJ0OAiTyvaDbVHhdGj6+WxN5I=; b=YsrR3kJjVu4uPB3G2xng73xKd8CDmVR1zE8oFxlu1k3pbBOP7ICyE7o7jbbX6QPKTz i3t6G4WbFX6tZxAlkFeWN0nJ3mtcXy/HoztDMIaJowuMIonwhlK4tYyzw2Efo60fMucd 5xWLBwrka80zsXPOVRUsGtykXVq+H2SF5YTsg3qh92WzXD4XIjhXczvK/YGeYP4IFFYA X77SxaIj1gn2OoTO2Hcnlbf4misB1xASLUkN2tiV2ZEuOVJYxyrZeCMkjSsVMx8Qom00 cEC383NX73WGmFPRRCbH3ODuhI8mmA9npvQiUxasITcDBaQ7q4AVqU5XFttDZgUzuz2U gETQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TtZ5FDny; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 73si533905pfw.130.2017.08.11.06.30.30; Fri, 11 Aug 2017 06:30:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TtZ5FDny; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753341AbdHKNa1 (ORCPT + 25 others); Fri, 11 Aug 2017 09:30:27 -0400 Received: from mail-it0-f53.google.com ([209.85.214.53]:37095 "EHLO mail-it0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753094AbdHKNaX (ORCPT ); Fri, 11 Aug 2017 09:30:23 -0400 Received: by mail-it0-f53.google.com with SMTP id 76so27088769ith.0 for ; Fri, 11 Aug 2017 06:30:23 -0700 (PDT) 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; bh=xY718JSm530KPBX3nqtJ0OAiTyvaDbVHhdGj6+WxN5I=; b=TtZ5FDnypQm4h9CRlBJJqEIGHCOtFizXhFscMd8OAodETKMn0lv6bNBERMCHsc/liy DE2mlHO6sAoYehOMjacOsUU35K3CEfZhw8IuX+C6LDwxvKlpdEY109REqxOxQqX5SFCp 9Cf7dyJIbJXcoZKyIUWWO/NkESUpyr+n4f4TU= 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; bh=xY718JSm530KPBX3nqtJ0OAiTyvaDbVHhdGj6+WxN5I=; b=EKrPdKpxvcw6fRuRYAZVOqyateGv3SCoH+TFVEHKUixMkITg9skfDW8rZKWVjSFYjO PDP6RA0uoo1VhHmwXk1VFgIqsxKFqjwSlMMADBNALKGG6NQ6AqGmLrE6TQaVaeKKBTIj bSSx8oyGpLSQAOXnfRbYNJm95Itr95fDUyfu1deQpG6ea0li/aVVtmrb0wXaeYRyaAkP NttRSYhFvyI9jwmO7fZT4V5VJdrHTcqk7ONBMgyKgZU8wbRfJY8wOGtUqUJzOnSqb/Jn BGqvQj9LUhjfaF4HQRw5LArsSlTqoDjj1sWCqlzWJqeDe94q5qsoK1A0aH7PLIaKD0OU qeLg== X-Gm-Message-State: AHYfb5iWj5Nxq6of0bKRrCE1dmSQMM+tt18g/Z+Py/jApsILBjtHe2pU /6cYgmT79QnY5+nD X-Received: by 10.36.73.25 with SMTP id z25mr13075280ita.153.1502458222935; Fri, 11 Aug 2017 06:30:22 -0700 (PDT) Received: from localhost.localdomain (static.8.26.4.46.clients.your-server.de. [46.4.26.8]) by smtp.gmail.com with ESMTPSA id y72sm398422iod.40.2017.08.11.06.30.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Aug 2017 06:30:22 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: Mark Brown , Banajit Goswami , alsa-devel@alsa-project.org Cc: Takashi Iwai , Patrick Lai , linux-kernel@vger.kernel.org, kwestfie@codeaurora.org, linux-arm-msm@vger.kernel.org, lkasam@qti.qualcomm.com, sboyd@codeaurora.org, Srinivas Kandagatla Subject: [RFC PATCH 9/9] arm64: dts: msm8996: db820c: Add sound card support Date: Fri, 11 Aug 2017 15:29:52 +0200 Message-Id: <20170811132952.32572-10-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170811132952.32572-1-srinivas.kandagatla@linaro.org> References: <20170811132952.32572-1-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla This patch adds hdmi sound card support to db820c via qdsp. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 37 +++++++++++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 67 ++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) -- 2.9.3 diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index b9852ba..0157630 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -18,6 +18,8 @@ #include "apq8096-db820c-pmic-pins.dtsi" #include #include +#include +#include / { aliases { @@ -207,6 +209,41 @@ }; }; + adsp-pil { + smd-edge { + apr { + snd { + compatible = "qcom,apq8096-sndcard"; + qcom,model = "DB820c"; + + cpu@1 { + is-fe; + link-name = "MultiMedia1 PCM"; + cpu { + sound-dai = <&pcm MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + platform { + sound-dai = <&pcm MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + qdsp@1 { + link-name = "HDMI"; + cpu { + sound-dai = <&hdmi_dai>; + }; + platform { + sound-dai = <&routing>; + }; + codec { + sound-dai = <&hdmi>; + }; + }; + }; + }; + }; + }; + rpm-glink { rpm_requests { pm8994-regulators { diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 9e3e3f5..163c251 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -14,6 +14,8 @@ #include #include #include +#include +#include / { model = "Qualcomm Technologies, Inc. MSM8996"; @@ -1157,6 +1159,33 @@ status = "okay"; }; + lpass_q6_smmu: arm,smmu-lpass_q6@1600000 { + compatible = "qcom,msm8996-smmu-v2"; + reg = <0x1600000 0x20000>; + #iommu-cells = <1>; + power-domains = <&gcc HLOS1_VOTE_LPASS_CORE_GDSC>; + + #global-interrupts = <1>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + + clocks = <&gcc GCC_HLOS1_VOTE_LPASS_CORE_SMMU_CLK>, + <&gcc GCC_HLOS1_VOTE_LPASS_ADSP_SMMU_CLK>; + clock-names = "iface", "bus"; + status = "okay"; + }; + mdss: mdss@900000 { compatible = "qcom,mdss"; @@ -1240,6 +1269,7 @@ phys = <&hdmi_phy>; phy-names = "hdmi_phy"; + #sound-dai-cells = <0>; ports { #address-cells = <1>; @@ -1303,6 +1333,43 @@ qcom,ipc = <&apcs 16 8>; qcom,smd-edge = <1>; qcom,remote-pid = <2>; + + apr { + compatible = "qcom,apr-msm8996"; + qcom,smd-channels = "apr_audio_svc"; + + pcm: pcm0 { + compatible = "qcom,q6pcm-v2"; + iommus = <&lpass_q6_smmu 1>; + #sound-dai-cells = <1>; + }; + + routing:routing { + compatible = "qcom,q6pcm-routing-v2"; + #sound-dai-cells = <0>; + }; + + hdmi_dai: dai_hdmi { + compatible = "qcom,q6hdmi-v2"; + qcom,afe-port = <&afe AFE_PORT_HDMI_RX>; + #sound-dai-cells = <0>; + }; + + snd { + }; + + adm { + compatible = "qcom,q6adm-v2"; + }; + + asm { + compatible = "qcom,q6asm-v2"; + }; + + afe: afe { + compatible = "qcom,q6afe-v2"; + }; + }; }; };