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

Commit 4d052213 authored by Feng Tang's avatar Feng Tang Committed by Grant Likely
Browse files

gpio-ml-ioh: Add the irq_disable/irq_enable hooks for ml-ioh irq chip 



These hooks will be needed by the general disabl/enable_irq();

Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent f9ea14ef

drivers/gpio/gpio-ml-ioh.c

+30 −0
Original line number Original line Diff line number Diff line
@@ -332,6 +332,34 @@ static void ioh_irq_mask(struct irq_data *d) 
		  &chip->reg->regs[chip->ch].imask);

		  &chip->reg->regs[chip->ch].imask);

}

}





static void ioh_irq_disable(struct irq_data *d)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);

	struct ioh_gpio *chip = gc->private;

	unsigned long flags;

	u32 ien;



	spin_lock_irqsave(&chip->spinlock, flags);

	ien = ioread32(&chip->reg->regs[chip->ch].ien);

	ien &= ~(1 << (d->irq - chip->irq_base));

	iowrite32(ien, &chip->reg->regs[chip->ch].ien);

	spin_unlock_irqrestore(&chip->spinlock, flags);

}



static void ioh_irq_enable(struct irq_data *d)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);

	struct ioh_gpio *chip = gc->private;

	unsigned long flags;

	u32 ien;



	spin_lock_irqsave(&chip->spinlock, flags);

	ien = ioread32(&chip->reg->regs[chip->ch].ien);

	ien |= 1 << (d->irq - chip->irq_base);

	iowrite32(ien, &chip->reg->regs[chip->ch].ien);

	spin_unlock_irqrestore(&chip->spinlock, flags);

}



static irqreturn_t ioh_gpio_handler(int irq, void *dev_id)

static irqreturn_t ioh_gpio_handler(int irq, void *dev_id)

{

{

	struct ioh_gpio *chip = dev_id;

	struct ioh_gpio *chip = dev_id;
@@ -370,6 +398,8 @@ static __devinit void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip, 
	ct->chip.irq_mask = ioh_irq_mask;

	ct->chip.irq_mask = ioh_irq_mask;

	ct->chip.irq_unmask = ioh_irq_unmask;

	ct->chip.irq_unmask = ioh_irq_unmask;

	ct->chip.irq_set_type = ioh_irq_type;

	ct->chip.irq_set_type = ioh_irq_type;

	ct->chip.irq_disable = ioh_irq_disable;

	ct->chip.irq_enable = ioh_irq_enable;





	irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,

	irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,

			       IRQ_NOREQUEST | IRQ_NOPROBE, 0);

			       IRQ_NOREQUEST | IRQ_NOPROBE, 0);