diff options
| author | Bai Ping <b51503@freescale.com> | 2015-08-20 21:50:07 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:21:59 +0800 |
| commit | b58a05283f3c476f687720e866ecbe567b71854a (patch) | |
| tree | c6eadd7ba00819c85057ed0b14cff04d4b65c8c1 /arch/arm/mach-imx/gpc.c | |
| parent | 3be02cbb9e098d12cb17fb8e9a1cf9456bff42f9 (diff) | |
MLK-11389-03 ARM: imx: enable M/F mix support on imx6sx
Enable the M/F funtion support on i.MX6SX. The M4 M/F off
support is not added at present, will be enabled after the M4
funtion is ready.
Signed-off-by: Bai Ping <b51503@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/gpc.c')
| -rw-r--r-- | arch/arm/mach-imx/gpc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index d5f11c477ac6..6c705105afcc 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -79,7 +79,7 @@ void imx_gpc_pre_suspend(bool arm_power_off) int i; /* power down the mega-fast power domain */ - if (cpu_is_imx6ul() && arm_power_off) + if ((cpu_is_imx6sx() || cpu_is_imx6ul()) && arm_power_off) imx_gpc_mf_mix_off(); /* Tell GPC to power off ARM core when suspend */ @@ -100,7 +100,7 @@ void imx_gpc_post_resume(void) /* Keep ARM core powered on for other low-power modes */ imx_gpc_set_arm_power_in_lpm(false); /* Keep M/F mix powered on for other low-power modes */ - if (cpu_is_imx6ul()) + if (cpu_is_imx6sx() || cpu_is_imx6ul()) writel_relaxed(0x0, gpc_base + GPC_PGC_MF_PDN); for (i = 0; i < IMR_NUM; i++) @@ -280,7 +280,7 @@ static int __init imx_gpc_init(struct device_node *node, writel_relaxed(~0, gpc_base + GPC_IMR1 + i * 4); /* Read supported wakeup source in M/F domain */ - if (cpu_is_imx6ul()) { + if (cpu_is_imx6sx() || cpu_is_imx6ul()) { of_property_read_u32_index(node, "fsl,mf-mix-wakeup-irq", 0, &gpc_mf_irqs[0]); of_property_read_u32_index(node, "fsl,mf-mix-wakeup-irq", 1, |