diff options
| author | Anson Huang <b20788@freescale.com> | 2015-03-26 10:46:51 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2015-05-08 16:33:36 +0800 |
| commit | 99c7319cea43d19dd4bb2e0e39ac752c7bea420c (patch) | |
| tree | 25008346efa213c13bc8b09ff276b73ec170c8c0 /arch/arm/mach-imx/gpc.c | |
| parent | a80eb188329aac91e835802f4dcd07061b7235f1 (diff) | |
MLK-10510-1 ARM: imx: include GPCv2 for API to let mega/fast mix always on
Some drivers have special requirement that Mega/Fast MIX can NOT be off in DSM
and it can NOT be done by wakeup irq enabled, there is already an API to achieve
this which is only for GPCv1, this patch enhance the API to cover GPCv2.
Acked-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Anson Huang <b20788@freescale.com>
Signed-off-by: Li Jun <jun.li@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/gpc.c')
| -rw-r--r-- | arch/arm/mach-imx/gpc.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index 7f5b8a5f306f..03731b7a90f3 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -291,7 +291,7 @@ static int imx_pcie_regulator_notify(struct notifier_block *nb, return NOTIFY_OK; } -int imx_gpc_mf_request_on(unsigned int irq, unsigned int on) +int imx_gpc_mf_power_on(unsigned int irq, unsigned int on) { unsigned int idx = irq / 32 - 1; unsigned long flags; @@ -305,6 +305,16 @@ int imx_gpc_mf_request_on(unsigned int irq, unsigned int on) return 0; } + +int imx_gpc_mf_request_on(unsigned int irq, unsigned int on) +{ + if (cpu_is_imx6sx()) + return imx_gpc_mf_power_on(irq, on); + else if (cpu_is_imx7d()) + return imx_gpcv2_mf_power_on(irq, on); + else + return 0; +} EXPORT_SYMBOL_GPL(imx_gpc_mf_request_on); void __init imx_gpc_init(void) |