From patchwork Tue Jun 15 17:32:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tinghan Shen X-Patchwork-Id: 12323125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8FC3C48BE8 for ; Tue, 15 Jun 2021 21:39:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8BA8061159 for ; Tue, 15 Jun 2021 21:39:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BA8061159 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Q2mLh3+ThsjPCELDwPjPkeSysm2eZVY5DMSt3TvSpRc=; b=M1/GbfVhv2Vfd6 C0uv1KAobL22FzLj1Cu3ZRolMxtTjOwvBokfceuf9ixf86dIR4xNGU7oIWp5V3vtCohl/kqkhQDYP 9Lr3Nu3NmM+rsPFfrfIypWj1wEm0tcq+Vb6d3CC+YQDUgAQcAPHV33b0ICpyvUlO9qth8F8M9V4xt e5ExDja5zoCV3iyGOpGJVSCPe/Kpy1N0Te7J1fGbgGGlz0gc5A3L1SAm5UeqsSDbFHDvtE5TNCcUH ED7WfM9emMJwVNsefjDhtX7bcF3MRkX5l+jAnfkF7VzPElLzuYjyA/v78EO3/xjSsuE4JfzpbGCnY K9WPHOHt3TajQadsNZ6A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltGkU-003E94-Ru; Tue, 15 Jun 2021 21:37:32 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltD5Y-001pL0-FD; Tue, 15 Jun 2021 17:43:03 +0000 X-UUID: f9253c32ebd048bf95a39b48bf752877-20210615 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=Zm1MxcvqV/o5EU7IptfvOmDgjdbapZ17ncmMXJmGDs0=; b=WikJS+ayLmfDCFU4xWG7naUKqY34f1lDWG6t00nxM63H0Dz4SHxO5hvAybH5sXkCzOOOmPpvHfU5YexFH9u9OTy4lqzLIPVsiLHcK22bQb3JGTfXrEZ4vzfn3khktIEalaE9gSntCXbhF75IgQc2MRJsm42Vsa/0cTjlf0UfgX0=; X-UUID: f9253c32ebd048bf95a39b48bf752877-20210615 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 342414980; Tue, 15 Jun 2021 10:42:55 -0700 Received: from mtkmbs08n2.mediatek.inc (172.21.101.56) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 15 Jun 2021 10:32:53 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Jun 2021 01:32:46 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 16 Jun 2021 01:32:46 +0800 From: Tinghan Shen To: , CC: , , , , , , , , Nancy Lin Subject: [PATCH 25/27] arm64: dts: mt8195: add vdosys1 support for MT8195 Date: Wed, 16 Jun 2021 01:32:31 +0800 Message-ID: <20210615173233.26682-25-tinghan.shen@mediatek.com> X-Mailer: git-send-email 2.15.GIT In-Reply-To: <20210615173233.26682-1-tinghan.shen@mediatek.com> References: <20210615173233.26682-1-tinghan.shen@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210615_104300_657242_CDCF75C8 X-CRM114-Status: GOOD ( 10.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nancy Lin add vdosys1 support for MT8195 Signed-off-by: Nancy Lin --- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 178 +++++++++++++++++++++-- 1 file changed, 169 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts/mediatek/mt8195.dtsi index e273833a49f8..a98609989905 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi @@ -26,6 +26,7 @@ dpi1 = &disp_dpi1; dp-intf0 = &dp_intf0; dp-intf1 = &dp_intf1; + merge5 = &merge5; }; clocks { @@ -2241,22 +2242,27 @@ vdosys_config@1c01a000 { compatible = "mediatek,mt8195-vdosys"; - reg = <0 0x1c01a000 0 0x1000>; - reg-names = "vdosys0_config"; + reg = <0 0x1c01a000 0 0x1000>,<0 0x1c100000 0 0x1000>; + reg-names = "vdosys0_config","vdosys1_config"; iommus = <&iommu_vdo M4U_PORT_L0_DISP_RDMA0>; power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS0>; - mboxes = <&gce1 0 0 CMDQ_THR_PRIO_4>; + mboxes = <&gce1 0 0 CMDQ_THR_PRIO_4>, + <&gce1 1 0 CMDQ_THR_PRIO_4>; }; mutex: disp_mutex0@1c016000 { compatible = "mediatek,mt8195-disp-mutex"; - reg = <0 0x1c016000 0 0x1000>; - reg-names = "vdo0_mutex"; - clocks = <&vdosys0 CLK_VDO0_DISP_MUTEX0>; + reg = <0 0x1c016000 0 0x1000>, + <0 0x1c101000 0 0x1000>; + reg-names = "vdo0_mutex","vdo1_mutex"; + clocks = <&vdosys0 CLK_VDO0_DISP_MUTEX0>, + <&vdosys1 CLK_VDO1_DISP_MUTEX>; power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS0>; - clock-names = "vdo0_mutex"; - interrupts = ; - mediatek,gce-events = ; + clock-names = "vdo0_mutex","sub_mutex"; + interrupts = , + ; + mediatek,gce-events = , + ; }; ovl0: disp_ovl@1c000000 { @@ -2446,6 +2452,92 @@ power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; }; + disp_pseudo_ovl0@1c104000 { + compatible = "mediatek,mt8195-disp-pseudo-ovl"; + reg = <0 0x1c104000 0 0x1000>, + <0 0x1c105000 0 0x1000>, + <0 0x1c106000 0 0x1000>, + <0 0x1c107000 0 0x1000>, + <0 0x1c108000 0 0x1000>, + <0 0x1c109000 0 0x1000>, + <0 0x1c10A000 0 0x1000>, + <0 0x1c10B000 0 0x1000>, + <0 0x1c10C000 0 0x1000>, + <0 0x1c10D000 0 0x1000>, + <0 0x1c10E000 0 0x1000>, + <0 0x1c10F000 0 0x1000>, + <0 0x1c100000 0 0x1000>; + reg-names = "vdo1_mdp_rdma0","vdo1_mdp_rdma1","vdo1_mdp_rdma2", + "vdo1_mdp_rdma3","vdo1_mdp_rdma4", + "vdo1_mdp_rdma5","vdo1_mdp_rdma6", + "vdo1_mdp_rdma7","vdo1_merge0", + "vdo1_merge1","vdo1_merge2","vdo1_merge3","top"; + mediatek,gce-client-reg = <&gce1 SUBSYS_1c10XXXX 0x4000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0x5000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0x6000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0x7000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0x8000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0x9000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0xA000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0xB000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0xC000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0xD000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0xE000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0xF000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0x0000 0x1000>; + clocks = <&vdosys1 CLK_VDO1_MDP_RDMA0>, + <&vdosys1 CLK_VDO1_MDP_RDMA1>, + <&vdosys1 CLK_VDO1_MDP_RDMA2>, + <&vdosys1 CLK_VDO1_MDP_RDMA3>, + <&vdosys1 CLK_VDO1_MDP_RDMA4>, + <&vdosys1 CLK_VDO1_MDP_RDMA5>, + <&vdosys1 CLK_VDO1_MDP_RDMA6>, + <&vdosys1 CLK_VDO1_MDP_RDMA7>, + <&vdosys1 CLK_VDO1_VPP_MERGE0>, + <&vdosys1 CLK_VDO1_VPP_MERGE1>, + <&vdosys1 CLK_VDO1_VPP_MERGE2>, + <&vdosys1 CLK_VDO1_VPP_MERGE3>, + <&vdosys1 CLK_VDO1_MERGE0_DL_ASYNC>, + <&vdosys1 CLK_VDO1_MERGE1_DL_ASYNC>, + <&vdosys1 CLK_VDO1_MERGE2_DL_ASYNC>, + <&vdosys1 CLK_VDO1_MERGE3_DL_ASYNC>; + clock-names = "vdo1_mdp_rdma0","vdo1_mdp_rdma1", + "vdo1_mdp_rdma2","vdo1_mdp_rdma3", + "vdo1_mdp_rdma4","vdo1_mdp_rdma5", + "vdo1_mdp_rdma6","vdo1_mdp_rdma7", + "vdo1_merge0","vdo1_merge1", + "vdo1_merge2","vdo1_merge3", + "vdo1_merge0_async","vdo1_merge1_async", + "vdo1_merge2_async","vdo1_merge3_async"; + power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; + mediatek,larb = <&larb2>; + mediatek,smi-id = <0>; + iommus = <&iommu_vdo M4U_PORT_L2_MDP_RDMA0>; + interrupts = , /*rdma0*/ + , /*rdma1*/ + , /*rdma2*/ + , /*rdma3*/ + , /*rdma4*/ + , /*rdma5*/ + , /*rdma6*/ + , /*rdma7*/ + , /*merge0*/ + , /*merge1*/ + , /*merge2*/ + ; /*merge3*/ + }; + + merge5: disp_vpp_merge5@1c110000 { + compatible = "mediatek,mt8195-disp-merge"; + reg = <0 0x1c110000 0 0x1000>; + interrupts = ; + clocks = <&vdosys1 CLK_VDO1_VPP_MERGE4>, + <&vdosys1 CLK_VDO1_MERGE4_DL_ASYNC>; + clock-names = "merge5","merge5_async"; + power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; + mediatek,gce-client-reg = <&gce1 SUBSYS_1c11XXXX 0x0000 0x1000>; + }; + disp_dpi1: disp_dpi1@1c112000 { compatible = "mediatek,mt8195-dpi"; reg = <0 0x1c112000 0 0x1000>; @@ -2478,6 +2570,54 @@ status = "disabled"; }; + disp_ethdr@1c114000 { + compatible = "mediatek,mt8195-disp-ethdr"; + reg = <0 0x1c114000 0 0x1000>, + <0 0x1c115000 0 0x1000>, + <0 0x1c117000 0 0x1000>, + <0 0x1c119000 0 0x1000>, + <0 0x1c11A000 0 0x1000>, + <0 0x1c11B000 0 0x1000>, + <0 0x1c11C000 0 0x1000>, + <0 0x1c100000 0 0x1000>; + reg-names = "hdr_disp_mixer","hdr_vdo_fe0","hdr_vdo_fe1", + "hdr_gfx_fe0","hdr_gfx_fe1","hdr_vdo_be", + "hdr_adl_ds","top"; + mediatek,gce-client-reg = <&gce1 SUBSYS_1c11XXXX 0x4000 0x1000>, + <&gce1 SUBSYS_1c11XXXX 0x5000 0x1000>, + <&gce1 SUBSYS_1c11XXXX 0x7000 0x1000>, + <&gce1 SUBSYS_1c11XXXX 0x9000 0x1000>, + <&gce1 SUBSYS_1c11XXXX 0xA000 0x1000>, + <&gce1 SUBSYS_1c11XXXX 0xB000 0x1000>, + <&gce1 SUBSYS_1c11XXXX 0xC000 0x1000>, + <&gce1 SUBSYS_1c10XXXX 0x0000 0x1000>; + clocks = <&vdosys1 CLK_VDO1_DISP_MIXER>, + <&vdosys1 CLK_VDO1_HDR_VDO_FE0>, + <&vdosys1 CLK_VDO1_HDR_VDO_FE1>, + <&vdosys1 CLK_VDO1_HDR_GFX_FE0>, + <&vdosys1 CLK_VDO1_HDR_GFX_FE1>, + <&vdosys1 CLK_VDO1_HDR_VDO_BE>, + <&vdosys1 CLK_VDO1_26M_SLOW>, + <&vdosys1 CLK_VDO1_HDR_VDO_FE0_DL_ASYNC>, + <&vdosys1 CLK_VDO1_HDR_VDO_FE1_DL_ASYNC>, + <&vdosys1 CLK_VDO1_HDR_GFX_FE0_DL_ASYNC>, + <&vdosys1 CLK_VDO1_HDR_GFX_FE1_DL_ASYNC>, + <&vdosys1 CLK_VDO1_HDR_VDO_BE_DL_ASYNC>, + <&topckgen CLK_TOP_ETHDR_SEL>; + clock-names = "hdr_disp_mixer","hdr_vdo_fe0","hdr_vdo_fe1", + "hdr_gfx_fe0","hdr_gfx_fe1","hdr_vdo_be", + "hdr_adl_ds","hdr_vdo_fe0_async", + "hdr_vdo_fe1_async","hdr_gfx_fe0_async", + "hdr_gfx_fe1_async","hdr_vdo_be_async", + "ethdr_top"; + power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; + mediatek,larb = <&larb3>; + mediatek,smi-id = <1>; + iommus = <&iommu_vpp M4U_PORT_L3_HDR_DS>, + <&iommu_vpp M4U_PORT_L3_HDR_ADL>; + interrupts = ; /*disp mixer*/ + }; + hdmi0: hdmi@1c300000 { compatible = "mediatek,mt8195-hdmi"; reg = <0 0x1c300000 0 0x1000>; @@ -2517,6 +2657,26 @@ }; }; + disp_pseudo_ovl_l2 { + compatible = "mediatek,mt8195-pseudo-ovl-larb"; + mediatek,larb-id = <2>; + power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; + iommus = <&iommu_vdo M4U_PORT_L2_MDP_RDMA0>, + <&iommu_vdo M4U_PORT_L2_MDP_RDMA2>, + <&iommu_vdo M4U_PORT_L2_MDP_RDMA4>, + <&iommu_vdo M4U_PORT_L2_MDP_RDMA6>; + }; + + disp_pseudo_ovl_l3 { + compatible = "mediatek,mt8195-pseudo-ovl-larb"; + mediatek,larb-id = <3>; + power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; + iommus = <&iommu_vpp M4U_PORT_L3_MDP_RDMA1>, + <&iommu_vpp M4U_PORT_L3_MDP_RDMA3>, + <&iommu_vpp M4U_PORT_L3_MDP_RDMA5>, + <&iommu_vpp M4U_PORT_L3_MDP_RDMA7>; + }; + hdmiddc0: ddc_i2c { compatible = "mediatek,mt8195-hdmi-ddc"; clocks = <&clk26m>;