From patchwork Tue Feb 13 16:58:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10217085 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 2E3626056F for ; Tue, 13 Feb 2018 17:21:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F31328ED8 for ; Tue, 13 Feb 2018 17:21:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1389C28ED6; Tue, 13 Feb 2018 17:21:10 +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 7A9D428ED8 for ; Tue, 13 Feb 2018 17:21:09 +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=7s6Ir6VkwRTkMsPc7TKAXG7244QUqYw/gUVh9Mk++Gk=; b=f9377gVqfpvMzBh04yQf4JCg2K y7skxQiMS9uaFRLThQII0vAPFYpo9TNZPH5XTYsuyRkkxARHK1vsxcj5kEdLOII04/bN2gjK1g0bw 8mdbEZgCheJ30XcL+TMjMiur8AAU4KgfgE0hEdOxZxAOjDivBX8NwdNSAIXByj2SREsKh4s06hkuZ FiHSiaAhVlknrchrS4WrsgUVmxoEYCVbdeUX6T9vUwpZlKaP0EoVYVXzFj7W1jwdWpBSnOg7wiq3Q v/CNtq244L6b1aF8gScQePz5zBwTL2cePbH6XD49NkCfVKHtoaI/psPYJtYuK1WfGoSjMLnwQhilW gmTmmlZw==; 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 1eleGA-0007Eg-0T; Tue, 13 Feb 2018 17:20:50 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eleDV-0003Dc-4n for linux-arm-kernel@bombadil.infradead.org; Tue, 13 Feb 2018 17:18:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=CQdpazCSHoVUUwqGM9fnZ88nd+tej68/aeXmfDC3h8s=; b=noMOaASrtQer+DhCST5L3A0Xk WGrP2pwRUb2Bd4kUA7KPeh30y9lLacaWupIs3N2SyqAyV3qp6RTimEx1uRikdYd+Pv/ew45XPNwTy OB9OBgNkuyAqjODXemWzYosIRpEG9yzqfpEtlw0C1Xe7mMW12mgDKg+v+YDceza+vU+pc32N0C/LR a7ZY1xEXTzM2VDI+X9rSjfVjIHb/rzqvwXl03hwR6MFdvcdVsTW/m1PL3OoEkiTmo2FsK1vqUfc23 HM1YCLsMsFzpPMddZFHa8jqG/jKSgc87hep9wKhaEpC4OG5aYZiM4b1apgVuRxRrA4BnAfyq1OW4I o19ZYCIhQ==; Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eldxx-0004Qs-3X for linux-arm-kernel@lists.infradead.org; Tue, 13 Feb 2018 17:02:06 +0000 Received: by mail-wm0-x243.google.com with SMTP id r78so17310007wme.0 for ; Tue, 13 Feb 2018 09:01:50 -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=CQdpazCSHoVUUwqGM9fnZ88nd+tej68/aeXmfDC3h8s=; b=iubqN9hKNB+fatP1urFTYEa9Dz7Z+qT8Ya6J5pF3NDWRc/kyO9hLFpiZ0WxTquT2Va PFCSRZU1vDpg1Dmg0laDcufTq+a/WQR25INnlYjfg+nODs0zIx/qXHe7PWXY4wHDjC1p WQj4TUub974x0gKQxe98arYp6u3KMDdzYBWJc= 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=CQdpazCSHoVUUwqGM9fnZ88nd+tej68/aeXmfDC3h8s=; b=YW8b0ceQsIZRhRwGxSfw5R76R0c+CGni2eutXhhebMfXo+/1jecghPidJ4PKvXak96 tXf12qyNsiPlFDg7lhZFTruBLkUPwPgwwNYpyNN3wnv1LRXxt73V1TZo7t5Y/WC6lMHx 7pxfTwNCEzq59ysSd1F8rKnJU33Y7VGwjUalSbGEa/4S8s8pCmOFS0OVsS/AviPQvsuo v6TPR8g6/eIwgPyDM5c5McDnYeNpneKcLY6kiyC20lsAY8V6qmo89jang5ClAXxaeS+6 l9kunUpe6HT1nk0p9n38DoVmDkhf7BoTtCHpI6jCPxY9429x608wDAI4mh/30C4uDME4 1x6Q== X-Gm-Message-State: APf1xPDi/qxFLhIcZHY62hoDoV4qca1EWKbI0ablKNixwlMR6ZfaMZwv LoD6lQ7yZWu6BAzvRLFmp1orBw== X-Google-Smtp-Source: AH8x225hKfxrB+rmLC72esSlAB22sy7ZvNokeXmtaOICDicjaMeKVwAlY+vp/+F/bueyMEHBPkg9jA== X-Received: by 10.28.5.10 with SMTP id 10mr1866413wmf.126.1518541308319; Tue, 13 Feb 2018 09:01:48 -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 y145sm7432723wmd.43.2018.02.13.09.01.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Feb 2018 09:01:47 -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 Subject: [PATCH v3 25/25] arm64: dts: msm8996: db820c: Add sound card support Date: Tue, 13 Feb 2018 16:58:37 +0000 Message-Id: <20180213165837.1620-26-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180213165837.1620-1-srinivas.kandagatla@linaro.org> References: <20180213165837.1620-1-srinivas.kandagatla@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180213_170201_146635_3CB264B4 X-CRM114-Status: GOOD ( 11.35 ) 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, linux-kernel@vger.kernel.org, plai@codeaurora.org, tiwai@suse.com, lgirdwood@gmail.com, perex@perex.cz, david.brown@linaro.org, robh+dt@kernel.org, Srinivas Kandagatla , spatakok@qti.qualcomm.com, linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.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 hdmi sound card support to db820c via qdsp. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 44 +++++++++++++++++++- arch/arm64/boot/dts/qcom/msm8996.dtsi | 62 ++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 9769053957af..6f6f21501ee9 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -18,7 +18,8 @@ #include "apq8096-db820c-pmic-pins.dtsi" #include #include - +#include +#include / { aliases { serial0 = &blsp2_uart1; @@ -186,6 +187,7 @@ core-vdda-supply = <&pm8994_l12>; core-vcc-supply = <&pm8994_s4>; + #sound-dai-cells = <1>; }; }; }; @@ -360,4 +362,44 @@ }; }; }; + adsp-pil { + power-domains = <&gcc HLOS1_VOTE_LPASS_ADSP_GDSC>; + smd-edge { + apr { + iommus = <&lpass_q6_smmu 1>; + audio { + compatible = "qcom,apq8096-sndcard"; + qcom,model = "DB820c"; + qcom,audio-routing = + "RX_BIAS", "MCLK"; + + fe@1 { + is-fe; + link-name = "MultiMedia1 Playback"; + cpu { + sound-dai = <&q6asm MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + platform { + sound-dai = <&q6asm MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + be@1 { + link-name = "HDMI Playback"; + cpu { + sound-dai = <&q6afe AFE_PORT_HDMI_RX>; + }; + + platform { + sound-dai = <&q6adm>; + }; + + codec { + sound-dai = <&hdmi 0>; + }; + }; + }; + }; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index c93bbae645bd..75cb055b0c55 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -14,6 +14,7 @@ #include #include #include +#include / { model = "Qualcomm Technologies, Inc. MSM8996"; @@ -1287,6 +1288,34 @@ "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"; + }; + }; adsp-pil { @@ -1315,6 +1344,39 @@ 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 = ; + #sound-dai-cells = <1>; + }; + + q6asm: q6asm { + compatible = "qcom,q6asm"; + qcom,apr-svc-name = "ASM"; + qcom,apr-svc-id = ; + #sound-dai-cells = <1>; + }; + + q6adm: q6adm { + compatible = "qcom,q6adm"; + qcom,apr-svc-name = "ADM"; + qcom,apr-svc-id = ; + #sound-dai-cells = <0>; + }; + + }; }; };