From 495407aabc63ddd0431663d2f5df38b2a18a9593 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Thu, 19 Mar 2020 14:33:38 +0900 Subject: [PATCH] interrupt_controller: gic: Fix GICD_ICFGR field definition names This commit fixes the field definition names for `GICD_ICFGR`, which were incorrectly prefixed with `GICC_`. Signed-off-by: Stephanos Ioannidis --- drivers/interrupt_controller/intc_gic.c | 4 ++-- include/drivers/interrupt_controller/gic.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/interrupt_controller/intc_gic.c b/drivers/interrupt_controller/intc_gic.c index 241531acd24..43cc59d49de 100644 --- a/drivers/interrupt_controller/intc_gic.c +++ b/drivers/interrupt_controller/intc_gic.c @@ -66,9 +66,9 @@ void arm_gic_irq_set_priority( int_off = (irq % 16) * 2; val = sys_read8(GICD_ICFGRn + int_grp); - val &= ~(GICC_ICFGR_MASK << int_off); + val &= ~(GICD_ICFGR_MASK << int_off); if (flags & IRQ_TYPE_EDGE) { - val |= (GICC_ICFGR_TYPE << int_off); + val |= (GICD_ICFGR_TYPE << int_off); } sys_write8(val, GICD_ICFGRn + int_grp); diff --git a/include/drivers/interrupt_controller/gic.h b/include/drivers/interrupt_controller/gic.h index 7d6387514e7..00f99ce4d96 100644 --- a/include/drivers/interrupt_controller/gic.h +++ b/include/drivers/interrupt_controller/gic.h @@ -200,9 +200,9 @@ /* GICC_IAR */ #define GICC_IAR_SPURIOUS 1023 -/* GICC_ICFGR */ -#define GICC_ICFGR_MASK BIT_MASK(2) -#define GICC_ICFGR_TYPE BIT(1) +/* GICD_ICFGR */ +#define GICD_ICFGR_MASK BIT_MASK(2) +#define GICD_ICFGR_TYPE BIT(1) #endif /* CONFIG_GIC_VER <= 2 */