aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorChristoffer Dall2017-11-06 16:49:26 +0100
committerChristoffer Dall2017-11-06 16:49:26 +0100
commit80f77e54f18c6a16c54797fd4b3d3b454d6f560c (patch)
treedc58df7e472da7d4240226a5c98c68ccf3a73dce /arch/arm
parenta2b83133339067c1b27f902e32506ab2871e2320 (diff)
parent722c908f84c67bf120105ca870675cadc1bb7b20 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/arch_gicv3.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_gicv3.h
index eee269321923..1070044f5c3f 100644
--- a/arch/arm/include/asm/arch_gicv3.h
+++ b/arch/arm/include/asm/arch_gicv3.h
@@ -196,6 +196,11 @@ static inline void gic_write_ctlr(u32 val)
isb();
}
+static inline u32 gic_read_ctlr(void)
+{
+ return read_sysreg(ICC_CTLR);
+}
+
static inline void gic_write_grpen1(u32 val)
{
write_sysreg(val, ICC_IGRPEN1);