forked from Minki/linux
4227961650
- It's based on imx-cleanup-3.9 to avoid conflicts. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJRCRzjAAoJEFBXWFqHsHzOOTYH/2YiAhCXDoovJ++leTTBKoFO kRx2gvV0oxQYAjvRX4IiiwcuWjbCQI8ugiKxeH9Vn+jwHD8jKqzTINEUVQfKUud6 s8AI1/EqKwKnEFYFs/Fg6WxZHuHpoL/clpRB/5wZw1KoChmte2OnVU7d9vOt67iN l0P4nPR18iwU5LFoDCnqMX50Dp9C56KEF2JhzBCQKW9TtRclwpcBNy6AsHb/TNOe /nHN+Ku6/3xQEz2MPQ9QdmgFxnp9Pr8R6leJNg1Vg6UGRYrKxy0zVo+oFEXAZuUw v6gnhdlvO6Ki/IKHcWkw7Q7pUDTuB6SttirQE9mBlPdc0V3kTU82SVtX9WAQhSs= =rVol -----END PGP SIGNATURE----- Merge tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc From Shawn Guo: imx6q cpuidle support for 3.9 - It's based on imx-cleanup-3.9 to avoid conflicts. * tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: imx6q: support WAIT mode using cpuidle ARM: imx: move imx6q_cpuidle_driver into a separate file ARM: imx: mask gpc interrupts initially ARM: imx: return zero in case next event gets a large increment ARM: imx: Remove mx508 support ARM: imx: Remove mach-mx51_3ds board ARM: imx: use debug_ll_io_init() for imx6q ARM: imx: remove unused imx6q_clock_map_io() ARM: mach-imx: Kconfig: Do not select Babbage for MACH_IMX51_DT Signed-off-by: Olof Johansson <olof@lixom.net> Still, two delete/change conflicts caused by imx/cleanup: arch/arm/mach-imx/mach-mx50_rdp.c arch/arm/mach-imx/mach-mx51_3ds.c
119 lines
2.7 KiB
C
119 lines
2.7 KiB
C
/*
|
|
* Copyright 2011 Freescale Semiconductor, Inc.
|
|
* Copyright 2011 Linaro Ltd.
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/irqchip/arm-gic.h>
|
|
|
|
#define GPC_IMR1 0x008
|
|
#define GPC_PGC_CPU_PDN 0x2a0
|
|
|
|
#define IMR_NUM 4
|
|
|
|
static void __iomem *gpc_base;
|
|
static u32 gpc_wake_irqs[IMR_NUM];
|
|
static u32 gpc_saved_imrs[IMR_NUM];
|
|
|
|
void imx_gpc_pre_suspend(void)
|
|
{
|
|
void __iomem *reg_imr1 = gpc_base + GPC_IMR1;
|
|
int i;
|
|
|
|
/* Tell GPC to power off ARM core when suspend */
|
|
writel_relaxed(0x1, gpc_base + GPC_PGC_CPU_PDN);
|
|
|
|
for (i = 0; i < IMR_NUM; i++) {
|
|
gpc_saved_imrs[i] = readl_relaxed(reg_imr1 + i * 4);
|
|
writel_relaxed(~gpc_wake_irqs[i], reg_imr1 + i * 4);
|
|
}
|
|
}
|
|
|
|
void imx_gpc_post_resume(void)
|
|
{
|
|
void __iomem *reg_imr1 = gpc_base + GPC_IMR1;
|
|
int i;
|
|
|
|
/* Keep ARM core powered on for other low-power modes */
|
|
writel_relaxed(0x0, gpc_base + GPC_PGC_CPU_PDN);
|
|
|
|
for (i = 0; i < IMR_NUM; i++)
|
|
writel_relaxed(gpc_saved_imrs[i], reg_imr1 + i * 4);
|
|
}
|
|
|
|
static int imx_gpc_irq_set_wake(struct irq_data *d, unsigned int on)
|
|
{
|
|
unsigned int idx = d->irq / 32 - 1;
|
|
u32 mask;
|
|
|
|
/* Sanity check for SPI irq */
|
|
if (d->irq < 32)
|
|
return -EINVAL;
|
|
|
|
mask = 1 << d->irq % 32;
|
|
gpc_wake_irqs[idx] = on ? gpc_wake_irqs[idx] | mask :
|
|
gpc_wake_irqs[idx] & ~mask;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void imx_gpc_irq_unmask(struct irq_data *d)
|
|
{
|
|
void __iomem *reg;
|
|
u32 val;
|
|
|
|
/* Sanity check for SPI irq */
|
|
if (d->irq < 32)
|
|
return;
|
|
|
|
reg = gpc_base + GPC_IMR1 + (d->irq / 32 - 1) * 4;
|
|
val = readl_relaxed(reg);
|
|
val &= ~(1 << d->irq % 32);
|
|
writel_relaxed(val, reg);
|
|
}
|
|
|
|
static void imx_gpc_irq_mask(struct irq_data *d)
|
|
{
|
|
void __iomem *reg;
|
|
u32 val;
|
|
|
|
/* Sanity check for SPI irq */
|
|
if (d->irq < 32)
|
|
return;
|
|
|
|
reg = gpc_base + GPC_IMR1 + (d->irq / 32 - 1) * 4;
|
|
val = readl_relaxed(reg);
|
|
val |= 1 << (d->irq % 32);
|
|
writel_relaxed(val, reg);
|
|
}
|
|
|
|
void __init imx_gpc_init(void)
|
|
{
|
|
struct device_node *np;
|
|
int i;
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpc");
|
|
gpc_base = of_iomap(np, 0);
|
|
WARN_ON(!gpc_base);
|
|
|
|
/* Initially mask all interrupts */
|
|
for (i = 0; i < IMR_NUM; i++)
|
|
writel_relaxed(~0, gpc_base + GPC_IMR1 + i * 4);
|
|
|
|
/* Register GPC as the secondary interrupt controller behind GIC */
|
|
gic_arch_extn.irq_mask = imx_gpc_irq_mask;
|
|
gic_arch_extn.irq_unmask = imx_gpc_irq_unmask;
|
|
gic_arch_extn.irq_set_wake = imx_gpc_irq_set_wake;
|
|
}
|