iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio/mxc: convert gpio-mxc to use generic irq chip

Browse Source 
The patch converts gpio-mxc driver to use generic irq chip.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Shawn Guo 2011-06-07 16:25:37 +08:00 committed by Grant Likely
parent c103de2404
commit e4ea933363
2 changed files with 29 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpio/Kconfig
View File

@ -96,6 +96,7 @@ config GPIO_MXC
def_bool y def_bool y
depends on ARCH_MXC depends on ARCH_MXC
select GPIO_GENERIC select GPIO_GENERIC
select GENERIC_IRQ_CHIP
config GPIO_MXS config GPIO_MXS
def_bool y def_bool y

88
drivers/gpio/gpio-mxc.c
View File

@ -65,46 +65,11 @@ static LIST_HEAD(mxc_gpio_ports);
/* Note: This driver assumes 32 GPIOs are handled in one register */ /* Note: This driver assumes 32 GPIOs are handled in one register */
static void _clear_gpio_irqstatus(struct mxc_gpio_port *port, u32 index)
{
writel(1 << index, port->base + GPIO_ISR);
}
static void _set_gpio_irqenable(struct mxc_gpio_port *port, u32 index,
int enable)
{
u32 l;
l = readl(port->base + GPIO_IMR);
l = (l & (~(1 << index))) | (!!enable << index);
writel(l, port->base + GPIO_IMR);
}
static void gpio_ack_irq(struct irq_data *d)
{
struct mxc_gpio_port *port = irq_data_get_irq_chip_data(d);
u32 gpio = irq_to_gpio(d->irq);
_clear_gpio_irqstatus(port, gpio & 0x1f);
}
static void gpio_mask_irq(struct irq_data *d)
{
struct mxc_gpio_port *port = irq_data_get_irq_chip_data(d);
u32 gpio = irq_to_gpio(d->irq);
_set_gpio_irqenable(port, gpio & 0x1f, 0);
}
static void gpio_unmask_irq(struct irq_data *d)
{
struct mxc_gpio_port *port = irq_data_get_irq_chip_data(d);
u32 gpio = irq_to_gpio(d->irq);
_set_gpio_irqenable(port, gpio & 0x1f, 1);
}
static int gpio_set_irq_type(struct irq_data *d, u32 type) static int gpio_set_irq_type(struct irq_data *d, u32 type)
{ {
u32 gpio = irq_to_gpio(d->irq); u32 gpio = irq_to_gpio(d->irq);
struct mxc_gpio_port *port = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct mxc_gpio_port *port = gc->private;
u32 bit, val; u32 bit, val;
int edge; int edge;
void __iomem *reg = port->base; void __iomem *reg = port->base;
@ -142,7 +107,7 @@ static int gpio_set_irq_type(struct irq_data *d, u32 type)
bit = gpio & 0xf; bit = gpio & 0xf;
val = readl(reg) & ~(0x3 << (bit << 1)); val = readl(reg) & ~(0x3 << (bit << 1));
writel(val | (edge << (bit << 1)), reg); writel(val | (edge << (bit << 1)), reg);
_clear_gpio_irqstatus(port, gpio & 0x1f); writel(1 << (gpio & 0x1f), port->base + GPIO_ISR);
return 0; return 0;
} }
@ -231,7 +196,8 @@ static int gpio_set_wake_irq(struct irq_data *d, u32 enable)
{ {
u32 gpio = irq_to_gpio(d->irq); u32 gpio = irq_to_gpio(d->irq);
u32 gpio_idx = gpio & 0x1F; u32 gpio_idx = gpio & 0x1F;
struct mxc_gpio_port *port = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct mxc_gpio_port *port = gc->private;
if (enable) { if (enable) {
if (port->irq_high && (gpio_idx >= 16)) if (port->irq_high && (gpio_idx >= 16))
@ -248,26 +214,33 @@ static int gpio_set_wake_irq(struct irq_data *d, u32 enable)
return 0; return 0;
} }
static struct irq_chip gpio_irq_chip = { static void __init mxc_gpio_init_gc(struct mxc_gpio_port *port)
.name = "GPIO", {
.irq_ack = gpio_ack_irq, struct irq_chip_generic *gc;
.irq_mask = gpio_mask_irq, struct irq_chip_type *ct;
.irq_unmask = gpio_unmask_irq,
.irq_set_type = gpio_set_irq_type,
.irq_set_wake = gpio_set_wake_irq,
};
/* gc = irq_alloc_generic_chip("gpio-mxc", 1, port->virtual_irq_start,
* This lock class tells lockdep that GPIO irqs are in a different port->base, handle_level_irq);
* category than their parents, so it won't report false recursion. gc->private = port;
*/
static struct lock_class_key gpio_lock_class; ct = gc->chip_types;
ct->chip.irq_ack = irq_gc_ack,
ct->chip.irq_mask = irq_gc_mask_clr_bit;
ct->chip.irq_unmask = irq_gc_mask_set_bit;
ct->chip.irq_set_type = gpio_set_irq_type;
ct->chip.irq_set_wake = gpio_set_wake_irq,
ct->regs.ack = GPIO_ISR;
ct->regs.mask = GPIO_IMR;
irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_NESTED_LOCK,
IRQ_NOREQUEST, 0);
}
static int __devinit mxc_gpio_probe(struct platform_device *pdev) static int __devinit mxc_gpio_probe(struct platform_device *pdev)
{ {
struct mxc_gpio_port *port; struct mxc_gpio_port *port;
struct resource *iores; struct resource *iores;
int err, i; int err;
port = kzalloc(sizeof(struct mxc_gpio_port), GFP_KERNEL); port = kzalloc(sizeof(struct mxc_gpio_port), GFP_KERNEL);
if (!port) if (!port)
@ -304,13 +277,8 @@ static int __devinit mxc_gpio_probe(struct platform_device *pdev)
writel(0, port->base + GPIO_IMR); writel(0, port->base + GPIO_IMR);
writel(~0, port->base + GPIO_ISR); writel(~0, port->base + GPIO_ISR);
for (i = port->virtual_irq_start; /* gpio-mxc can be a generic irq chip */
i < port->virtual_irq_start + 32; i++) { mxc_gpio_init_gc(port);
irq_set_lockdep_class(i, &gpio_lock_class);
irq_set_chip_and_handler(i, &gpio_irq_chip, handle_level_irq);
set_irq_flags(i, IRQF_VALID);
irq_set_chip_data(i, port);
}
if (cpu_is_mx2()) { if (cpu_is_mx2()) {
/* setup one handler for all GPIO interrupts */ /* setup one handler for all GPIO interrupts */