arm64: dts: rockchip: fix typo in iommu nodes

Message ID 20171010085648.1339605-1-arnd@arndb.de
State New
Headers show
Series
  • arm64: dts: rockchip: fix typo in iommu nodes
Related show

Commit Message

Arnd Bergmann Oct. 10, 2017, 8:56 a.m.
The latest dtc warns about an extraneous cell in the interrupt
property of two of the iommu device nodes:

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

This removes the typo.

Fixes: cede4c79de28 ("arm64: dts: rockchip: add rk3368 iommu nodes")
Fixes: 49c82f2b7c5d ("arm64: dts: rockchip: add rk3328 iommu nodes")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.9.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Heiko Stuebner Oct. 10, 2017, 9:48 a.m. | #1
Hi Arnd,

Am Dienstag, 10. Oktober 2017, 10:56:01 CEST schrieb Arnd Bergmann:
> The latest dtc warns about an extraneous cell in the interrupt

> property of two of the iommu device nodes:

> 

> Warning (interrupts_property): interrupts size is (16), expected multiple of

> 12 in /iommu@ff373f00 Warning (interrupts_property): interrupts size is

> (16), expected multiple of 12 in /iommu@ff900800

> 

> This removes the typo.

> 

> Fixes: cede4c79de28 ("arm64: dts: rockchip: add rk3368 iommu nodes")

> Fixes: 49c82f2b7c5d ("arm64: dts: rockchip: add rk3328 iommu nodes")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


looks like that got copy-pasted from rk3399 where we have 4 elements per irq.
In any case the change looks good, so if you want to apply it directly to 
armsoc-fixes here is a

Acked-by: Heiko Stuebner <heiko@sntech.de>


Depending on how you want to handle it I can also merge it, but
Olof already picked up my 2 fixes for 4.14, so you applying it might
save us the round-trip for a further 1-patch pull request :-)


Heiko

> ---

>  arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-

>  arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +-

>  2 files changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi

> b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index 6d615cb6e64d..41d61840fb99

> 100644

> --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi

> +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi

> @@ -582,7 +582,7 @@

>  	vop_mmu: iommu@ff373f00 {

>  		compatible = "rockchip,iommu";

>  		reg = <0x0 0xff373f00 0x0 0x100>;

> -		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>;

> +		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

>  		interrupt-names = "vop_mmu";

>  		#iommu-cells = <0>;

>  		status = "disabled";

> diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi

> b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index 19fbaa5e7bdd..1070c8264c13

> 100644

> --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi

> +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi

> @@ -740,7 +740,7 @@

>  	iep_mmu: iommu@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";



--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Heiko Stuebner Oct. 17, 2017, 5:52 p.m. | #2
Am Dienstag, 10. Oktober 2017, 11:48:25 CEST schrieb Heiko Stübner:
> Hi Arnd,

> 

> Am Dienstag, 10. Oktober 2017, 10:56:01 CEST schrieb Arnd Bergmann:

> > The latest dtc warns about an extraneous cell in the interrupt

> > property of two of the iommu device nodes:

> > 

> > Warning (interrupts_property): interrupts size is (16), expected multiple of

> > 12 in /iommu@ff373f00 Warning (interrupts_property): interrupts size is

> > (16), expected multiple of 12 in /iommu@ff900800

> > 

> > This removes the typo.

> > 

> > Fixes: cede4c79de28 ("arm64: dts: rockchip: add rk3368 iommu nodes")

> > Fixes: 49c82f2b7c5d ("arm64: dts: rockchip: add rk3328 iommu nodes")

> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> 

> looks like that got copy-pasted from rk3399 where we have 4 elements per irq.

> In any case the change looks good, so if you want to apply it directly to 

> armsoc-fixes here is a

> 

> Acked-by: Heiko Stuebner <heiko@sntech.de>

> 

> Depending on how you want to handle it I can also merge it, but

> Olof already picked up my 2 fixes for 4.14, so you applying it might

> save us the round-trip for a further 1-patch pull request :-)


as another (somewhat urgent) fix for 64bit dts has come up, I've now also
picked this change up for the following pull request.


Heiko
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 6d615cb6e64d..41d61840fb99 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -582,7 +582,7 @@ 
 	vop_mmu: iommu@ff373f00 {
 		compatible = "rockchip,iommu";
 		reg = <0x0 0xff373f00 0x0 0x100>;
-		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>;
+		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "vop_mmu";
 		#iommu-cells = <0>;
 		status = "disabled";
diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index 19fbaa5e7bdd..1070c8264c13 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -740,7 +740,7 @@ 
 	iep_mmu: iommu@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";