From patchwork Wed Mar 20 17:37:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Link Mauve X-Patchwork-Id: 13598056 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3F370C54E58 for ; Wed, 20 Mar 2024 17:38:20 +0000 (UTC) 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=swkDJIv6F/J3y6ONsQ3xM6I3E0vHWY2o3BHbgBnFMrI=; b=c0WgNxQle37rxz zKmeuYo3/C5p2IDy6bPGgrvIBwNpwtFlRGF55I5yTMIf2rWv88BauHWTZ+0YsFPMzM3CHEYKJQ0C/ WZb7KULO+3NQIvrjoUj3rESJebXnJDZ1zBJglpChFmDsC+cZDoUmh346lwHBqExr0pxxHra//QZBH k6Q9YBmJtrh5rRrksHYSGGOwUu7JWdMdueV6IFlkqzVUlnUXgDyahBCC5mreKTlgs9A0EXv/UGT/d ByT0JjDEnKbY44xdJtRw3caYy0R1+lOaGvc2etUp/87NXAgEYAq3iWJgUo7NrWHvwxh536RmbAvgj KVph9IS+da5BNF+d+7rg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rmzsy-00000000Vef-32R9; Wed, 20 Mar 2024 17:37:56 +0000 Received: from [2a01:e0a:828:c7c0:e2d5:5eff:fe2d:8e8] (helo=luna.linkmauve.fr) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rmzst-00000000Vc8-0YiK; Wed, 20 Mar 2024 17:37:53 +0000 Received: by luna.linkmauve.fr (Postfix, from userid 1000) id EAE16FDAD17; Wed, 20 Mar 2024 18:37:44 +0100 (CET) From: Emmanuel Gil Peyrot To: linux-kernel@vger.kernel.org Cc: Emmanuel Gil Peyrot , Ezequiel Garcia , Philipp Zabel , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Joerg Roedel , Will Deacon , Robin Murphy , Sebastian Reichel , Cristian Ciocaltea , Dragan Simic , Shreeya Patel , Chris Morgan , Andy Yan , Nicolas Frattaroli , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev Subject: [PATCH 1/4] dt-bindings: iommu: rockchip: Fix rk3588 variant Date: Wed, 20 Mar 2024 18:37:30 +0100 Message-ID: <20240320173736.2720778-2-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240320173736.2720778-1-linkmauve@linkmauve.fr> References: <20240320173736.2720778-1-linkmauve@linkmauve.fr> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240320_103751_344937_578DF9DA X-CRM114-Status: GOOD ( 13.80 ) 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 The documentation got added in f8aa519976b38e67aae02d2db3e2998513305e80, but it hasn’t been added to the driver so it was unused. Signed-off-by: Emmanuel Gil Peyrot --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 2 +- drivers/iommu/rockchip-iommu.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 87b83c87bd55..2a23b4dc36e4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -704,7 +704,7 @@ vp3: port@3 { }; vop_mmu: iommu@fdd97e00 { - compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; + compatible = "rockchip,rk3588-iommu"; reg = <0x0 0xfdd97e00 0x0 0x100>, <0x0 0xfdd97f00 0x0 0x100>; interrupts = ; clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index da79d9f4cf63..da0e93c139d1 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -1361,6 +1361,9 @@ static const struct of_device_id rk_iommu_dt_ids[] = { { .compatible = "rockchip,rk3568-iommu", .data = &iommu_data_ops_v2, }, + { .compatible = "rockchip,rk3588-iommu", + .data = &iommu_data_ops_v2, + }, { /* sentinel */ } };