arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
Subsystems (2)
PATCH 1/1 arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
Commit a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes") intended to remove the interrupt-names property for mmu nodes, but it also removed it for the vpu node in rk3399.dtsi. That makes the driver fail probing currently.
Fix this by re-adding the property for this node.
--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -0
@@ -1240,6 +1240,7 @@ vpu: video-codec@ff650000 { reg = <0x0 0xff650000 0x0 0x800>; interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>, <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH 0>; + interrupt-names = "vepu", "vdpu"; clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; clock-names = "aclk", "hclk"; iommus = <&vpu_mmu>;
base-commit: 5936c9eb785b46fdc5563d1c5c34b5558e3fa156
Signature · 1 line
2.30.2
Hi Alex, Heiko,
Quoted 8 lines · Alex Bee
Commit
a728c10dd62a("arm64: dts: rockchip: remove interrupt-names from iommu nodes") intended to remove the interrupt-names property for mmu nodes, but it also removed it for the vpu node inrk3399.dtsi. That makes the driver fail probing currently.
Fix this by re-adding the property for this node.Fixes a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
AFAICS a728c10dd62a removed lots of interrupt-names properties from devices other than IOMMU.
Maybe it's best to revert it?
Thanks,
Ezequiel
Heiko Stuebner
maintainerHi,
Am Sonntag, 22. August 2021, 16:37:24 CEST schrieb Ezequiel Garcia:
Quoted 10 lines
Hi Alex, Heiko,
Quoted 7 lines · Alex Bee
Commit
a728c10dd62a("arm64: dts: rockchip: remove interrupt-names from iommu nodes") intended to remove the interrupt-names property for mmu nodes, but it also removed it for the vpu node inrk3399.dtsi. That makes the driver fail probing currently.
Fix this by re-adding the property for this node.
Quoted 6 lines
Quoted 1 line
Fixes a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")AFAICS
a728c10dd62aremoved lots of interrupt-names properties from devices other than IOMMU.Maybe it's best to revert it?
where did you see more mistakes in it?
I.e. first of all, at least when grepping through my kernel history, I only see
commit 53a05c8f6e8e ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
with a different hash and at least there I see a lot of iommu interrupt removals and this one line removing the vpu irqs in error.
So from my glance at it, applying Alex' patch should solve the issue?
Heiko
Hi Heiko, Hi Ezequiel,
Am 22.08.21 um 22:25 schrieb Heiko Stuebner:
Quoted 12 lines
Hi,
Am Sonntag, 22. August 2021, 16:37:24 CEST schrieb Ezequiel Garcia:
Quoted 9 lines
Hi Alex, Heiko,
Quoted 6 lines · Alex Bee
Commit
a728c10dd62a("arm64: dts: rockchip: remove interrupt-names from iommu nodes") intended to remove the interrupt-names property for mmu nodes, but it also removed it for the vpu node inrk3399.dtsi. That makes the driver fail probing currently.
Fix this by re-adding the property for this node.
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
Fixes a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")AFAICS
a728c10dd62aremoved lots of interrupt-names properties from devices other than IOMMU.Maybe it's best to revert it?
where did you see more mistakes in it?
Yes, all the other removals in that commit are for iommu nodes.
Quoted 3 lines
I.e. first of all, at least when grepping through my kernel history, I only see
commit53a05c8f6e8e("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
Oops, yes: I took the commit id of my local tree: could you please fix the commit message with the correct id, before applying?
Thanks,
Alex
Quoted 8 lines
with a different hash and at least there I see a lot of iommu interrupt removals and this one line removing the vpu irqs in error.
So from my glance at it, applying Alex' patch should solve the issue?
Heiko
Quoted 21 lines · Heiko Stuebner
Hi,
Am Sonntag, 22. August 2021, 16:37:24 CEST schrieb Ezequiel Garcia:
Quoted 10 lines
Hi Alex, Heiko,
Quoted 7 lines · Alex Bee
Commit
a728c10dd62a("arm64: dts: rockchip: remove interrupt-names from iommu nodes") intended to remove the interrupt-names property for mmu nodes, but it also removed it for the vpu node inrk3399.dtsi. That makes the driver fail probing currently.
Fix this by re-adding the property for this node.Quoted 6 lines
Quoted 1 line
Fixes a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")AFAICS
a728c10dd62aremoved lots of interrupt-names properties from devices other than IOMMU.Maybe it's best to revert it?
Quoted 9 lines
where did you see more mistakes in it?
I.e. first of all, at least when grepping through my kernel history, I only see
commit53a05c8f6e8e("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
with a different hash and at least there I see a lot of iommu interrupt removals and this one line removing the vpu irqs in error.So from my glance at it, applying Alex' patch should solve the issue?
Ah, seems you are right. Sorry for the noise!
Thanks,
Ezequiel
Quoted 5 lines · Alex Bee
Commit
a728c10dd62a("arm64: dts: rockchip: remove interrupt-names from iommu nodes") intended to remove the interrupt-names property for mmu nodes, but it also removed it for the vpu node inrk3399.dtsi. That makes the driver fail probing currently.
Fix this by re-adding the property for this node.
Applied, thanks!
[1/1] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
commit: 6b9b7968ff78d5b9a079da2f8decba873af54192
Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>