Commit ce70af18 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Simon Horman

irq-renesas-irqc: simplify irq_set_type() method

Value 0 of the sense  selection field of CONFIG_n register means "disable event
detection" and serves in irqc_sense[] for marking the invalid values of the IRQ
type (by just omitting initializers). There is no need for INTC_IRQ_SENSE_VALID
and hence INTC_IRQ_SENSE() as all field values matching to the  valid IRQ types
are non-zero anyway.
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 6a7e3b30
...@@ -81,15 +81,12 @@ static void irqc_irq_disable(struct irq_data *d) ...@@ -81,15 +81,12 @@ static void irqc_irq_disable(struct irq_data *d)
iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_STS); iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_STS);
} }
#define INTC_IRQ_SENSE_VALID 0x10
#define INTC_IRQ_SENSE(x) (x + INTC_IRQ_SENSE_VALID)
static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = { static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = {
[IRQ_TYPE_LEVEL_LOW] = INTC_IRQ_SENSE(0x01), [IRQ_TYPE_LEVEL_LOW] = 0x01,
[IRQ_TYPE_LEVEL_HIGH] = INTC_IRQ_SENSE(0x02), [IRQ_TYPE_LEVEL_HIGH] = 0x02,
[IRQ_TYPE_EDGE_FALLING] = INTC_IRQ_SENSE(0x04), /* Synchronous */ [IRQ_TYPE_EDGE_FALLING] = 0x04, /* Synchronous */
[IRQ_TYPE_EDGE_RISING] = INTC_IRQ_SENSE(0x08), /* Synchronous */ [IRQ_TYPE_EDGE_RISING] = 0x08, /* Synchronous */
[IRQ_TYPE_EDGE_BOTH] = INTC_IRQ_SENSE(0x0c), /* Synchronous */ [IRQ_TYPE_EDGE_BOTH] = 0x0c, /* Synchronous */
}; };
static int irqc_irq_set_type(struct irq_data *d, unsigned int type) static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
...@@ -101,12 +98,12 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned int type) ...@@ -101,12 +98,12 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
irqc_dbg(&p->irq[hw_irq], "sense"); irqc_dbg(&p->irq[hw_irq], "sense");
if (!(value & INTC_IRQ_SENSE_VALID)) if (!value)
return -EINVAL; return -EINVAL;
tmp = ioread32(p->iomem + IRQC_CONFIG(hw_irq)); tmp = ioread32(p->iomem + IRQC_CONFIG(hw_irq));
tmp &= ~0x3f; tmp &= ~0x3f;
tmp |= value ^ INTC_IRQ_SENSE_VALID; tmp |= value;
iowrite32(tmp, p->iomem + IRQC_CONFIG(hw_irq)); iowrite32(tmp, p->iomem + IRQC_CONFIG(hw_irq));
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment