From patchwork Sat Mar 10 02:24:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 131268 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1690870lja; Fri, 9 Mar 2018 18:28:45 -0800 (PST) X-Google-Smtp-Source: AG47ELs47SANmyUVzBWf+o8NcFUkxWwtYGZCP932mrk7RjKRHRCQDdFn/vqCnEiROM4XgGffwQ61 X-Received: by 10.98.78.68 with SMTP id c65mr592608pfb.65.1520648925042; Fri, 09 Mar 2018 18:28:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520648925; cv=none; d=google.com; s=arc-20160816; b=xHh9Kj3HtFeC2S+VPZog9FfB1Q2yNhiJvPgg/5h5MBVXVteeTWP9k/BgcPzKQ50Dwt +NSRxVViRpEliuNI/+qpWeonQUn3Pi34nGe9updOnpTTVj7wCGoCxShxXu5YIx8S7+hz xjLq2HURVXyuKgyEQfdf3MYDLu1CFo2Prs4QPYoG7Zv/wvoHoeT4JarxkyVcnIFp2GFS WVhAApDournakorxEaKFzekJpJIMpBCQJYBfOq273OYOMg7vqnnHAMfRL0SuFFIOi0/J 4VjjdOu5oWlfYQBgmdx6vgUIj8qlefNLKUoEpczruO61x+vapeh8FgJ/rvAd93osuhac UEeA== 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=MiYSZmkGe1wPh3aqwLwW3mIUkhxys2uU3pqZsFgcsnk=; b=YCuTQtKS8VeGptxb2hOKUPanmgtPUM9g3BnceJENDZtbHZErI3yewn6RUq6+GqDV2O qMK6EerbGUR38GFin43KP6J+RcbHmgvo2ZTDU14gxs92eh53tDKtjfdsL8myWcZwxwxO 1C4OhMrlrzHpz/+AFEv3/CFlsVZzsPF+H2jPo9XTLZqiQYzKQ1t03eHY32FuN/iGHJjo +dvf0pk8BqTsi9oWkvh6NPzzlxg6+Ptlw2PuhtajnAkUIt+iHY3tPMFvb4b2f2M0fXpB RoguzsJ8MwHKZk//R0roKLUOJxOXU+JdpAa5qNlT8yXcukytzrlImiiEmt5NEH/kCYlR Mv4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=g3mfc5gF; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (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 b17si1635543pgu.407.2018.03.09.18.28.44; Fri, 09 Mar 2018 18:28:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=g3mfc5gF; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933023AbeCJC2n (ORCPT + 10 others); Fri, 9 Mar 2018 21:28:43 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:51193 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933020AbeCJC2N (ORCPT ); Fri, 9 Mar 2018 21:28:13 -0500 Received: by mail-wm0-f65.google.com with SMTP id w128so7119904wmw.0 for ; Fri, 09 Mar 2018 18:28:11 -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; bh=TfEIPn5VX8C5OGKBAQhRZa9nBT59yJmePw+gYMW6h1Y=; b=g3mfc5gF+8L2an6485rsEX7C8ZLOWyEVqKx4bZ4wgwzur8qxx4ckahbHazhXjeST4D VgzpIvYozXJQ+BSSxvyOZbE7e6R17etwoQVfxVVuGj5sFOniZIDwgNCjQpN3U8eDVkM4 WoSNwQEEFm3B8sTaEUYY4713XtdE8Q5E/MSWM= 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=TfEIPn5VX8C5OGKBAQhRZa9nBT59yJmePw+gYMW6h1Y=; b=QOG2RPA++V+Yt/NTmWp2DJNWMfj4JFEIB6vjIyc3yQkZ7wD4JLDmVIqcesSO5PsHZB Kndc1oYI0/+QfnEData+0gSsXS+3zas5l6rZ+MZwXIaLoKgTnxYcZvWqTxS/zVkjweU+ +eB6VCfqIx4mfoK+oKuebXzFlf+dPhOxUyTtWB5+2jd3rUxLYK20FzrgrQ7siDWs5tWx JUtmISyi2as1sPdd7VTeZfWvsihHmu3YJeE2ZW/xfRTpYQhgtXmwjfh80QgTHyTXMWgW dCSBfON8euRAu6ZFW7MZ/NwhyWP3giK7362pRVK3ut5xU5vy+ks+wlA5QS0cCJGLYQjC +mlg== X-Gm-Message-State: AElRT7GXmDOWs1EjpzKtguWZoIMO2n14/tgZ0an9OGRUihsewLsniLXm BjgSKtUwpL36jyhhSMHp6VwP3Da1GZg= X-Received: by 10.28.191.138 with SMTP id o10mr70432wmi.26.1520648891135; Fri, 09 Mar 2018 18:28:11 -0800 (PST) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id g78sm21489wmc.31.2018.03.09.18.28.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 18:28:10 -0800 (PST) From: srinivas.kandagatla@linaro.org To: andy.gross@linaro.org, broonie@kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, robh+dt@kernel.org Cc: gregkh@linuxfoundation.org, david.brown@linaro.org, mark.rutland@arm.com, lgirdwood@gmail.com, plai@codeaurora.org, bgoswami@codeaurora.org, tiwai@suse.com, perex@perex.cz, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, rohkumar@qti.qualcomm.com, spatakok@qti.qualcomm.com, srinivas.kandagatla@linaro.org Subject: [PATCH v4 23/24] arm64: dts: db820c: add sound card dt entry Date: Sat, 10 Mar 2018 02:24:55 +0000 Message-Id: <20180310022456.26739-24-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180310022456.26739-1-srinivas.kandagatla@linaro.org> References: <20180310022456.26739-1-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Srinivas Kandagatla This patch adds a sound card entry for basic hdmi playback using adsp. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 34 +++++++++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 75 +++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 1 deletion(-) -- 2.15.1 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 0be734be95f9..d69ffd042835 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 { @@ -222,6 +224,7 @@ core-vdda-supply = <&pm8994_l12>; core-vcc-supply = <&pm8994_s4>; + #sound-dai-cells = <1>; }; }; }; @@ -397,3 +400,34 @@ }; }; }; + +&sound { + compatible = "qcom,apq8096-sndcard"; + qcom,model = "DB820c"; + qcom,audio-routing = + "RX_BIAS", "MCLK"; + mm1-dai-link { + link-name = "MultiMedia1"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + platform { + sound-dai = <&q6asmdai>; + }; + }; + + hdmi-dai-link { + link-name = "HDMI Playback"; + cpu { + sound-dai = <&q6afedai HDMI_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&hdmi 0>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 6e04827879c0..8fc9354e84c5 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -15,6 +15,7 @@ #include #include #include +#include / { model = "Qualcomm Technologies, Inc. MSM8996"; @@ -1560,6 +1561,37 @@ "ref_clk"; }; }; + + 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"; + }; + }; + + sound: sound { + }; adsp-pil { @@ -1583,11 +1615,52 @@ smd-edge { interrupts = ; - label = "lpass"; qcom,ipc = <&apcs 16 8>; qcom,smd-edge = <1>; qcom,remote-pid = <2>; + + apr { + compatible = "qcom,apr-v2"; + qcom,smd-channels = "apr_audio_svc"; + qcom,apr-dest-domain-id = ; + + q6core { + qcom,apr-svc-name = "CORE"; + qcom,apr-svc-id = ; + compatible = "qcom,q6core"; + }; + + q6afe: q6afe { + compatible = "qcom,q6afe"; + qcom,apr-svc-name = "AFE"; + qcom,apr-svc-id = ; + q6afedai: dais { + #sound-dai-cells = <1>; + }; + }; + + q6asm: q6asm { + compatible = "qcom,q6asm"; + qcom,apr-svc-name = "ASM"; + qcom,apr-svc-id = ; + q6asmdai: dais { + #sound-dai-cells = <1>; + power-domains = <&gcc HLOS1_VOTE_LPASS_ADSP_GDSC>; + iommus = <&lpass_q6_smmu 1>; + }; + }; + + q6adm: q6adm { + compatible = "qcom,q6adm"; + qcom,apr-svc-name = "ADM"; + qcom,apr-svc-id = ; + q6routing: routing { + #sound-dai-cells = <0>; + }; + }; + + }; }; };