From bf76ab7ce050e8c86f354a14436bbdaa92966667 Mon Sep 17 00:00:00 2001 From: Dan Douglass Date: Wed, 1 Jul 2015 12:36:22 -0500 Subject: MLK-11171 ARM: dts: Add option for CAAM to prevent megamix domain to power down. Add CAAM jr irqs to the gpc mf-mix-wakeup-irq mask to allow the Job Rings to register as wakeup devices. Fixed both 6UL and 7D configurations to cover all available Job Rings. Signed-off-by: Dan Douglass --- arch/arm/boot/dts/imx6ul.dtsi | 2 +- arch/arm/boot/dts/imx7d.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index 57ca0704e56e..c9d51aed8682 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -710,7 +710,7 @@ compatible = "fsl,imx6ul-gpc", "fsl,imx6q-gpc"; reg = <0x020dc000 0x4000>; interrupts = ; - fsl,mf-mix-wakeup-irq = <0x7c00000 0x3d00 0x0 0x1400240>; + fsl,mf-mix-wakeup-irq = <0x7c00000 0x7d00 0x0 0x1400640>; }; iomuxc: iomuxc@020e0000 { diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi index e8b9cd7b2063..5043cdd5adac 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7d.dtsi @@ -665,7 +665,7 @@ compatible = "fsl,imx7d-gpc"; reg = <0x303a0000 0x10000>; interrupts = ; - fsl,mf-mix-wakeup-irq = <0x54010000 0xc00 0x0 0x1000040>; + fsl,mf-mix-wakeup-irq = <0x54010000 0xc00 0x0 0x1040640>; #power-domain-cells = <1>; pcie-phy-supply = <®_1p0d>; mipi-phy-supply = <®_1p0d>; -- cgit v1.2.3