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

Commit f182aa1d authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: move s3c24xx_init_irq to s3c2410_init_irq 



The s3c24xx_init_irq function that was the base for all irq inits
is now only used to initialize the real s3c2410 irqs.

Therefore rename it and also move its declaration from plat/cpu.h
to common.h

The eint declaration is used by the vast majority of the SoCs and
gets therefore placed outside any ifdefs.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 0fe3cb1e

arch/arm/mach-s3c24xx/common.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ extern void s3c2410_map_io(void); 
extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c2410_init_clocks(int xtal);

extern void s3c2410_restart(char mode, const char *cmd);

extern void s3c2410_init_irq(void);

#else

#define s3c2410_init_clocks NULL

#define s3c2410_init_uarts NULL

arch/arm/mach-s3c24xx/irq.c

+33 −36
Original line number Diff line number Diff line
@@ -509,12 +509,35 @@ struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np, 
	return ERR_PTR(ret);

}



/* s3c24xx_init_irq

 *

 * Initialise S3C2410 IRQ system

*/

static struct s3c_irq_data init_eint[32] = {

	{ .type = S3C_IRQTYPE_NONE, }, /* reserved */

	{ .type = S3C_IRQTYPE_NONE, }, /* reserved */

	{ .type = S3C_IRQTYPE_NONE, }, /* reserved */

	{ .type = S3C_IRQTYPE_NONE, }, /* reserved */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 4 }, /* EINT4 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 4 }, /* EINT5 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 4 }, /* EINT6 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 4 }, /* EINT7 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT8 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT9 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT10 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT11 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT12 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT13 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT14 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT15 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT16 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT17 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT18 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT19 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT20 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT21 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT22 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT23 */

};



static struct s3c_irq_data init_base[32] = {

#ifdef CONFIG_CPU_S3C2410

static struct s3c_irq_data init_s3c2410base[32] = {

	{ .type = S3C_IRQTYPE_EINT, }, /* EINT0 */

	{ .type = S3C_IRQTYPE_EINT, }, /* EINT1 */

	{ .type = S3C_IRQTYPE_EINT, }, /* EINT2 */
@@ -549,34 +572,7 @@ static struct s3c_irq_data init_base[32] = { 
	{ .type = S3C_IRQTYPE_LEVEL, }, /* ADCPARENT */

};



static struct s3c_irq_data init_eint[32] = {

	{ .type = S3C_IRQTYPE_NONE, }, /* reserved */

	{ .type = S3C_IRQTYPE_NONE, }, /* reserved */

	{ .type = S3C_IRQTYPE_NONE, }, /* reserved */

	{ .type = S3C_IRQTYPE_NONE, }, /* reserved */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 4 }, /* EINT4 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 4 }, /* EINT5 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 4 }, /* EINT6 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 4 }, /* EINT7 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT8 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT9 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT10 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT11 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT12 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT13 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT14 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT15 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT16 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT17 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT18 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT19 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT20 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT21 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT22 */

	{ .type = S3C_IRQTYPE_EINT, .parent_irq = 5 }, /* EINT23 */

};



static struct s3c_irq_data init_subint[32] = {

static struct s3c_irq_data init_s3c2410subint[32] = {

	{ .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-RX */

	{ .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-TX */

	{ .type = S3C_IRQTYPE_LEVEL, .parent_irq = 28 }, /* UART0-ERR */
@@ -590,7 +586,7 @@ static struct s3c_irq_data init_subint[32] = { 
	{ .type = S3C_IRQTYPE_EDGE, .parent_irq = 31 }, /* ADC */

};



void __init s3c24xx_init_irq(void)

void __init s3c2410_init_irq(void)

{

	struct s3c_irq_intc *main_intc;
@@ -598,15 +594,16 @@ void __init s3c24xx_init_irq(void) 
	init_FIQ(FIQ_START);

#endif



	main_intc = s3c24xx_init_intc(NULL, &init_base[0], NULL, 0x4a000000);

	main_intc = s3c24xx_init_intc(NULL, &init_s3c2410base[0], NULL, 0x4a000000);

	if (IS_ERR(main_intc)) {

		pr_err("irq: could not create main interrupt controller\n");

		return;

	}



	s3c24xx_init_intc(NULL, &init_subint[0], main_intc, 0x4a000018);

	s3c24xx_init_intc(NULL, &init_s3c2410subint[0], main_intc, 0x4a000018);

	s3c24xx_init_intc(NULL, &init_eint[0], main_intc, 0x560000a4);

}

#endif



#ifdef CONFIG_CPU_S3C2412

static struct s3c_irq_data init_s3c2412base[32] = {

arch/arm/mach-s3c24xx/mach-amlm5900.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void __init amlm5900_init(void) 
MACHINE_START(AML_M5900, "AML_M5900")

	.atag_offset	= 0x100,

	.map_io		= amlm5900_map_io,

	.init_irq	= s3c24xx_init_irq,

	.init_irq	= s3c2410_init_irq,

	.init_machine	= amlm5900_init,

	.init_time	= samsung_timer_init,

	.restart	= s3c2410_restart,

arch/arm/mach-s3c24xx/mach-bast.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ MACHINE_START(BAST, "Simtec-BAST") 
	/* Maintainer: Ben Dooks <ben@simtec.co.uk> */

	.atag_offset	= 0x100,

	.map_io		= bast_map_io,

	.init_irq	= s3c24xx_init_irq,

	.init_irq	= s3c2410_init_irq,

	.init_machine	= bast_init,

	.init_time	= samsung_timer_init,

	.restart	= s3c2410_restart,

arch/arm/mach-s3c24xx/mach-h1940.c

+1 −6
Original line number Diff line number Diff line
@@ -667,11 +667,6 @@ static void __init h1940_reserve(void) 
	memblock_reserve(0x30081000, 0x1000);

}



static void __init h1940_init_irq(void)

{

	s3c24xx_init_irq();

}



static void __init h1940_init(void)

{

	u32 tmp;
@@ -740,7 +735,7 @@ MACHINE_START(H1940, "IPAQ-H1940") 
	.atag_offset	= 0x100,

	.map_io		= h1940_map_io,

	.reserve	= h1940_reserve,

	.init_irq	= h1940_init_irq,

	.init_irq	= s3c2410_init_irq,

	.init_machine	= h1940_init,

	.init_time	= samsung_timer_init,

	.restart	= s3c2410_restart,