From patchwork Tue Jan 29 13:23:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10786179 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 92F33184E for ; Tue, 29 Jan 2019 13:23:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8232F27CEA for ; Tue, 29 Jan 2019 13:23:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73CB9280B0; Tue, 29 Jan 2019 13:23:54 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DA4C27CEA for ; Tue, 29 Jan 2019 13:23:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725601AbfA2NXx (ORCPT ); Tue, 29 Jan 2019 08:23:53 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36535 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725911AbfA2NXx (ORCPT ); Tue, 29 Jan 2019 08:23:53 -0500 Received: by mail-wm1-f67.google.com with SMTP id p6so17739263wmc.1 for ; Tue, 29 Jan 2019 05:23:52 -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=C9cOt5ITDVopsgviHrr1V3PGSqn/anQnP2GxQeP5Cxg=; b=V5DWwx0nuHbq+tHes4yn81mU2X7chix9xGALjVonp505GJuevkUXoz5CspYma5be3X 94/ZkVb3sqVEr+QKfz5ngQlP/4niZeyyILdtRux5Wdqi4/dVnhBgEW2a1Es1HQ6yQQww BKXPk8t6RUpH5Hv4ESoQoN68e4TrQJFGZWg80= 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=C9cOt5ITDVopsgviHrr1V3PGSqn/anQnP2GxQeP5Cxg=; b=iKZXjBXLhbFfjNDD++dqq/0ASCHq2fQ3uoRHuqqxl8tH4CEE55ZjrT0+0Rnnpwt1Ll 13QDAW9B795mAUVqwHbCWypz+QBcwN++6SXXy0LuyJd8qpYaVc1ru+JEm0EOV2wvBNQa Qa2fzc4Ka6J6/AOKTTG1uLNm0zYDyUACKd06I6JCwihvu0JhwfkNvignAMPCuA9mDCHl 8iFhXGUVjB8/gu3miXxd81x166jut1ikLPS5qTIvsz24S696hDbnJFTQAmBf0E9a82ws /u/T0jopIV0C9WQAzZlvAIvkl4LKfu9J/yifsjnClq2s6fxf5glzFPtfdy5j/p0ObEJN zLJg== X-Gm-Message-State: AJcUukd60JFvHoT5xZNQX6+5DLxGLbB9+8pOEfIEymy2V5q998W1iW1z w9VeDw/6DIl9IB1v81fXz4v7eQ== X-Google-Smtp-Source: ALg8bN6gySsAn5g0IUpGFKVAtROKVFgU44X8GOl0tfCC4/dBNpueYF81NhVHcSdDI9wtc7n6SQnJuQ== X-Received: by 2002:a1c:1d8e:: with SMTP id d136mr20720209wmd.98.1548768231741; Tue, 29 Jan 2019 05:23:51 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id w80sm3739628wme.38.2019.01.29.05.23.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jan 2019 05:23:50 -0800 (PST) From: Srinivas Kandagatla To: andy.gross@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Jordan Crouse , Vivek Gautam , Srinivas Kandagatla Subject: [PATCH 1/6] arm64: dts: msm8996: Add graphics smmu node Date: Tue, 29 Jan 2019 13:23:30 +0000 Message-Id: <20190129132335.30695-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> References: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jordan Crouse Add device node for graphics smmu, aka. adreno_smmu. Signed-off-by: Jordan Crouse Signed-off-by: Vivek Gautam Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 6ba96916c66d..c9b80d175fd4 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -1138,6 +1138,23 @@ }; }; + adreno_smmu: arm,smmu@b40000 { + compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2"; + reg = <0xb40000 0x10000>; + + #global-interrupts = <1>; + interrupts = , + , + ; + #iommu-cells = <1>; + + clocks = <&mmcc GPU_AHB_CLK>, + <&gcc GCC_MMSS_BIMC_GFX_CLK>; + clock-names = "iface", "bus"; + + power-domains = <&mmcc GPU_GDSC>; + }; + agnoc@0 { power-domains = <&gcc AGGRE0_NOC_GDSC>; compatible = "simple-pm-bus"; From patchwork Tue Jan 29 13:23:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10786181 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2F93E13B4 for ; Tue, 29 Jan 2019 13:23:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F51727CEA for ; Tue, 29 Jan 2019 13:23:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13B68280B0; Tue, 29 Jan 2019 13:23:56 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA16E27CEA for ; Tue, 29 Jan 2019 13:23:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727059AbfA2NXz (ORCPT ); Tue, 29 Jan 2019 08:23:55 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:35162 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725911AbfA2NXy (ORCPT ); Tue, 29 Jan 2019 08:23:54 -0500 Received: by mail-wr1-f68.google.com with SMTP id 96so22082162wrb.2 for ; Tue, 29 Jan 2019 05:23:53 -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=+iUaGMGKWn9N83ma0ITcBvsEGTsrPVKtGMn9CVZ2yxg=; b=itYg1ZnBFqTT8OEIbW6NsGc8XTFUE4zxH8Me1Q2KohBZ8RHYlDfZ9JpxIZFXPaSoqb LRYSqugdWDsFlrCHrmkNbvl5M9NXShdm9KIgoh+IMFROAIYDv9Tq5sB1oL02vqZhg0GG ur8+Q2MxvdTVP858MqQqCNZ5x9yJCKMIyvLm8= 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=+iUaGMGKWn9N83ma0ITcBvsEGTsrPVKtGMn9CVZ2yxg=; b=UuhDwK6ukCgzE3q9Q4pLkk6/S/DucQGcOQIj8aCpmJZWRck5U4zoC0BiqE9aeRjwYI R/gfVXpJT4Izg48w0SO6rFWuhsvhNgNi0CZBFb5HOsXRpEubQ1ArV4cZnFRIzkzx/p5t lCXvEHbVLqzVv30bgd9dXEhqCgoxuJuyh8fYYfq7DAh75zQJ5jyyTREFey4ueJ1g9rO9 UliiH3PoY0V6EeiVPv2ale5o9wLcT87rsX3bORd7aOrN+4qbPQxwrcFiT4P/LoenPiUI 61JzSnTqfJ5BeUqZlrgfd9YQ1gFDaXefm/PiRXafJ4NiaKB2v62gzECMFQjh7dU1Wpm3 kK4Q== X-Gm-Message-State: AJcUukfPTlM/Gusy2Ga7taMIu6Ot6eh6/PzY2/IAFoCshQIe5spyxn3l PEbLpsjOrPjkOTe1U1LpkqtTqg== X-Google-Smtp-Source: ALg8bN4R2UjjjzQwle8+n4l73Ie84+eu9E/FU0tDbIKDEd/JPn4L5EI3x0aGvigsF9jTh1TjrQkI4Q== X-Received: by 2002:adf:fe11:: with SMTP id n17mr25308535wrr.329.1548768232946; Tue, 29 Jan 2019 05:23:52 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id w80sm3739628wme.38.2019.01.29.05.23.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jan 2019 05:23:52 -0800 (PST) From: Srinivas Kandagatla To: andy.gross@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Archit Taneja , Vivek Gautam , Srinivas Kandagatla Subject: [PATCH 2/6] arm64: dts: msm8996: Add display smmu node Date: Tue, 29 Jan 2019 13:23:31 +0000 Message-Id: <20190129132335.30695-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> References: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Archit Taneja Add device node for display smmu, aka. mdp_smmu. Signed-off-by: Archit Taneja Signed-off-by: Vivek Gautam Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index c9b80d175fd4..96adda520bd5 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -1155,6 +1155,23 @@ power-domains = <&mmcc GPU_GDSC>; }; + mdp_smmu: arm,smmu@d00000 { + compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2"; + reg = <0xd00000 0x10000>; + + #global-interrupts = <1>; + interrupts = , + , + ; + #iommu-cells = <1>; + + clocks = <&mmcc SMMU_MDP_AHB_CLK>, + <&mmcc SMMU_MDP_AXI_CLK>; + clock-names = "iface", "bus"; + + power-domains = <&mmcc MDSS_GDSC>; + }; + agnoc@0 { power-domains = <&gcc AGGRE0_NOC_GDSC>; compatible = "simple-pm-bus"; From patchwork Tue Jan 29 13:23:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10786183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3A21613B4 for ; Tue, 29 Jan 2019 13:23:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2790527CEA for ; Tue, 29 Jan 2019 13:23:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BDD2280B0; Tue, 29 Jan 2019 13:23:57 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABC8D27CEA for ; Tue, 29 Jan 2019 13:23:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725911AbfA2NX4 (ORCPT ); Tue, 29 Jan 2019 08:23:56 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44174 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725355AbfA2NXz (ORCPT ); Tue, 29 Jan 2019 08:23:55 -0500 Received: by mail-wr1-f67.google.com with SMTP id z5so22004773wrt.11 for ; Tue, 29 Jan 2019 05:23: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=cJVPwkmiIQelbKGNm2p5QIWk1VCEgPV2Jz4v/peH4c0=; b=imGOnd4xYHw7xLkRLPA4lgqDpncHIIKu2AQdnXEMbU+4x0h7mJSwF/pVxC6qUeVyRt Bgy58LZ6QBcY1j8frbUMg1SuLU+Xx/TPLgxXHO1XF+6+FihDAhqI4V/+SwKAO7uOO0i9 +V96ptKufbrdpE7IEgDGw3QN9V7tktrNCCEFE= 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=cJVPwkmiIQelbKGNm2p5QIWk1VCEgPV2Jz4v/peH4c0=; b=qwVp0GQCvoYS7Ylz7pGTyMDtGWHEBJ+oQwTiUTsxAWvuT2OZLa/87T2KYQOkUTXaa3 BIxxoRHMLUSV9Q/5JdULETVDo9rG398dt0ors27QKuVitIV0bHt7ZBqLFVvsUN8woV+e 3Mwf0z0kK56QlfzewcqCk433bJD9wrUeqzSH+vD0JsqE8Da7B4ZKIvT6TbZRgeY51MQU C5ESehpBr3TyFEMlXsYuPq+/4APrQ6DChBFE4KvONCXpxAObIIWWBrbShwNkTf5G96aE 4Y0rcK6utw6ueKmts/Cl4bCMefZjAPsNJOFxKbBGgfF6nE84xqtv8XRO1gKj8VrpAo+D /N3A== X-Gm-Message-State: AJcUukd+rtFJxR2PsyG5aNZynLaIAM3WZx4yHChbnYUnDyd01t/oo1cs ohufqXxijveHejbEnXcQapW1IA== X-Google-Smtp-Source: ALg8bN6H2O6S+DgjvlJxLwdrvmqRTs6WaXE7z/QfJnss67fMh6N1TAkxmZ/M2jFSW2kHnrI222Ah2g== X-Received: by 2002:adf:d243:: with SMTP id o3mr26911673wri.66.1548768234046; Tue, 29 Jan 2019 05:23:54 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id w80sm3739628wme.38.2019.01.29.05.23.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jan 2019 05:23:53 -0800 (PST) From: Srinivas Kandagatla To: andy.gross@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Archit Taneja , Vivek Gautam , Srinivas Kandagatla Subject: [PATCH 3/6] arm64: qcom: msm8996.dtsi: Add Display nodes Date: Tue, 29 Jan 2019 13:23:32 +0000 Message-Id: <20190129132335.30695-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> References: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Archit Taneja Signed-off-by: Archit Taneja [Removed instances of mmagic clocks; Use qcom,msm8996-smmu-v2 bindings] Signed-off-by: Vivek Gautam Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 120 ++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 96adda520bd5..0d0b9482aa4d 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -1337,6 +1337,126 @@ "bus_slave"; }; }; + + mdss: mdss@900000 { + compatible = "qcom,mdss"; + + reg = <0x900000 0x1000>, + <0x9b0000 0x1040>, + <0x9b8000 0x1040>; + reg-names = "mdss_phys", + "vbif_phys", + "vbif_nrt_phys"; + + power-domains = <&mmcc MDSS_GDSC>; + interrupts = ; + + interrupt-controller; + #interrupt-cells = <1>; + + clocks = <&mmcc MDSS_AHB_CLK>; + clock-names = "iface_clk"; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + mdp: mdp@901000 { + compatible = "qcom,mdp5"; + reg = <0x901000 0x90000>; + reg-names = "mdp_phys"; + + interrupt-parent = <&mdss>; + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; + + clocks = <&mmcc MDSS_AHB_CLK>, + <&mmcc MDSS_AXI_CLK>, + <&mmcc MDSS_MDP_CLK>, + <&mmcc SMMU_MDP_AXI_CLK>, + <&mmcc MDSS_VSYNC_CLK>; + clock-names = "iface_clk", + "bus_clk", + "core_clk", + "iommu_clk", + "vsync_clk"; + + iommus = <&mdp_smmu 0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + mdp5_intf3_out: endpoint { + remote-endpoint = <&hdmi_in>; + }; + }; + }; + }; + + hdmi: hdmi-tx@9a0000 { + compatible = "qcom,hdmi-tx-8996"; + reg = <0x009a0000 0x50c>, + <0x00070000 0x6158>, + <0x009e0000 0xfff>; + reg-names = "core_physical", + "qfprom_physical", + "hdcp_physical"; + + interrupt-parent = <&mdss>; + interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; + + clocks = <&mmcc MDSS_MDP_CLK>, + <&mmcc MDSS_AHB_CLK>, + <&mmcc MDSS_HDMI_CLK>, + <&mmcc MDSS_HDMI_AHB_CLK>, + <&mmcc MDSS_EXTPCLK_CLK>; + clock-names = + "mdp_core_clk", + "iface_clk", + "core_clk", + "alt_iface_clk", + "extp_clk"; + + phys = <&hdmi_phy>; + phy-names = "hdmi_phy"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + hdmi_in: endpoint { + remote-endpoint = <&mdp5_intf3_out>; + }; + }; + }; + }; + + hdmi_phy: hdmi-phy@9a0600 { + #phy-cells = <0>; + compatible = "qcom,hdmi-phy-8996"; + reg = <0x9a0600 0x1c4>, + <0x9a0a00 0x124>, + <0x9a0c00 0x124>, + <0x9a0e00 0x124>, + <0x9a1000 0x124>, + <0x9a1200 0x0c8>; + reg-names = "hdmi_pll", + "hdmi_tx_l0", + "hdmi_tx_l1", + "hdmi_tx_l2", + "hdmi_tx_l3", + "hdmi_phy"; + + clocks = <&mmcc MDSS_AHB_CLK>, + <&gcc GCC_HDMI_CLKREF_CLK>; + clock-names = "iface_clk", + "ref_clk"; + }; + }; }; adsp-pil { From patchwork Tue Jan 29 13:23:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10786185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 909781399 for ; Tue, 29 Jan 2019 13:23:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E85727CEA for ; Tue, 29 Jan 2019 13:23:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71D05280B0; Tue, 29 Jan 2019 13:23:58 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1702C27CEA for ; Tue, 29 Jan 2019 13:23:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727100AbfA2NX5 (ORCPT ); Tue, 29 Jan 2019 08:23:57 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:55312 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727047AbfA2NX5 (ORCPT ); Tue, 29 Jan 2019 08:23:57 -0500 Received: by mail-wm1-f67.google.com with SMTP id y139so17679949wmc.5 for ; Tue, 29 Jan 2019 05:23: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=SDgDFPrkTA9qfo23o9Li/MtHbx/Thbm07i4c1CfCSpI=; b=BngKv3PVYF0FRPSQpkCQQ1Aa5XFzeWfypO4D4ukCchwkNIEFc2dsZrzhV3DqLuC9sn kTkvQeRCapFMiSix4RbAk3SyRqOcUjB6hhdCe9269bKyYNuW4/CjAUkrQJuvHB2wHbdX X80lJXz98eZMzrGxmOu32TYhwUjOWMGCq0GYE= 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=SDgDFPrkTA9qfo23o9Li/MtHbx/Thbm07i4c1CfCSpI=; b=JF5lIP0vrdNi28a0kfSA9JhX+vnrx5vsGxr9oOw+tD4gvSEMGY0GeoEH9DdC5afqEW lwKoWBKpuXdtT0v/HvDWYo3hM7/f6IHMqpHrZSL2CMYDmq8/wgS5wpI1AGCIzsmgZfHu YOIUr5NqyfNkFMc8h4bThvsxsYOvsr8PHcd3H6OTeImzi8ec6CrxOKj3xwfa6vzUyj40 /XvlyKyBWsJsCKnKcM6ddXIApimzYllLjCLTSqhIj9EEnxF6DLuPQxxckjOeBCze5YYK tCbSt726JzDantvpWFDY7/C2LBKIbybCmsC9vdqOnwhrsqH/cFeHMoZ/lyVwW14j7ip4 kQ2A== X-Gm-Message-State: AJcUukfs1e2teADUWkIE6HHJWRXyYUgeqFa9AK/0P1+dUpxfXSydeK4b kbKsSMTbrYd3e9CtlCBZRtgY2g== X-Google-Smtp-Source: ALg8bN5e0yOGtsbQt25BH7kXcgWXwY7RIGpFS8haQyv+nafZohGkAXAUIMVpPWQEyW5a5bTkbD9JYA== X-Received: by 2002:a7b:cd85:: with SMTP id y5mr20447767wmj.129.1548768235552; Tue, 29 Jan 2019 05:23:55 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id w80sm3739628wme.38.2019.01.29.05.23.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jan 2019 05:23:54 -0800 (PST) From: Srinivas Kandagatla To: andy.gross@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Jordan Crouse , Vivek Gautam , Srinivas Kandagatla Subject: [PATCH 4/6] arm64: dts: Add Adreno GPU and GPU smmu definitions Date: Tue, 29 Jan 2019 13:23:33 +0000 Message-Id: <20190129132335.30695-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> References: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jordan Crouse Add an initial node for the Adreno GPU and it's companion SMMU. The GPU node is mostly complete except for a bare bones power table that will be filled out more completely later. Signed-off-by: Jordan Crouse [Remove mmagic clocks from GPU/smmu nodes] Signed-off-by: Vivek Gautam Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 52 +++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 0d0b9482aa4d..b5f23594905c 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -84,6 +84,12 @@ qcom,client-id = <1>; qcom,vmid = <15>; }; + + zap_shader_region: gpu@8f200000 { + compatible = "shared-dma-pool"; + reg = <0x0 0x90b00000 0x0 0xa00000>; + no-map; + }; }; cpus { @@ -1338,6 +1344,52 @@ }; }; + gpu@b00000 { + compatible = "qcom,adreno-530.2", "qcom,adreno"; + #stream-id-cells = <16>; + + reg = <0xb00000 0x3f000>; + reg-names = "kgsl_3d0_reg_memory"; + + interrupts = <0 300 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "kgsl_3d0_irq"; + + clocks = <&mmcc GPU_GX_GFX3D_CLK>, + <&mmcc GPU_AHB_CLK>, + <&mmcc GPU_GX_RBBMTIMER_CLK>, + <&gcc GCC_BIMC_GFX_CLK>, + <&gcc GCC_MMSS_BIMC_GFX_CLK>; + + clock-names = "core", + "iface", + "rbbmtimer", + "mem", + "mem_iface"; + + power-domains = <&mmcc GPU_GDSC>; + iommus = <&adreno_smmu 0>; + + qcom,gpu-quirk-two-pass-use-wfi; + qcom,gpu-quirk-fault-detect-mask; + + /* This is a safe speed for bring up in all bin levels. + * This isn't the fastest the chip can go, but we can + * get there eventually */ + qcom,gpu-pwrlevels { + compatible = "qcom,gpu-pwrlevels"; + qcom,gpu-pwrlevel@0 { + qcom,gpu-freq = <510000000>; + }; + qcom,gpu-pwrlevel@1 { + qcom,gpu-freq = <27000000>; + }; + }; + + zap-shader { + memory-region = <&zap_shader_region>; + }; + }; + mdss: mdss@900000 { compatible = "qcom,mdss"; From patchwork Tue Jan 29 13:23:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10786187 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 982A013B4 for ; Tue, 29 Jan 2019 13:24:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 883F527CEA for ; Tue, 29 Jan 2019 13:24:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B885280B0; Tue, 29 Jan 2019 13:24:00 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C40127CEA for ; Tue, 29 Jan 2019 13:24:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727082AbfA2NX7 (ORCPT ); Tue, 29 Jan 2019 08:23:59 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51131 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727074AbfA2NX7 (ORCPT ); Tue, 29 Jan 2019 08:23:59 -0500 Received: by mail-wm1-f65.google.com with SMTP id n190so17857449wmd.0 for ; Tue, 29 Jan 2019 05:23:57 -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=zk7ukQ/wi6+kO+yJuF8Jy/OYQIA9+hoCg3pOYSfcHV0=; b=EFtmYHyvZYYKy5TBu8vq14EO6NSaXU97FGvpI4ek4T57Em0myXQoBF8xgnOWUr7shB aNoMTyq31Opj5ZRzcs2E79MPmWlBpuNuyYIQKaAJXYhyx4mWBp6CBa/tX582vHp2CNOX A0NgdPjq0tRYR6zyTRe/PjFVnTa3i7MfOZH4s= 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=zk7ukQ/wi6+kO+yJuF8Jy/OYQIA9+hoCg3pOYSfcHV0=; b=I9DJpMmPNGWHSvn/i0H7qXfrpd8uNhavQNqlGa1f5vokIjPb59a9jYfqkyDuORKxfe 7zL71QRtPK/LXF1zVeq53+lgbr234fhdpDqq7Y7e4oclU0etO4pi3D6hT3MswRfuR7fL +JwS+XvvPK8uTqddusPRmZL2uzjX53zl5kfCFGeaaj3G7JMXT0oVvNrGNy4WIAfnwRP+ Ghp+4xOM9FPe8K6h6W/UvtjY3aWZTodcxlvRwMGeCmjzoIuUrE2nfcedZresgyk5JFIC +z5ke9hXjqfY9dMbxTQ+gkOwAx47GYjgq5CF6Q6Nbmt2tMCgm0H5INpkwQBo+bu6pFzD vqKA== X-Gm-Message-State: AJcUukc0VN8gMkm7V7iNjE1o4YYgZv9EIiK51bLqAy7qXMoAVqsLfsR0 eE7IB/D1v/2wM66M5EeCygm/Fw== X-Google-Smtp-Source: ALg8bN7wfvQnk+/U6acRCbLaLDfFfeYyiFhSDLFivxKm269KH9OThGvDWL2PZiV1uSLldRhMYnYL6Q== X-Received: by 2002:a1c:bd86:: with SMTP id n128mr21139115wmf.22.1548768236470; Tue, 29 Jan 2019 05:23:56 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id w80sm3739628wme.38.2019.01.29.05.23.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jan 2019 05:23:55 -0800 (PST) From: Srinivas Kandagatla To: andy.gross@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Archit Taneja , Srinivas Kandagatla Subject: [PATCH 5/6] arm64: dts: apq8096-db820c: Add HDMI display support Date: Tue, 29 Jan 2019 13:23:34 +0000 Message-Id: <20190129132335.30695-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> References: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Archit Taneja The APQ8096 DB820c platform provides HDMI output. The MDSS block on 8x96 supports a direct HDMI out. Populate the MDSS, MDP and HDMI DT nodes. Also, add the HDMI HPD and DDC pinctrl nodes with the bias and driver strength specified for this platform. Signed-off-by: Archit Taneja Signed-off-by: Srinivas Kandagatla --- .../boot/dts/qcom/apq8096-db820c-pins.dtsi | 52 +++++++++++++++++++ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 27 ++++++++++ 2 files changed, 79 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi index 6a573875d45a..1c0d06f59d00 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi @@ -62,4 +62,56 @@ bias-disable; }; }; + + hdmi_hpd_active: hdmi_hpd_active { + mux { + pins = "gpio34"; + function = "hdmi_hot"; + }; + + config { + pins = "gpio34"; + bias-pull-down; + drive-strength = <16>; + }; + }; + + hdmi_hpd_suspend: hdmi_hpd_suspend { + mux { + pins = "gpio34"; + function = "hdmi_hot"; + }; + + config { + pins = "gpio34"; + bias-pull-down; + drive-strength = <2>; + }; + }; + + hdmi_ddc_active: hdmi_ddc_active { + mux { + pins = "gpio32", "gpio33"; + function = "hdmi_ddc"; + }; + + config { + pins = "gpio32", "gpio33"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + hdmi_ddc_suspend: hdmi_ddc_suspend { + mux { + pins = "gpio32", "gpio33"; + function = "hdmi_ddc"; + }; + + config { + pins = "gpio32", "gpio33"; + drive-strength = <2>; + bias-pull-down; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 6d50449fbcdf..1e78f0b47c89 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -452,6 +452,33 @@ perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>; }; }; + + mdss@900000 { + status = "okay"; + + mdp@901000 { + status = "okay"; + }; + + hdmi-phy@9a0600 { + status = "okay"; + + vddio-supply = <&pm8994_l12>; + vcca-supply = <&pm8994_l28>; + #phy-cells = <0>; + }; + + hdmi-tx@9a0000 { + status = "okay"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>; + pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>; + + core-vdda-supply = <&pm8994_l12>; + core-vcc-supply = <&pm8994_s4>; + }; + }; }; From patchwork Tue Jan 29 13:23:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10786189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C35613B4 for ; Tue, 29 Jan 2019 13:24:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B1EF27CEA for ; Tue, 29 Jan 2019 13:24:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F71F2811A; Tue, 29 Jan 2019 13:24:02 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64E3927FB1 for ; Tue, 29 Jan 2019 13:24:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727074AbfA2NYA (ORCPT ); Tue, 29 Jan 2019 08:24:00 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36547 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725355AbfA2NYA (ORCPT ); Tue, 29 Jan 2019 08:24:00 -0500 Received: by mail-wm1-f67.google.com with SMTP id p6so17739631wmc.1 for ; Tue, 29 Jan 2019 05:23: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=Msgns31ZbK/VjX9Dmlo4wvjAa3AXLeHqgTQrBGozsFk=; b=PV22RLqxiY9UtdvCnwk0gVQc4uabxFZjGlT3swLnINq7BAwoRgmf+xArmoAZRg0S6u 2+hZShUuUJE12Cnrn8p3MNqcpivXFe0Q9baWrq2v6RrcuVe41fnYOrO/61ygxeihbYNH P3hGEQPVz/4mjJ60lg9fvzBGnOHCTEkgF2ijA= 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=Msgns31ZbK/VjX9Dmlo4wvjAa3AXLeHqgTQrBGozsFk=; b=t3OxhiG8vU0DR3+4ho54/eQzGYjq7UZ4PUK7jxdHcBXJIGxHYZWGsJOcUZDmd90bwi 1zipVtOxrhm+zvQPOXxxm4KbaWEemnPlEdcjkZeC7d4l99DQxQaLj4xbCoR39NHxSVQ2 Wfk9nX2f0OdlxWTJOCnEMKmNHecOkH0NYy8bdtuwzLAp8AJLT8merBrTI9AIf5cl00RY OUMwNw+lN9cgvDSGucDxYYqjFE2rWl9pZqfX/wm1cG/Dh6gLoPVeZBVOvxfw/GFLZIWP 7f11OCecj54Oxy4mpRezufS7aTOTTPibZ0itPNuc3Kv3zzLjwvHuCTrai2iXb8onRYgu n8tg== X-Gm-Message-State: AJcUukeKOTpyPeMxXpK7Gsa33EdHZgwZQnLOnYv/r4RvNbMy8ldERFZi eGus7+L9HLvoKE5+dkAO7Gn4xw== X-Google-Smtp-Source: ALg8bN4T1ZRchTqBH0+LEItUCxskNWT09IttquD/4+hzLQoWvJg3E+Ya5zlgL/gcUM18sG3CjsLquA== X-Received: by 2002:a1c:a913:: with SMTP id s19mr20298935wme.4.1548768237528; Tue, 29 Jan 2019 05:23:57 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id w80sm3739628wme.38.2019.01.29.05.23.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jan 2019 05:23:56 -0800 (PST) From: Srinivas Kandagatla To: andy.gross@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 6/6] arm64: dts: db820c: Add sound card support Date: Tue, 29 Jan 2019 13:23:35 +0000 Message-Id: <20190129132335.30695-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> References: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support both digital and analog audio on DB820c. This board has HDMI port and 3.5mm audio jack to support both digital and analog audio respectively. Signed-off-by: Srinivas Kandagatla --- .../dts/qcom/apq8096-db820c-pmic-pins.dtsi | 9 ++ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 98 ++++++++++++ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 46 ++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 140 ++++++++++++++++++ 4 files changed, 293 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi index a6ad3d7fe655..7c5045949c01 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi @@ -36,6 +36,15 @@ }; }; + + audio_mclk: clk_div1 { + pinconf { + pins = "gpio15"; + function = "func1"; + power-source = ; // 1.8V + }; + }; + volume_up_gpio: pm8996_gpio2 { pinconf { pins = "gpio2"; diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 1e78f0b47c89..56f78405587e 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 /* * GPIO name legend: proper name = the GPIO line is used as GPIO @@ -63,6 +65,7 @@ }; clocks { + compatible = "simple-bus"; divclk4: divclk4 { compatible = "fixed-clock"; #clock-cells = <0>; @@ -72,6 +75,15 @@ pinctrl-names = "default"; pinctrl-0 = <&divclk4_pin_a>; }; + + div1_mclk: divclk1 { + compatible = "gpio-gate-clock"; + pinctrl-0 = <&audio_mclk>; + pinctrl-names = "default"; + clocks = <&rpmcc RPM_SMD_DIV_CLK1>; + #clock-cells = <0>; + enable-gpios = <&pm8994_gpios 15 0>; + }; }; soc { @@ -453,6 +465,16 @@ }; }; + slim_msm: slim@91c0000 { + ngd@1 { + wcd9335: codec@1{ + clock-names = "mclk", "slimbus"; + clocks = <&div1_mclk>, + <&rpmcc RPM_SMD_BB_CLK1>; + }; + }; + }; + mdss@900000 { status = "okay"; @@ -479,6 +501,10 @@ core-vcc-supply = <&pm8994_s4>; }; }; + + remoteproc@2080000 { + status = "okay"; + }; }; @@ -666,3 +692,75 @@ }; }; }; + +&sound { + compatible = "qcom,apq8096-sndcard"; + model = "DB820c"; + audio-routing = "RX_BIAS", "MCLK"; + + mm1-dai-link { + link-name = "MultiMedia1"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + mm2-dai-link { + link-name = "MultiMedia2"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; + }; + }; + + mm3-dai-link { + link-name = "MultiMedia3"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; + }; + }; + + hdmi-dai-link { + link-name = "HDMI"; + cpu { + sound-dai = <&q6afedai HDMI_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&hdmi 0>; + }; + }; + + slim-dai-link { + link-name = "SLIM Playback"; + cpu { + sound-dai = <&q6afedai SLIMBUS_6_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&wcd9335 6>; + }; + }; + + slimcap-dai-link { + link-name = "SLIM Capture"; + cpu { + sound-dai = <&q6afedai SLIMBUS_0_TX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&wcd9335 1>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi index 131878db9852..c7ae88100cb6 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi @@ -13,6 +13,52 @@ &msmgpio { + wcd9xxx_intr { + wcd_intr_default: wcd_intr_default{ + mux { + pins = "gpio54"; + function = "gpio"; + }; + + config { + pins = "gpio54"; + drive-strength = <2>; /* 2 mA */ + bias-pull-down; /* pull down */ + input-enable; + }; + }; + }; + + + cdc_reset_ctrl { + cdc_reset_sleep: cdc_reset_sleep { + mux { + pins = "gpio64"; + function = "gpio"; + }; + config { + pins = "gpio64"; + drive-strength = <16>; + bias-disable; + output-low; + }; + }; + cdc_reset_active:cdc_reset_active { + mux { + pins = "gpio64"; + function = "gpio"; + }; + config { + pins = "gpio64"; + drive-strength = <16>; + bias-pull-down; + output-high; + }; + }; + }; + + + blsp1_spi0_default: blsp1_spi0_default { pinmux { function = "blsp_spi1"; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index b5f23594905c..3c8e1eac8758 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 / { interrupt-parent = <&intc>; @@ -1178,6 +1179,33 @@ power-domains = <&mmcc MDSS_GDSC>; }; + lpass_q6_smmu: arm,smmu-lpass_q6@1600000 { + compatible = "qcom,msm8996-smmu-v2", "qcom,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"; + }; + agnoc@0 { power-domains = <&gcc AGGRE0_NOC_GDSC>; compatible = "simple-pm-bus"; @@ -1344,6 +1372,66 @@ }; }; + slimbam:dma@9184000 + { + compatible = "qcom,bam-v1.7.0"; + qcom,controlled-remotely; + reg = <0x9184000 0x32000>; + num-channels = <31>; + interrupts = <0 164 IRQ_TYPE_LEVEL_HIGH>; + #dma-cells = <1>; + qcom,ee = <1>; + qcom,num-ees = <2>; + }; + + slim_msm: slim@91c0000 { + compatible = "qcom,slim-ngd-v1.5.0"; + reg = <0x91c0000 0x2C000>; + reg-names = "ctrl"; + interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&slimbam 3>, <&slimbam 4>, + <&slimbam 5>, <&slimbam 6>; + dma-names = "rx", "tx", "tx2", "rx2"; + #address-cells = <1>; + #size-cells = <0>; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + + tasha_ifd: tas-ifd { + compatible = "slim217,1a0"; + reg = <0 0>; + }; + + wcd9335: codec@1{ + pinctrl-0 = <&cdc_reset_active &wcd_intr_default>; + pinctrl-names = "default"; + + compatible = "slim217,1a0"; + reg = <1 0>; + + interrupt-parent = <&msmgpio>; + interrupts = <54 IRQ_TYPE_LEVEL_HIGH>, + <53 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "intr1", "intr2"; + interrupt-controller; + #interrupt-cells = <1>; + reset-gpios = <&msmgpio 64 0>; + + slim-ifc-dev = <&tasha_ifd>; + + vdd-buck-supply = <&pm8994_s4>; + vdd-buck-sido-supply = <&pm8994_s4>; + vdd-tx-supply = <&pm8994_s4>; + vdd-rx-supply = <&pm8994_s4>; + vdd-io-supply = <&pm8994_s4>; + + #sound-dai-cells = <1>; + }; + }; + }; + gpu@b00000 { compatible = "qcom,adreno-530.2", "qcom,adreno"; #stream-id-cells = <16>; @@ -1473,6 +1561,7 @@ phys = <&hdmi_phy>; phy-names = "hdmi_phy"; + #sound-dai-cells = <1>; ports { #address-cells = <1>; @@ -1511,6 +1600,9 @@ }; }; + sound: sound { + }; + adsp-pil { compatible = "qcom,msm8996-adsp-pil"; @@ -1537,6 +1629,54 @@ mboxes = <&apcs_glb 8>; qcom,smd-edge = <1>; qcom,remote-pid = <2>; + #address-cells = <1>; + #size-cells = <0>; + apr { + power-domains = <&gcc HLOS1_VOTE_LPASS_ADSP_GDSC>; + compatible = "qcom,apr-v2"; + qcom,smd-channels = "apr_audio_svc"; + reg = ; + #address-cells = <1>; + #size-cells = <0>; + + q6core { + reg = ; + compatible = "qcom,q6core"; + }; + + q6afe: q6afe { + compatible = "qcom,q6afe"; + reg = ; + q6afedai: dais { + compatible = "qcom,q6afe-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + hdmi@1 { + reg = <1>; + }; + }; + }; + + q6asm: q6asm { + compatible = "qcom,q6asm"; + reg = ; + q6asmdai: dais { + compatible = "qcom,q6asm-dais"; + #sound-dai-cells = <1>; + iommus = <&lpass_q6_smmu 1>; + }; + }; + + q6adm: q6adm { + compatible = "qcom,q6adm"; + reg = ; + q6routing: routing { + compatible = "qcom,q6adm-routing"; + #sound-dai-cells = <0>; + }; + }; + }; }; };