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

Commit 19792610 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Olof Johansson
Browse files

ARM: clps711x: Add FIQ interrupt handling 



CLPS711X-target CPU can have a several FIQ interrupts. With this patch
we adds handling for a one which will be used for ALSA PCM later.
Since FIQ have a separate handler we only add "mask" and "unmask" calls
which will used for enable/disable_irq functions.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 99f04c8f

arch/arm/mach-clps711x/common.c

+35 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/clk-provider.h>



#include <asm/exception.h>

#include <asm/mach/irq.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <asm/system_misc.h>
@@ -135,6 +136,30 @@ static struct irq_chip int2_chip = { 
	.irq_unmask	= int2_unmask,

};



static void int3_mask(struct irq_data *d)

{

	u32 intmr3;



	intmr3 = clps_readl(INTMR3);

	intmr3 &= ~(1 << (d->irq - 32));

	clps_writel(intmr3, INTMR3);

}



static void int3_unmask(struct irq_data *d)

{

	u32 intmr3;



	intmr3 = clps_readl(INTMR3);

	intmr3 |= 1 << (d->irq - 32);

	clps_writel(intmr3, INTMR3);

}



static struct irq_chip int3_chip = {

	.name		= "Interrupt Vector 3",

	.irq_mask	= int3_mask,

	.irq_unmask	= int3_unmask,

};



static struct {

	int			nr;

	struct irq_chip		*chip;
@@ -188,6 +213,14 @@ void __init clps711x_init_irq(void) 
		set_irq_flags(clps711x_irqdescs[i].nr,

			      IRQF_VALID | IRQF_PROBE);

	}



	if (IS_ENABLED(CONFIG_FIQ)) {

		init_FIQ(0);

		irq_set_chip_and_handler(IRQ_DAIINT, &int3_chip,

					 handle_bad_irq);

		set_irq_flags(IRQ_DAIINT,

			      IRQF_VALID | IRQF_PROBE | IRQF_NOAUTOEN);

	}

}



inline u32 fls16(u32 x)

arch/arm/mach-clps711x/common.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Common bits.

 */



#define CLPS711X_NR_IRQS	(30)

#define CLPS711X_NR_IRQS	(33)

#define CLPS711X_NR_GPIO	(4 * 8 + 3)

#define CLPS711X_GPIO(prt, bit)	((prt) * 8 + (bit))

arch/arm/mach-clps711x/include/mach/clps711x.h

+3 −0
Original line number Diff line number Diff line
@@ -298,4 +298,7 @@ 
#define IRQ_UTXINT2		(16 + 12)

#define IRQ_URXINT2		(16 + 13)



/* INTSR3 Interrupts */

#define IRQ_DAIINT		(32 + 0)



#endif /* __MACH_CLPS711X_H */