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: 10273157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4B8CB60390 for ; Sat, 10 Mar 2018 03:42:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3775429CE3 for ; Sat, 10 Mar 2018 03:42:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2AD7B29D39; Sat, 10 Mar 2018 03:42:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 98AFA29CE3 for ; Sat, 10 Mar 2018 03:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=0F6O6wEETEHrtDVGUAqvR9KgMnOq6uGMtSjVN6UYOl4=; b=OaokgGm0/k6dHh7b1PHJc1VHnM crz+KW5H7ygAVAVI3PlufeVBAq7ib4WZCO+rsmkCzLZfv7bREdqb79VuGvRdh70QUnZJPd/1iT5X9 D4QieIvPO39mXR87ptAHqRK/3UWYya/MJiGA8bKSbu7uX7NbelNDjeTWGFdimz8jjiBYo8rZPqDcr O4We+ag1TaZjzKGGeZjCZW93cZYeYkdnp9/qX0c3pd17iybEF2mlZ03kxaLiOCDgoi4c8Ggjp2Vzm Fv2Q+NxH6LZND5Cjm8mYpTC9dhDe1J9Gmm58J1S/2jMwuhcw9TWUBQQ06+yoBDyewaUJIkQExjPHL //xBlZZw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1euVP2-0003Rq-Tj; Sat, 10 Mar 2018 03:42:36 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1euVOW-00037t-Pr for linux-arm-kernel@bombadil.infradead.org; Sat, 10 Mar 2018 03:42:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=TfEIPn5VX8C5OGKBAQhRZa9nBT59yJmePw+gYMW6h1Y=; b=Cue4zCVzBbjk5ANRZph+iYWo3 4oNcR0lGnnIjqIPt9yYbg9AGH1hTpO7ObyLPPJIxAdd2MmlUKc/cp/EYIc/zsYkF9bUaqKtjXe98h 24U2E1kYPzY4co5C9bKNesVAdV8b2346xSyZbc31VuhpHaPrP+WZvggYGw7Gnfk+rgoX2Wcxjmz9n 73SR5iCQF6j6+HITd9obXdPgim5m3M0s5nyIAkoLlWjhxbojV8mtQanx3TBHnYLKObXN71+eCPXZA 75pe84AtXIa8F7Lsp1OIgt5g+N1DhewwsYHNxvMCE9ktqJU/zXw9h0sS/DBsyZym5qbInbJj0kyB1 b/X2tQVaA==; Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by merlin.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1euUFH-0000DB-Sq for linux-arm-kernel@lists.infradead.org; Sat, 10 Mar 2018 02:28:29 +0000 Received: by mail-wm0-x244.google.com with SMTP id h21so7055581wmd.1 for ; Fri, 09 Mar 2018 18:28:15 -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=qwBUOp98q+Umz800P0KzF5TjVtnKLJLwYeaNiff5G3IlbuGB4gF1mkyD77P6Xprj6R 73xnjtMXV+W13t59jATDQd1FQl+rlZq6izYREUAyQREl3OdHtUvuOUPX2Gyyj2Lkt9Rk TFDII57YL3ZsvO1Jf4spwvjxlLuGDeda9jJ4npsrLwlcP/0WKxsmOrZ6ZtwVAZulwb7L /7B3eXAzHgqwUqnnylcyCNkRjuH0KNfuKGr7CN6a+0Qmpr2GLPCqRXdeQI39bpVtI44G l2+Swzo32XhyYlPzegyQZnq1/SxLBetZlu8XXa0OwAFQXXWpmOLpmoyhQYkIpkDOJTZt 9fSA== X-Gm-Message-State: AElRT7HpsNgpC4puggxuknord07uEL75EyjQlaLRenGC5bX5BV7JHhCL XLQ6ii6KZ0rOGt4MiDsotCvj/Q== X-Google-Smtp-Source: AG47ELvFqr9HYFJ7VwpkK/2INqaTU/JzMg0cFsOy67YmpN+MQLjGXKFKu2a0r7lD7VMQnvwDdgUqkw== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180309_212827_947968_AEA4A42D X-CRM114-Status: GOOD ( 13.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, bgoswami@codeaurora.org, rohkumar@qti.qualcomm.com, gregkh@linuxfoundation.org, plai@codeaurora.org, lgirdwood@gmail.com, tiwai@suse.com, david.brown@linaro.org, srinivas.kandagatla@linaro.org, linux-arm-kernel@lists.infradead.org, spatakok@qti.qualcomm.com, perex@perex.cz, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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>; + }; + }; + + }; }; };