From nobody Sun Sep 22 11:42:41 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AE88C433FE for ; Mon, 17 Jan 2022 07:08:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237487AbiAQHIN (ORCPT ); Mon, 17 Jan 2022 02:08:13 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:49088 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S237446AbiAQHHr (ORCPT ); Mon, 17 Jan 2022 02:07:47 -0500 X-UUID: 4c271091d3d84efb887a0c5a04f860d0-20220117 X-UUID: 4c271091d3d84efb887a0c5a04f860d0-20220117 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 438142784; Mon, 17 Jan 2022 15:07:42 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Mon, 17 Jan 2022 15:07:41 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 17 Jan 2022 15:07:39 +0800 From: Yong Wu To: Matthias Brugger , Hans Verkuil , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , David Airlie , "Mauro Carvalho Chehab" CC: Evan Green , Robin Murphy , Tomasz Figa , Will Deacon , , , , , , , , , Matthias Kaehlcke , , , , , , Daniel Vetter , Chun-Kuang Hu , Philipp Zabel , Tiffany Lin , "Dafna Hirschfeld" , Hsin-Yi Wang , Eizan Miyamoto , , Frank Wunderlich , , , , AngeloGioacchino Del Regno Subject: [PATCH v10 13/13] arm64: dts: mediatek: Get rid of mediatek,larb for MM nodes Date: Mon, 17 Jan 2022 15:05:10 +0800 Message-ID: <20220117070510.17642-14-yong.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220117070510.17642-1-yong.wu@mediatek.com> References: <20220117070510.17642-1-yong.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" After adding device_link between the IOMMU consumer and smi, the mediatek,larb is unnecessary now. CC: Matthias Brugger Signed-off-by: Yong Wu Reviewed-by: Evan Green Reviewed-by: AngeloGioacchino Del Regno --- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 16 ---------------- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 6 ------ 2 files changed, 22 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts= /mediatek/mt8173.dtsi index dee66e5f054c..417e82891a70 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -1010,7 +1010,6 @@ <&mmsys CLK_MM_MUTEX_32K>; power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; iommus =3D <&iommu M4U_PORT_MDP_RDMA0>; - mediatek,larb =3D <&larb0>; mediatek,vpu =3D <&vpu>; }; =20 @@ -1021,7 +1020,6 @@ <&mmsys CLK_MM_MUTEX_32K>; power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; iommus =3D <&iommu M4U_PORT_MDP_RDMA1>; - mediatek,larb =3D <&larb4>; }; =20 mdp_rsz0: rsz@14003000 { @@ -1051,7 +1049,6 @@ clocks =3D <&mmsys CLK_MM_MDP_WDMA>; power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; iommus =3D <&iommu M4U_PORT_MDP_WDMA>; - mediatek,larb =3D <&larb0>; }; =20 mdp_wrot0: wrot@14007000 { @@ -1060,7 +1057,6 @@ clocks =3D <&mmsys CLK_MM_MDP_WROT0>; power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; iommus =3D <&iommu M4U_PORT_MDP_WROT0>; - mediatek,larb =3D <&larb0>; }; =20 mdp_wrot1: wrot@14008000 { @@ -1069,7 +1065,6 @@ clocks =3D <&mmsys CLK_MM_MDP_WROT1>; power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; iommus =3D <&iommu M4U_PORT_MDP_WROT1>; - mediatek,larb =3D <&larb4>; }; =20 ovl0: ovl@1400c000 { @@ -1079,7 +1074,6 @@ power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; clocks =3D <&mmsys CLK_MM_DISP_OVL0>; iommus =3D <&iommu M4U_PORT_DISP_OVL0>; - mediatek,larb =3D <&larb0>; mediatek,gce-client-reg =3D <&gce SUBSYS_1400XXXX 0xc000 0x1000>; }; =20 @@ -1090,7 +1084,6 @@ power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; clocks =3D <&mmsys CLK_MM_DISP_OVL1>; iommus =3D <&iommu M4U_PORT_DISP_OVL1>; - mediatek,larb =3D <&larb4>; mediatek,gce-client-reg =3D <&gce SUBSYS_1400XXXX 0xd000 0x1000>; }; =20 @@ -1101,7 +1094,6 @@ power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; clocks =3D <&mmsys CLK_MM_DISP_RDMA0>; iommus =3D <&iommu M4U_PORT_DISP_RDMA0>; - mediatek,larb =3D <&larb0>; mediatek,gce-client-reg =3D <&gce SUBSYS_1400XXXX 0xe000 0x1000>; }; =20 @@ -1112,7 +1104,6 @@ power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; clocks =3D <&mmsys CLK_MM_DISP_RDMA1>; iommus =3D <&iommu M4U_PORT_DISP_RDMA1>; - mediatek,larb =3D <&larb4>; mediatek,gce-client-reg =3D <&gce SUBSYS_1400XXXX 0xf000 0x1000>; }; =20 @@ -1123,7 +1114,6 @@ power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; clocks =3D <&mmsys CLK_MM_DISP_RDMA2>; iommus =3D <&iommu M4U_PORT_DISP_RDMA2>; - mediatek,larb =3D <&larb4>; mediatek,gce-client-reg =3D <&gce SUBSYS_1401XXXX 0 0x1000>; }; =20 @@ -1134,7 +1124,6 @@ power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; clocks =3D <&mmsys CLK_MM_DISP_WDMA0>; iommus =3D <&iommu M4U_PORT_DISP_WDMA0>; - mediatek,larb =3D <&larb0>; mediatek,gce-client-reg =3D <&gce SUBSYS_1401XXXX 0x1000 0x1000>; }; =20 @@ -1145,7 +1134,6 @@ power-domains =3D <&spm MT8173_POWER_DOMAIN_MM>; clocks =3D <&mmsys CLK_MM_DISP_WDMA1>; iommus =3D <&iommu M4U_PORT_DISP_WDMA1>; - mediatek,larb =3D <&larb4>; mediatek,gce-client-reg =3D <&gce SUBSYS_1401XXXX 0x2000 0x1000>; }; =20 @@ -1397,7 +1385,6 @@ <0 0x16027800 0 0x800>, /* VDEC_HWB */ <0 0x16028400 0 0x400>; /* VDEC_HWG */ interrupts =3D ; - mediatek,larb =3D <&larb1>; iommus =3D <&iommu M4U_PORT_HW_VDEC_MC_EXT>, <&iommu M4U_PORT_HW_VDEC_PP_EXT>, <&iommu M4U_PORT_HW_VDEC_AVC_MV_EXT>, @@ -1465,7 +1452,6 @@ compatible =3D "mediatek,mt8173-vcodec-enc"; reg =3D <0 0x18002000 0 0x1000>; /* VENC_SYS */ interrupts =3D ; - mediatek,larb =3D <&larb3>; iommus =3D <&iommu M4U_PORT_VENC_RCPU>, <&iommu M4U_PORT_VENC_REC>, <&iommu M4U_PORT_VENC_BSDMA>, @@ -1493,7 +1479,6 @@ clock-names =3D "jpgdec-smi", "jpgdec"; power-domains =3D <&spm MT8173_POWER_DOMAIN_VENC>; - mediatek,larb =3D <&larb3>; iommus =3D <&iommu M4U_PORT_JPGDEC_WDMA>, <&iommu M4U_PORT_JPGDEC_BSDMA>; }; @@ -1527,7 +1512,6 @@ <&iommu M4U_PORT_VENC_CUR_CHROMA_SET2>, <&iommu M4U_PORT_VENC_REF_LUMA_SET2>, <&iommu M4U_PORT_VENC_REC_CHROMA_SET2>; - mediatek,larb =3D <&larb5>; mediatek,vpu =3D <&vpu>; clocks =3D <&topckgen CLK_TOP_VENC_LT_SEL>; clock-names =3D "venc_lt_sel"; diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts= /mediatek/mt8183.dtsi index ac6b0c12d3b3..452102c4904a 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi @@ -1332,7 +1332,6 @@ power-domains =3D <&spm MT8183_POWER_DOMAIN_DISP>; clocks =3D <&mmsys CLK_MM_DISP_OVL0>; iommus =3D <&iommu M4U_PORT_DISP_OVL0>; - mediatek,larb =3D <&larb0>; mediatek,gce-client-reg =3D <&gce SUBSYS_1400XXXX 0x8000 0x1000>; }; =20 @@ -1343,7 +1342,6 @@ power-domains =3D <&spm MT8183_POWER_DOMAIN_DISP>; clocks =3D <&mmsys CLK_MM_DISP_OVL0_2L>; iommus =3D <&iommu M4U_PORT_DISP_2L_OVL0_LARB0>; - mediatek,larb =3D <&larb0>; mediatek,gce-client-reg =3D <&gce SUBSYS_1400XXXX 0x9000 0x1000>; }; =20 @@ -1354,7 +1352,6 @@ power-domains =3D <&spm MT8183_POWER_DOMAIN_DISP>; clocks =3D <&mmsys CLK_MM_DISP_OVL1_2L>; iommus =3D <&iommu M4U_PORT_DISP_2L_OVL1_LARB0>; - mediatek,larb =3D <&larb0>; mediatek,gce-client-reg =3D <&gce SUBSYS_1400XXXX 0xa000 0x1000>; }; =20 @@ -1365,7 +1362,6 @@ power-domains =3D <&spm MT8183_POWER_DOMAIN_DISP>; clocks =3D <&mmsys CLK_MM_DISP_RDMA0>; iommus =3D <&iommu M4U_PORT_DISP_RDMA0>; - mediatek,larb =3D <&larb0>; mediatek,rdma-fifo-size =3D <5120>; mediatek,gce-client-reg =3D <&gce SUBSYS_1400XXXX 0xb000 0x1000>; }; @@ -1377,7 +1373,6 @@ power-domains =3D <&spm MT8183_POWER_DOMAIN_DISP>; clocks =3D <&mmsys CLK_MM_DISP_RDMA1>; iommus =3D <&iommu M4U_PORT_DISP_RDMA1>; - mediatek,larb =3D <&larb0>; mediatek,rdma-fifo-size =3D <2048>; mediatek,gce-client-reg =3D <&gce SUBSYS_1400XXXX 0xc000 0x1000>; }; @@ -1534,7 +1529,6 @@ compatible =3D "mediatek,mt8183-jpgenc", "mediatek,mtk-jpgenc"; reg =3D <0 0x17030000 0 0x1000>; interrupts =3D ; - mediatek,larb =3D <&larb4>; iommus =3D <&iommu M4U_PORT_JPGENC_RDMA>, <&iommu M4U_PORT_JPGENC_BSDMA>; power-domains =3D <&spm MT8183_POWER_DOMAIN_VENC>; --=20 2.18.0