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

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

[ARM] 4450/1: pxa: add pxa25x_init_irq() and pxa27x_init_irq() 



/* should be ok this time, I aligned this patch to your arm:pxa2.mbox */

1. move pxa25x specific IRQ initialization code to pxa25x_init_irq()
and pxa27x code to pxa27x_init_irq(), remove pxa_init_irq()

2. replace all pxa_init_irq() with their PXA25x or PXA27x specific
functions

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

arch/arm/mach-pxa/corgi.c

+3 −3
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ MACHINE_START(CORGI, "SHARP Corgi") 
	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.fixup		= fixup_corgi,

	.map_io		= pxa_map_io,

	.init_irq	= pxa_init_irq,

	.init_irq	= pxa25x_init_irq,

	.init_machine	= corgi_init,

	.timer		= &pxa_timer,

MACHINE_END
@@ -380,7 +380,7 @@ MACHINE_START(SHEPHERD, "SHARP Shepherd") 
	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.fixup		= fixup_corgi,

	.map_io		= pxa_map_io,

	.init_irq	= pxa_init_irq,

	.init_irq	= pxa25x_init_irq,

	.init_machine	= corgi_init,

	.timer		= &pxa_timer,

MACHINE_END
@@ -392,7 +392,7 @@ MACHINE_START(HUSKY, "SHARP Husky") 
	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.fixup		= fixup_corgi,

	.map_io		= pxa_map_io,

	.init_irq	= pxa_init_irq,

	.init_irq	= pxa25x_init_irq,

	.init_machine	= corgi_init,

	.timer		= &pxa_timer,

MACHINE_END

arch/arm/mach-pxa/generic.h

+5 −1
Original line number Diff line number Diff line
@@ -12,8 +12,12 @@ 
struct sys_timer;



extern struct sys_timer pxa_timer;

extern void __init pxa_init_irq_low(void);

extern void __init pxa_init_irq_high(void);

extern void __init pxa_init_irq_gpio(int gpio_nr);

extern void __init pxa25x_init_irq(void);

extern void __init pxa27x_init_irq(void);

extern void __init pxa_map_io(void);

extern void __init pxa_init_irq(void);



extern unsigned int get_clk_frequency_khz(int info);

arch/arm/mach-pxa/idp.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static void __init idp_init(void) 
static void __init idp_init_irq(void)

{



	pxa_init_irq();

	pxa25x_init_irq();



	set_irq_type(TOUCH_PANEL_IRQ, TOUCH_PANEL_IRQ_EDGE);

}

arch/arm/mach-pxa/irq.c

+0 −9
Original line number Diff line number Diff line
@@ -375,12 +375,3 @@ void __init pxa_init_irq_gpio(int gpio_nr) 
	set_irq_chip(IRQ_GPIO_2_x, &pxa_internal_chip_low);

	set_irq_chained_handler(IRQ_GPIO_2_x, pxa_gpio_demux_handler);

}
 


void __init pxa_init_irq(void)

{

	pxa_init_irq_low();

#ifdef CONFIG_PXA27x

	pxa_init_irq_high();

#endif

	pxa_init_irq_gpio(PXA_LAST_GPIO + 1);

}

arch/arm/mach-pxa/lpd270.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void __init lpd270_init_irq(void) 
{

	int irq;



	pxa_init_irq();

	pxa27x_init_irq();



	__raw_writew(0, LPD270_INT_MASK);

	__raw_writew(0, LPD270_INT_STATUS);