diff options
| author | ye li <ye.li@nxp.com> | 2016-09-13 21:00:47 +0800 |
|---|---|---|
| committer | ye li <ye.li@nxp.com> | 2016-09-14 16:40:40 +0800 |
| commit | 4fdf83e38d6503f247002d94d6f618c18960181c (patch) | |
| tree | 974d8532ca0e92f772dcfb4bc781032a9a8cd46a /arch/arm/boot/dts/imx6sx.dtsi | |
| parent | e72085bec97eadc8ea30b81703c1aa69c3ca9357 (diff) | |
MLK-12990 arm: dts: Fix CAAM JR interrupt parent issue on i.MX6SX
To enable a IRQ as a wakeup source, we should set its interrupt parent to
gpc not the intc. Fix the wrong CAAM JR interrupts setting by removing the
its interrupt parent to use default SOC's interrupt parent "gpc". Otherwise,
irq_set_irq_wake will return error.
Signed-off-by: ye li <ye.li@nxp.com>
(cherry picked from commit 40becc1c6f71f42f86787bf1fe36da05c195e6d9)
Diffstat (limited to 'arch/arm/boot/dts/imx6sx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index d15faef32fa4..dcce9800d7bd 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -926,7 +926,6 @@ #size-cells = <1>; reg = <0x2100000 0x40000>; ranges = <0 0x2100000 0x40000>; - interrupt-parent = <&intc>; /* interrupts = <0 92 0x4>; */ clocks = <&clks IMX6SX_CLK_CAAM_MEM>, <&clks IMX6SX_CLK_CAAM_ACLK>, <&clks IMX6SX_CLK_CAAM_IPG> ,<&clks IMX6SX_CLK_EIM_SLOW>; clock-names = "caam_mem", "caam_aclk", "caam_ipg", "caam_emi_slow"; @@ -934,15 +933,13 @@ sec_jr0: jr0@1000 { compatible = "fsl,sec-v4.0-job-ring"; reg = <0x1000 0x1000>; - interrupt-parent = <&intc>; - interrupts = <0 105 0x4>; + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; }; sec_jr1: jr1@2000 { compatible = "fsl,sec-v4.0-job-ring"; reg = <0x2000 0x1000>; - interrupt-parent = <&intc>; - interrupts = <0 106 0x4>; + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; }; }; |