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

Commit 486c9551 authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[ARM] 4434/1: PXA: remove PXA_IRQ_SKIP 



1. PXA_IRQ_SKIP is defined to be 7 on PXA25x so that the first IRQ
   starts from zero. This makes IRQ numbering inconsistent between
   PXA25x and PXA27x. Remove this macro so that the same IRQ_XXXXX
   definition has the same value on both PXA25x and PXA27x.

2. make IRQ_SSP3..IRQ_PWRI2C valid only if PXA27x is defined, this
   avoids unintentional use of these macros on PXA25x

Signed-off-by: default avatareric miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 88dfe98c

arch/arm/mach-pxa/irq.c

+5 −5
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ 


static void pxa_mask_low_irq(unsigned int irq)

{

	ICMR &= ~(1 << (irq + PXA_IRQ_SKIP));

	ICMR &= ~(1 << irq);

}



static void pxa_unmask_low_irq(unsigned int irq)

{

	ICMR |= (1 << (irq + PXA_IRQ_SKIP));

	ICMR |= (1 << irq);

}



static int pxa_set_wake(unsigned int irq, unsigned int on)
@@ -75,12 +75,12 @@ static struct irq_chip pxa_internal_chip_low = { 


static void pxa_mask_high_irq(unsigned int irq)

{

	ICMR2 &= ~(1 << (irq - 32 + PXA_IRQ_SKIP));

	ICMR2 &= ~(1 << (irq - 32));

}



static void pxa_unmask_high_irq(unsigned int irq)

{

	ICMR2 |= (1 << (irq - 32 + PXA_IRQ_SKIP));

	ICMR2 |= (1 << (irq - 32));

}



static struct irq_chip pxa_internal_chip_high = {
@@ -351,7 +351,7 @@ void __init pxa_init_irq(void) 
	/* GPIO 0 and 1 must have their mask bit always set */

	GPIO_IRQ_mask[0] = 3;



	for (irq = PXA_IRQ(PXA_IRQ_SKIP); irq <= PXA_IRQ(31); irq++) {

	for (irq = PXA_IRQ(0); irq <= PXA_IRQ(31); irq++) {

		set_irq_chip(irq, &pxa_internal_chip_low);

		set_irq_handler(irq, handle_level_irq);

		set_irq_flags(irq, IRQF_VALID);

include/asm-arm/arch-pxa/entry-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ 
		rsb	\irqstat, \irqnr, #0

		and	\irqstat, \irqstat, \irqnr

		clz	\irqnr, \irqstat

		rsb	\irqnr, \irqnr, #(31 - PXA_IRQ_SKIP)

		rsb	\irqnr, \irqnr, #31

1001:

		.endm

include/asm-arm/arch-pxa/irqs.h

+4 −7
Original line number Diff line number Diff line
@@ -11,14 +11,9 @@ 
 */





#ifdef CONFIG_PXA27x

#define PXA_IRQ_SKIP	0

#else

#define PXA_IRQ_SKIP	7

#endif



#define PXA_IRQ(x)	((x) - PXA_IRQ_SKIP)

#define PXA_IRQ(x)	(x)



#ifdef CONFIG_PXA27x

#define IRQ_SSP3	PXA_IRQ(0)	/* SSP3 service request */

#define IRQ_MSL		PXA_IRQ(1)	/* MSL Interface interrupt */

#define IRQ_USBH2	PXA_IRQ(2)	/* USB Host interrupt 1 (OHCI) */
@@ -26,6 +21,8 @@ 
#define IRQ_KEYPAD	PXA_IRQ(4)	/* Key pad controller */

#define IRQ_MEMSTK	PXA_IRQ(5)	/* Memory Stick interrupt */

#define IRQ_PWRI2C	PXA_IRQ(6)	/* Power I2C interrupt */

#endif



#define IRQ_HWUART	PXA_IRQ(7)	/* HWUART Transmit/Receive/Error (PXA26x) */

#define IRQ_OST_4_11	PXA_IRQ(7)	/* OS timer 4-11 matches (PXA27x) */

#define	IRQ_GPIO0	PXA_IRQ(8)	/* GPIO0 Edge Detect */