diff options
author | Troy Kisky <troy.kisky@boundarydevices.com> | 2013-12-20 13:47:10 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-05-16 04:19:13 -0400 |
commit | 1f8ccdc824b89cd3a090d70c73bdcf95d45a6c9c (patch) | |
tree | 430a7ba73d06bc7f5e7e7d19228fd7d360199e00 /arch/arm/boot/dts/imx6qdl.dtsi | |
parent | b051efe781a74919e440fb021a0206a1dc5fe638 (diff) |
ENGR00313685-13 ARM: dts: imx6qdl: use interrupts-extended for fec
commit 454cf8f54d9918c8017f2eee7fb0138927ef2afd upstream.
We need to be able to override interrupts in board file to
workaround a hardware bug for ethernet interrupts
waking the processor by using interrupts-extended.
So, use interrupts-extended here as well.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Conflicts:
arch/arm/boot/dts/imx6qdl.dtsi
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index d8a008669e17..2f33815f3182 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi | |||
@@ -818,7 +818,8 @@ | |||
818 | fec: ethernet@02188000 { | 818 | fec: ethernet@02188000 { |
819 | compatible = "fsl,imx6q-fec"; | 819 | compatible = "fsl,imx6q-fec"; |
820 | reg = <0x02188000 0x4000>; | 820 | reg = <0x02188000 0x4000>; |
821 | interrupts = <0 118 0x04 0 119 0x04>; | 821 | interrupts-extended = <&intc 0 118 0x04>, |
822 | <&intc 0 119 0x04>; | ||
822 | clocks = <&clks 117>, <&clks 117>, <&clks 190>; | 823 | clocks = <&clks 117>, <&clks 117>, <&clks 190>; |
823 | clock-names = "ipg", "ahb", "ptp"; | 824 | clock-names = "ipg", "ahb", "ptp"; |
824 | status = "disabled"; | 825 | status = "disabled"; |