xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 6b023929666f0be5df75f5e0278d1b70effadf42 ]

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

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Link: https://lore.kernel.org/r/20210507090232.233049-4-benjamin.gaignard@collabora.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Benjamin Gaignard
2021-05-07 11:02:29 +02:00
committed by Greg Kroah-Hartman
parent 55014c38e7
commit fc01549d7b
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/boot/dts/rk322x.dtsi
View File

@@ -565,10 +565,9 @@
compatible = "rockchip,iommu"; compatible = "rockchip,iommu";
reg = <0x20020800 0x100>; reg = <0x20020800 0x100>;
interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "vpu_mmu";
clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
clock-names = "aclk", "iface"; clock-names = "aclk", "iface";
iommu-cells = <0>; #iommu-cells = <0>;
status = "disabled"; status = "disabled";
}; };
@@ -576,10 +575,9 @@
compatible = "rockchip,iommu"; compatible = "rockchip,iommu";
reg = <0x20030480 0x40>, <0x200304c0 0x40>; reg = <0x20030480 0x40>, <0x200304c0 0x40>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "vdec_mmu";
clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>; clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;
clock-names = "aclk", "iface"; clock-names = "aclk", "iface";
iommu-cells = <0>; #iommu-cells = <0>;
status = "disabled"; status = "disabled";
}; };
@@ -609,7 +607,6 @@
compatible = "rockchip,iommu"; compatible = "rockchip,iommu";
reg = <0x20053f00 0x100>; reg = <0x20053f00 0x100>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "vop_mmu";
clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>;
clock-names = "aclk", "iface"; clock-names = "aclk", "iface";
#iommu-cells = <0>; #iommu-cells = <0>;
@@ -630,10 +627,9 @@
compatible = "rockchip,iommu"; compatible = "rockchip,iommu";
reg = <0x20070800 0x100>; reg = <0x20070800 0x100>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "iep_mmu";
clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>; clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
clock-names = "aclk", "iface"; clock-names = "aclk", "iface";
iommu-cells = <0>; #iommu-cells = <0>;
status = "disabled"; status = "disabled";
}; };