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

[ARM] 4435/1: PXA: remove PXA_INTERNAL_IRQS 



1. define PXA_GPIO_IRQ_BASE to be right after the internal IRQs,
   and define PXA_GPIO_IRQ_NUM to be 128 for all PXA2xx variants

2. make the code specific to the high IRQ numbers (32..64) to be
   PXA27x specific

3. add a function pxa_init_irq_high() to initialize the internal
   high IRQ chip, the invoke of this function could be moved to
   PXA27x specific initialization code

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

arch/arm/mach-pxa/irq.c

+16 −10
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static struct irq_chip pxa_internal_chip_low = { 
	.set_wake	= pxa_set_wake,

};



#if PXA_INTERNAL_IRQS > 32

#ifdef CONFIG_PXA27x



/*

 * This is for the second set of internal IRQs as found on the PXA27x.
@@ -90,6 +90,19 @@ static struct irq_chip pxa_internal_chip_high = { 
	.unmask		= pxa_unmask_high_irq,

};



void __init pxa_init_irq_high(void)

{

	int irq;



	ICMR2 = 0;

	ICLR2 = 0;



	for (irq = PXA_IRQ(32); irq < PXA_IRQ(64); irq++) {

		set_irq_chip(irq, &pxa_internal_chip_high);

		set_irq_handler(irq, handle_level_irq);

		set_irq_flags(irq, IRQF_VALID);

	}

}

#endif



/* Note that if an input/irq line ever gets changed to an output during
@@ -314,7 +327,6 @@ static struct irq_chip pxa_muxed_gpio_chip = { 
	.set_wake	= pxa_set_gpio_wake,

};





void __init pxa_init_irq(void)

{

	int irq;
@@ -338,8 +350,6 @@ void __init pxa_init_irq(void) 


#ifdef CONFIG_PXA27x

	/* And similarly for the extra regs on the PXA27x */

	ICMR2 = 0;

	ICLR2 = 0;

	GFER3 = 0;

	GRER3 = 0;

	GEDR3 = GEDR3;
@@ -357,12 +367,8 @@ void __init pxa_init_irq(void) 
		set_irq_flags(irq, IRQF_VALID);

	}



#if PXA_INTERNAL_IRQS > 32

	for (irq = PXA_IRQ(32); irq < PXA_IRQ(PXA_INTERNAL_IRQS); irq++) {

		set_irq_chip(irq, &pxa_internal_chip_high);

		set_irq_handler(irq, handle_level_irq);

		set_irq_flags(irq, IRQF_VALID);

	}

#ifdef CONFIG_PXA27x

	pxa_init_irq_high();

#endif



	for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) {

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

+6 −9
Original line number Diff line number Diff line
@@ -55,18 +55,15 @@ 
#ifdef CONFIG_PXA27x

#define IRQ_TPM		PXA_IRQ(32)	/* TPM interrupt */

#define IRQ_CAMERA	PXA_IRQ(33)	/* Camera Interface */



#define PXA_INTERNAL_IRQS 34

#else

#define PXA_INTERNAL_IRQS 32

#endif



#define GPIO_2_x_TO_IRQ(x)	\

			PXA_IRQ((x) - 2 + PXA_INTERNAL_IRQS)

#define PXA_GPIO_IRQ_BASE	(64)

#define PXA_GPIO_IRQ_NUM	(128)



#define GPIO_2_x_TO_IRQ(x)	(PXA_GPIO_IRQ_BASE + (x))

#define IRQ_GPIO(x)	(((x) < 2) ? (IRQ_GPIO0 + (x)) : GPIO_2_x_TO_IRQ(x))



#define IRQ_TO_GPIO_2_x(i)	\

			((i) - IRQ_GPIO(2) + 2)

#define IRQ_TO_GPIO_2_x(i)	((i) - PXA_GPIO_IRQ_BASE)

#define IRQ_TO_GPIO(i)	(((i) < IRQ_GPIO(2)) ? ((i) - IRQ_GPIO0) : IRQ_TO_GPIO_2_x(i))



#if defined(CONFIG_PXA25x)
@@ -81,7 +78,7 @@ 
 * these.  If you need more, increase IRQ_BOARD_END, but keep it

 * within sensible limits.

 */

#define IRQ_BOARD_START		(IRQ_GPIO(PXA_LAST_GPIO) + 1)

#define IRQ_BOARD_START		(PXA_GPIO_IRQ_BASE + PXA_GPIO_IRQ_NUM)

#define IRQ_BOARD_END		(IRQ_BOARD_START + 16)



#define IRQ_SA1111_START	(IRQ_BOARD_END)

CRA Git | Maintained and supported by SUSTech CRA and CCSE