Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f90bce7 authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Jason Cooper
Browse files

ARM: orion: convert the irq_reg_{readl,writel} calls to the new API 



The commit "genirq: Generic chip: Change irq_reg_{readl,writel}
arguments" modified the API. In the same tome the
arch/arm/plat-orion/gpio.c file received a fix with the use of the old
API: "ARM: orion: Fix for certain sequence of request_irq can cause
irq storm". This commit fixes the use of the API.

Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Link: https://lkml.kernel.org/r/1416928752-24529-1-git-send-email-gregory.clement@free-electrons.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 19e1c157

arch/arm/plat-orion/gpio.c

+4 −4
Original line number Diff line number Diff line
@@ -505,9 +505,9 @@ static void orion_gpio_unmask_irq(struct irq_data *d) 
	u32 mask = d->mask;



	irq_gc_lock(gc);

	reg_val = irq_reg_readl(gc->reg_base + ct->regs.mask);

	reg_val = irq_reg_readl(gc, ct->regs.mask);

	reg_val |= mask;

	irq_reg_writel(reg_val, gc->reg_base + ct->regs.mask);

	irq_reg_writel(gc, reg_val, ct->regs.mask);

	irq_gc_unlock(gc);

}
@@ -519,9 +519,9 @@ static void orion_gpio_mask_irq(struct irq_data *d) 
	u32 reg_val;



	irq_gc_lock(gc);

	reg_val = irq_reg_readl(gc->reg_base + ct->regs.mask);

	reg_val = irq_reg_readl(gc, ct->regs.mask);

	reg_val &= ~mask;

	irq_reg_writel(reg_val, gc->reg_base + ct->regs.mask);

	irq_reg_writel(gc, reg_val, ct->regs.mask);

	irq_gc_unlock(gc);

}