[PATCH 2/2] powerpc: make MPIC honor the 'no-reset' device tree property
DORMANTno replies
From: Meador Inge <hidden>
Date: 2011-01-18 00:54:01
Also in:
linux-devicetree
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
This property, defined in the MPIC binding, tells the kernel not to use the reset bit in the global configuration register. Signed-off-by: Meador Inge <redacted> CC: Hollis Blanchard <redacted> --- arch/powerpc/sysdev/mpic.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 30c44e6..44aa2c3 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c@@ -1157,7 +1157,9 @@ struct mpic * __init mpic_alloc(struct device_node *node, mpic_map(mpic, node, paddr, &mpic->tmregs, MPIC_INFO(TIMER_BASE), 0x1000); /* Reset */ - if (flags & MPIC_WANTS_RESET) { + if ((flags & MPIC_WANTS_RESET) && + !of_find_property(node, "no-reset", NULL)) { + printk(KERN_DEBUG "mpic: Resetting\n"); mpic_write(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0), mpic_read(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0)) | MPIC_GREG_GCONF_RESET); -- 1.6.3.3