* [PATCH] ARM: dts: imx6qdl: Fix CODA960 interrupt order
@ 2014-11-28 15:23 Philipp Zabel
2014-11-28 15:52 ` Fabio Estevam
2014-12-02 14:20 ` Shawn Guo
0 siblings, 2 replies; 4+ messages in thread
From: Philipp Zabel @ 2014-11-28 15:23 UTC (permalink / raw)
To: linux-arm-kernel
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 <p.zabel@pengutronix.de>
---
arch/arm/boot/dts/imx6qdl.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 4fc03b7..2109d07 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -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>,
--
2.1.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: imx6qdl: Fix CODA960 interrupt order
2014-11-28 15:23 [PATCH] ARM: dts: imx6qdl: Fix CODA960 interrupt order Philipp Zabel
@ 2014-11-28 15:52 ` Fabio Estevam
2014-12-02 14:20 ` Shawn Guo
1 sibling, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2014-11-28 15:52 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Nov 28, 2014 at 1:23 PM, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> 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 <p.zabel@pengutronix.de>
Thanks, Philipp. This fixes the VPU timeout I was seeing:
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: imx6qdl: Fix CODA960 interrupt order
2014-11-28 15:23 [PATCH] ARM: dts: imx6qdl: Fix CODA960 interrupt order Philipp Zabel
2014-11-28 15:52 ` Fabio Estevam
@ 2014-12-02 14:20 ` Shawn Guo
2014-12-08 15:13 ` Fabio Estevam
1 sibling, 1 reply; 4+ messages in thread
From: Shawn Guo @ 2014-12-02 14:20 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Nov 28, 2014 at 04:23:46PM +0100, Philipp Zabel wrote:
> 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 <p.zabel@pengutronix.de>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: imx6qdl: Fix CODA960 interrupt order
2014-12-02 14:20 ` Shawn Guo
@ 2014-12-08 15:13 ` Fabio Estevam
0 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2014-12-08 15:13 UTC (permalink / raw)
To: linux-arm-kernel
Hi Shawn,
On Tue, Dec 2, 2014 at 12:20 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Fri, Nov 28, 2014 at 04:23:46PM +0100, Philipp Zabel wrote:
>> 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 <p.zabel@pengutronix.de>
>
> Applied, thanks.
Could you also apply it into for-next?
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-08 15:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-28 15:23 [PATCH] ARM: dts: imx6qdl: Fix CODA960 interrupt order Philipp Zabel
2014-11-28 15:52 ` Fabio Estevam
2014-12-02 14:20 ` Shawn Guo
2014-12-08 15:13 ` Fabio Estevam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).