summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2010-02-15 11:40:25 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-02-16 13:38:56 +0900
commitd85429a31790361b9e952be3817134c23b3b758a (patch)
treeb5a5fa7e81345e92c518bf5ff3a81ae8d032df7d /drivers/sh
parent92e1f9a7ed613b36f3aaf8b04a79e2fd4fa37ec1 (diff)
downloadlinux-3.10-d85429a31790361b9e952be3817134c23b3b758a.tar.gz
linux-3.10-d85429a31790361b9e952be3817134c23b3b758a.tar.bz2
linux-3.10-d85429a31790361b9e952be3817134c23b3b758a.zip
sh: extend INTC with force_disable
Extend the shared INTC code with force_disable support to allow keeping mask bits statically disabled. Needed for SDHI support to mask out unsupported interrupt sources. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/intc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index 66594eb4477..1da1edef222 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -851,6 +851,9 @@ void __init register_intc_controller(struct intc_desc *desc)
d->chip.mask_ack = intc_mask_ack;
}
+ /* disable bits matching force_disable before registering irqs */
+ if (desc->force_disable)
+ intc_enable_disable_enum(desc, d, desc->force_disable, 0);
/* disable bits matching force_enable before registering irqs */
if (desc->force_enable)