Skip to contentSkip to conversation

arm: dts: rockchip: fix errors in IOMMU interrupts property cells

PATCH New Rob Herring 2 participants 2 messages Nov 9, 2017 – Dec 4, 2017

Subsystems (2)
Device tree bindings Arm Rockchip
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 arm: dts: rockchip: fix errors in IOMMU interrupts property cells

The interrupts property in the IOMMU node for Rockchip dts file has a spurious extra cell causing a dtc warning:

Warning (interrupts_property): interrupts size is (16), expected multiple of 12 in /iommu at ff900800

Remove the extra cell.

Cc Heiko Stuebner <[email protected]>
Cc linux-rockchip at lists.infradead.org
Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/boot/dts/rk3288.dtsi            | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +1 -1
index 356ed1e62452..cd43235ca16f 100644
@@ -956,7 +956,7 @@
 	iep_mmu: iommu at ff900800 {
 		compatible = "rockchip,iommu";
 		reg = <0x0 0xff900800 0x0 0x40>;
-		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH 0>;
+		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "iep_mmu";
 		#iommu-cells = <0>;
 		status = "disabled";
arch/arm64/boot/dts/rockchip/rk3368.dtsi +1 -1
index e0518b4bc6c2..7a63279a85c5 100644
@@ -808,7 +808,7 @@
 	iep_mmu: iommu at ff900800 {
 		compatible = "rockchip,iommu";
 		reg = <0x0 0xff900800 0x0 0x100>;
-		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH 0>;
+		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "iep_mmu";
 		#iommu-cells = <0>;
 		status = "disabled";
Signature · 1 line
2.14.1
maintainer
#1 lore raw

PATCH 1/1 arm: dts: rockchip: fix errors in IOMMU interrupts property cells

Am Donnerstag, 9. November 2017, 16:35:35 CET schrieb Rob Herring:

Quoted 5 lines

The interrupts property in the IOMMU node for Rockchip dts file has a spurious extra cell causing a dtc warning:

Warning (interrupts_property): interrupts size is (16), expected multiple of 12 in /iommu at ff900800

Quoted 8 lines

Remove the extra cell.

Cc Heiko Stuebner <[email protected]>
Cc linux-rockchip at lists.infradead.org
Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/boot/dts/rk3288.dtsi            | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +-

Arnd fixed the rk3368 variant in a patch already, so I've dropped that and applied the rk3288 fix as fix for 4.15.

Thanks
Heiko