Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b4c3472 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Greg Kroah-Hartman
Browse files

ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x 



[ Upstream commit 6b023929666f0be5df75f5e0278d1b70effadf42 ]

Add '#" to iommu-cells properties.
Remove useless interrupt-names properties

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Link: https://lore.kernel.org/r/20210507090232.233049-4-benjamin.gaignard@collabora.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c9d29d62

arch/arm/boot/dts/rk322x.dtsi

+3 −7
Original line number Diff line number Diff line
@@ -570,10 +570,9 @@ 
		compatible = "rockchip,iommu";

		reg = <0x20020800 0x100>;

		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vpu_mmu";

		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;

		clock-names = "aclk", "iface";

		iommu-cells = <0>;

		#iommu-cells = <0>;

		status = "disabled";

	};
@@ -581,10 +580,9 @@ 
		compatible = "rockchip,iommu";

		reg = <0x20030480 0x40>, <0x200304c0 0x40>;

		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vdec_mmu";

		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;

		clock-names = "aclk", "iface";

		iommu-cells = <0>;

		#iommu-cells = <0>;

		status = "disabled";

	};
@@ -614,7 +612,6 @@ 
		compatible = "rockchip,iommu";

		reg = <0x20053f00 0x100>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vop_mmu";

		clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>;

		clock-names = "aclk", "iface";

		#iommu-cells = <0>;
@@ -625,10 +622,9 @@ 
		compatible = "rockchip,iommu";

		reg = <0x20070800 0x100>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "iep_mmu";

		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;

		clock-names = "aclk", "iface";

		iommu-cells = <0>;

		#iommu-cells = <0>;

		status = "disabled";

	};