Skip to contentSkip to conversation

ARM: dts: imx6qdl: Fix CODA960 interrupt order

PATCH New Philipp Zabel 3 participants 4 messages Nov 28, 2014 – Dec 8, 2014

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Philipp Zabel

author
#0 lore raw

PATCH 1/1 ARM: dts: imx6qdl: Fix CODA960 interrupt order

Commit a04a0b6fed4f ("ARM: dts: imx6qdl: Enable CODA960 VPU") lost the fix for the CODA960 interrupt order during a rebase before being applied. This patch adds the missing bit and brings the interrupts and interrupt-names properties back in sync.

Signed-off-by Philipp Zabel <[email protected]>
---
 arch/arm/boot/dts/imx6qdl.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl.dtsi +2 -2
index 4fc03b7..2109d07 100644
@@ -335,8 +335,8 @@
 			vpu: vpu at 02040000 {
 				compatible = "cnm,coda960";
 				reg = <0x02040000 0x3c000>;
-				interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>,
-				             <0 12 IRQ_TYPE_LEVEL_HIGH>;
+				interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>,
+					     <0 3 IRQ_TYPE_LEVEL_HIGH>;
 				interrupt-names = "bit", "jpeg";
 				clocks = <&clks IMX6QDL_CLK_VPU_AXI>,
 					 <&clks IMX6QDL_CLK_MMDC_CH0_AXI>,
Signature · 1 line
2.1.3
reviewer
#1 lore raw

PATCH 1/1 ARM: dts: imx6qdl: Fix CODA960 interrupt order

Quoted 6 lines · Philipp Zabel

Commit a04a0b6fed4f ("ARM: dts: imx6qdl: Enable CODA960 VPU") lost the fix for the CODA960 interrupt order during a rebase before being applied. This patch adds the missing bit and brings the interrupts and interrupt-names properties back in sync.

Signed-off-by Philipp Zabel <[email protected]>

Thanks, Philipp. This fixes the VPU timeout I was seeing:

Reviewed-by Fabio Estevam <[email protected]>
Applied
#2 lore raw

PATCH 1/1 ARM: dts: imx6qdl: Fix CODA960 interrupt order

In reply to Philipp Zabel
Quoted 6 lines · Philipp Zabel

Commit a04a0b6fed4f ("ARM: dts: imx6qdl: Enable CODA960 VPU") lost the fix for the CODA960 interrupt order during a rebase before being applied. This patch adds the missing bit and brings the interrupts and interrupt-names properties back in sync.

Signed-off-by Philipp Zabel <[email protected]>

Applied, thanks.

reviewer
#3 lore raw

PATCH 1/1 ARM: dts: imx6qdl: Fix CODA960 interrupt order

Hi Shawn,

Quoted 9 lines · Shawn Guo
Quoted 6 lines · Philipp Zabel

Commit a04a0b6fed4f ("ARM: dts: imx6qdl: Enable CODA960 VPU") lost the fix for the CODA960 interrupt order during a rebase before being applied. This patch adds the missing bit and brings the interrupts and interrupt-names properties back in sync.

Signed-off-by Philipp Zabel <[email protected]>

Applied, thanks.

Could you also apply it into for-next?