diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2015-05-26 18:43:36 +0200 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-11-13 14:02:37 +0800 |
| commit | feb77c9d11e0fb3aaf2472744b923e399a8889b7 (patch) | |
| tree | 0c283944c0ea35123df9ef014308c8646e6e4e32 /arch | |
| parent | 6934f243d9a2c324027f50ae008e35433c65cb1e (diff) | |
ARM: imx6: allow booting with old DT
The GPC rewrite to IRQ domains has been on the premise that it may break
suspend/resume for new kernels on old DT, but otherwise keep things working
from a user perspective. This was an accepted compromise to be able to move
the GIC cleanup forward.
What actually happened was that booting a new kernel on an old DT crashes
before even the console is up, so the user does not even see the warning
that the DT is too old. The warning message suggests that this has been
known before, which is clearly unacceptable.
Fix the early crash by mapping the GPC memory space if the IRQ controller
doesn't claim it. This keeps at least CPUidle and the needed CPU wakeup
workarounds working. With this fixed the system is able to boot up
properly minus the expected suspend/resume breakage.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
(cherry picked from commit 634a603760c26d163ff92751d91ac7b859e879c4)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/gpc.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index 4d60005e9277..bbf015056221 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -280,9 +280,15 @@ void __init imx_gpc_check_dt(void) struct device_node *np; np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpc"); - if (WARN_ON(!np || - !of_find_property(np, "interrupt-controller", NULL))) - pr_warn("Outdated DT detected, system is about to crash!!!\n"); + if (WARN_ON(!np)) + return; + + if (WARN_ON(!of_find_property(np, "interrupt-controller", NULL))) { + pr_warn("Outdated DT detected, suspend/resume will NOT work\n"); + + /* map GPC, so that at least CPUidle and WARs keep working */ + gpc_base = of_iomap(np, 0); + } } #ifdef CONFIG_PM_GENERIC_DOMAINS |