Revert "gpio: davinci: fix lazy disable"
This reverts commit 0fdf37d1b6
.
This commit is contained in:
parent
e136698c96
commit
57903b8949
1 changed files with 4 additions and 4 deletions
|
@ -293,7 +293,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
|
||||||
* serve as EDMA event triggers.
|
* serve as EDMA event triggers.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void gpio_irq_mask(struct irq_data *d)
|
static void gpio_irq_disable(struct irq_data *d)
|
||||||
{
|
{
|
||||||
struct davinci_gpio_regs __iomem *g = irq2regs(d);
|
struct davinci_gpio_regs __iomem *g = irq2regs(d);
|
||||||
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
|
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
|
||||||
|
@ -302,7 +302,7 @@ static void gpio_irq_mask(struct irq_data *d)
|
||||||
writel_relaxed(mask, &g->clr_rising);
|
writel_relaxed(mask, &g->clr_rising);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gpio_irq_unmask(struct irq_data *d)
|
static void gpio_irq_enable(struct irq_data *d)
|
||||||
{
|
{
|
||||||
struct davinci_gpio_regs __iomem *g = irq2regs(d);
|
struct davinci_gpio_regs __iomem *g = irq2regs(d);
|
||||||
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
|
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
|
||||||
|
@ -328,8 +328,8 @@ static int gpio_irq_type(struct irq_data *d, unsigned trigger)
|
||||||
|
|
||||||
static struct irq_chip gpio_irqchip = {
|
static struct irq_chip gpio_irqchip = {
|
||||||
.name = "GPIO",
|
.name = "GPIO",
|
||||||
.irq_unmask = gpio_irq_unmask,
|
.irq_enable = gpio_irq_enable,
|
||||||
.irq_mask = gpio_irq_mask,
|
.irq_disable = gpio_irq_disable,
|
||||||
.irq_set_type = gpio_irq_type,
|
.irq_set_type = gpio_irq_type,
|
||||||
.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,
|
.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue