diff options
| author | Dan Douglass <dan.douglass@freescale.com> | 2015-07-01 12:36:22 -0500 |
|---|---|---|
| committer | Dan Douglass <dan.douglass@freescale.com> | 2015-07-01 12:36:22 -0500 |
| commit | a6e4889c9b665de82aea1593285d5dece5e40941 (patch) | |
| tree | 113d9b52f02f6035d631cc4dcf19b7b789057851 /arch | |
| parent | 0272868641041c5a9eb1b3476660711bb5cd69e4 (diff) | |
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 <dan.douglass@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6ul.dtsi | 2 | ||||
| -rw-r--r-- | 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 = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; - 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 436cbb67ca57..73c104c06082 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 = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>; - 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>; |