FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-13 16:11:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

irqchip: mips-gic: Remove gic_set_polarity()

Browse Source 
Remove the gic_set_polarity() function in favour of using the new
change_gic_pol() accessor function which provides equivalent
functionality.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17029/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Paul Burton 2017-08-12 21:36:19 -07:00 committed by Ralf Baechle
parent 87554b0ef3
commit 80e5f9c9e2
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/irqchip/irq-mips-gic.c
View File

@ -92,13 +92,6 @@ static inline void gic_update_bits(unsigned int reg, unsigned long mask,
gic_write(reg, regval); gic_write(reg, regval);
} }
static inline void gic_set_polarity(unsigned int intr, unsigned int pol)
{
gic_update_bits(GIC_REG(SHARED, GIC_SH_SET_POLARITY) +
GIC_INTR_OFS(intr), 1ul << GIC_INTR_BIT(intr),
(unsigned long)pol << GIC_INTR_BIT(intr));
}
static inline void gic_set_trigger(unsigned int intr, unsigned int trig) static inline void gic_set_trigger(unsigned int intr, unsigned int trig)
{ {
gic_update_bits(GIC_REG(SHARED, GIC_SH_SET_TRIGGER) + gic_update_bits(GIC_REG(SHARED, GIC_SH_SET_TRIGGER) +
@ -272,13 +265,13 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
spin_lock_irqsave(&gic_lock, flags); spin_lock_irqsave(&gic_lock, flags);
switch (type & IRQ_TYPE_SENSE_MASK) { switch (type & IRQ_TYPE_SENSE_MASK) {
case IRQ_TYPE_EDGE_FALLING: case IRQ_TYPE_EDGE_FALLING:
gic_set_polarity(irq, GIC_POL_NEG); change_gic_pol(irq, GIC_POL_FALLING_EDGE);
gic_set_trigger(irq, GIC_TRIG_EDGE); gic_set_trigger(irq, GIC_TRIG_EDGE);
gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE); gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE);
is_edge = true; is_edge = true;
break; break;
case IRQ_TYPE_EDGE_RISING: case IRQ_TYPE_EDGE_RISING:
gic_set_polarity(irq, GIC_POL_POS); change_gic_pol(irq, GIC_POL_RISING_EDGE);
gic_set_trigger(irq, GIC_TRIG_EDGE); gic_set_trigger(irq, GIC_TRIG_EDGE);
gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE); gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE);
is_edge = true; is_edge = true;
@ -290,14 +283,14 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
is_edge = true; is_edge = true;
break; break;
case IRQ_TYPE_LEVEL_LOW: case IRQ_TYPE_LEVEL_LOW:
gic_set_polarity(irq, GIC_POL_NEG); change_gic_pol(irq, GIC_POL_ACTIVE_LOW);
gic_set_trigger(irq, GIC_TRIG_LEVEL); gic_set_trigger(irq, GIC_TRIG_LEVEL);
gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE); gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE);
is_edge = false; is_edge = false;
break; break;
case IRQ_TYPE_LEVEL_HIGH: case IRQ_TYPE_LEVEL_HIGH:
default: default:
gic_set_polarity(irq, GIC_POL_POS); change_gic_pol(irq, GIC_POL_ACTIVE_HIGH);
gic_set_trigger(irq, GIC_TRIG_LEVEL); gic_set_trigger(irq, GIC_TRIG_LEVEL);
gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE); gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE);
is_edge = false; is_edge = false;
@ -464,7 +457,7 @@ static void __init gic_basic_init(void)
/* Setup defaults */ /* Setup defaults */
for (i = 0; i < gic_shared_intrs; i++) { for (i = 0; i < gic_shared_intrs; i++) {
gic_set_polarity(i, GIC_POL_POS); change_gic_pol(i, GIC_POL_ACTIVE_HIGH);
gic_set_trigger(i, GIC_TRIG_LEVEL); gic_set_trigger(i, GIC_TRIG_LEVEL);
write_gic_rmask(BIT(i)); write_gic_rmask(BIT(i));
} }

5
include/linux/irqchip/mips-gic.h
View File

@ -14,8 +14,6 @@
#define GIC_MAX_INTRS 256 #define GIC_MAX_INTRS 256
/* Constants */ /* Constants */
#define GIC_POL_POS 1
#define GIC_POL_NEG 0
#define GIC_TRIG_EDGE 1 #define GIC_TRIG_EDGE 1
#define GIC_TRIG_LEVEL 0 #define GIC_TRIG_LEVEL 0
#define GIC_TRIG_DUAL_ENABLE 1 #define GIC_TRIG_DUAL_ENABLE 1
@ -52,9 +50,6 @@
}) })
#define GIC_INTR_BIT(intr) ((intr) % (mips_cm_is64 ? 64 : 32)) #define GIC_INTR_BIT(intr) ((intr) % (mips_cm_is64 ? 64 : 32))
/* Polarity : Reset Value is always 0 */
#define GIC_SH_SET_POLARITY_OFS 0x0100
/* Triggering : Reset Value is always 0 */ /* Triggering : Reset Value is always 0 */
#define GIC_SH_SET_TRIGGER_OFS 0x0180 #define GIC_SH_SET_TRIGGER_OFS 0x0180