|
@@ -258,6 +258,7 @@ static int aic5_irq_domain_xlate(struct irq_domain *d,
|
|
unsigned int *out_type)
|
|
unsigned int *out_type)
|
|
{
|
|
{
|
|
struct irq_chip_generic *bgc = irq_get_domain_generic_chip(d, 0);
|
|
struct irq_chip_generic *bgc = irq_get_domain_generic_chip(d, 0);
|
|
|
|
+ unsigned long flags;
|
|
unsigned smr;
|
|
unsigned smr;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
@@ -269,12 +270,12 @@ static int aic5_irq_domain_xlate(struct irq_domain *d,
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
- irq_gc_lock(bgc);
|
|
|
|
|
|
+ irq_gc_lock_irqsave(bgc, flags);
|
|
irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR);
|
|
irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR);
|
|
smr = irq_reg_readl(bgc, AT91_AIC5_SMR);
|
|
smr = irq_reg_readl(bgc, AT91_AIC5_SMR);
|
|
aic_common_set_priority(intspec[2], &smr);
|
|
aic_common_set_priority(intspec[2], &smr);
|
|
irq_reg_writel(bgc, smr, AT91_AIC5_SMR);
|
|
irq_reg_writel(bgc, smr, AT91_AIC5_SMR);
|
|
- irq_gc_unlock(bgc);
|
|
|
|
|
|
+ irq_gc_unlock_irqrestore(bgc, flags);
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|