git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0fe3cb1)
ARM: S3C24XX: move s3c24xx_init_irq to s3c2410_init_irq
authorHeiko Stuebner <heiko@sntech.de>
Thu, 7 Mar 2013 03:38:19 +0000 (12:38 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Thu, 7 Mar 2013 03:38:19 +0000 (12:38 +0900)
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: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 files changed:
arch/arm/mach-s3c24xx/common.h patch | blob | history
arch/arm/mach-s3c24xx/irq.c patch | blob | history
arch/arm/mach-s3c24xx/mach-amlm5900.c patch | blob | history
arch/arm/mach-s3c24xx/mach-bast.c patch | blob | history
arch/arm/mach-s3c24xx/mach-h1940.c patch | blob | history
arch/arm/mach-s3c24xx/mach-n30.c patch | blob | history
arch/arm/mach-s3c24xx/mach-otom.c patch | blob | history
arch/arm/mach-s3c24xx/mach-qt2410.c patch | blob | history
arch/arm/mach-s3c24xx/mach-smdk2410.c patch | blob | history
arch/arm/mach-s3c24xx/mach-tct_hammer.c patch | blob | history
arch/arm/mach-s3c24xx/mach-vr1000.c patch | blob | history
arch/arm/plat-samsung/include/plat/cpu.h patch | blob | history

diff --git a/arch/arm/mach-s3c24xx/common.h b/arch/arm/mach-s3c24xx/common.h
index abefeb38bba4dbcdc150079bc19505912d3538ea..307c3714be55d43de2b8e4b65f92fbf3a7ea2e22 100644 (file)
--- a/arch/arm/mach-s3c24xx/common.h
+++ b/arch/arm/mach-s3c24xx/common.h
@@ -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
diff --git a/arch/arm/mach-s3c24xx/irq.c b/arch/arm/mach-s3c24xx/irq.c
index a6a7554d946e423dc8e3146f90c08ed1e4b293f5..ee4765403ab09a563755e8b8ce69d9842baf847b 100644 (file)
--- a/arch/arm/mach-s3c24xx/irq.c
+++ b/arch/arm/mach-s3c24xx/irq.c
@@ -509,12 +509,35 @@ err:
        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] = {
diff --git a/arch/arm/mach-s3c24xx/mach-amlm5900.c b/arch/arm/mach-s3c24xx/mach-amlm5900.c
index 432144cb54ae4c3ebfc6a1e9d140bd208240dabd..e27b5c91b3db230b0cc6126ebf20e6c1f73ea104 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-amlm5900.c
+++ b/arch/arm/mach-s3c24xx/mach-amlm5900.c
@@ -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,
diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
index eabe2db42ef6100c8a815d26bd8769b10f9b007e..22d6ae926d91c996ac7bc98425a1a5aa65d872d0 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-bast.c
+++ b/arch/arm/mach-s3c24xx/mach-bast.c
@@ -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,
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
index 8dd66010284644700f8b54353b5a85319c272268..af4334d6b4d532c60937154019a7816e4276f36c 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-h1940.c
+++ b/arch/arm/mach-s3c24xx/mach-h1940.c
@@ -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,
diff --git a/arch/arm/mach-s3c24xx/mach-n30.c b/arch/arm/mach-s3c24xx/mach-n30.c
index 73a690f431e6a889f0e87270f35a001c30192b54..2cb46c37c92058450e7bb9ec575ec14779ff9ba7 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-n30.c
+++ b/arch/arm/mach-s3c24xx/mach-n30.c
@@ -592,7 +592,7 @@ MACHINE_START(N30, "Acer-N30")
        .atag_offset    = 0x100,
        .init_time      = samsung_timer_init,
        .init_machine   = n30_init,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2410_init_irq,
        .map_io         = n30_map_io,
        .restart        = s3c2410_restart,
 MACHINE_END
@@ -603,7 +603,7 @@ MACHINE_START(N35, "Acer-N35")
        .atag_offset    = 0x100,
        .init_time      = samsung_timer_init,
        .init_machine   = n30_init,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2410_init_irq,
        .map_io         = n30_map_io,
        .restart        = s3c2410_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c24xx/mach-otom.c b/arch/arm/mach-s3c24xx/mach-otom.c
index 7b8670746b6a6261acb04f13a563ebf7dba14e69..7e16b0740ec1eb02208aba8a0f4dc72f13e300fc 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-otom.c
+++ b/arch/arm/mach-s3c24xx/mach-otom.c
@@ -116,7 +116,7 @@ MACHINE_START(OTOM, "Nex Vision - Otom 1.1")
        .atag_offset    = 0x100,
        .map_io         = otom11_map_io,
        .init_machine   = otom11_init,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2410_init_irq,
        .init_time      = samsung_timer_init,
        .restart        = s3c2410_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
index 71cf29b12d1f79b83085be8a4e9b1145b2babbab..f8feaeadb55a43402912bccefbcb7313881f5422 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-qt2410.c
+++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
@@ -343,7 +343,7 @@ static void __init qt2410_machine_init(void)
 MACHINE_START(QT2410, "QT2410")
        .atag_offset    = 0x100,
        .map_io         = qt2410_map_io,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2410_init_irq,
        .init_machine   = qt2410_machine_init,
        .init_time      = samsung_timer_init,
        .restart        = s3c2410_restart,
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2410.c b/arch/arm/mach-s3c24xx/mach-smdk2410.c
index fd96f7fc330c5eb2035091732aae03ce1368aac7..a773789e4f38ec8cd87a8b8fd80aa2afbd696fbb 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-smdk2410.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2410.c
@@ -116,7 +116,7 @@ MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switc
        /* Maintainer: Jonas Dietsche */
        .atag_offset    = 0x100,
        .map_io         = smdk2410_map_io,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2410_init_irq,
        .init_machine   = smdk2410_init,
        .init_time      = samsung_timer_init,
        .restart        = s3c2410_restart,
diff --git a/arch/arm/mach-s3c24xx/mach-tct_hammer.c b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
index 31dfe589e34972130ce3482cdea2f21442489900..7fad8f055cabc050b5aba9e1ecaf82c2fc1998f9 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-tct_hammer.c
+++ b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
@@ -149,7 +149,7 @@ static void __init tct_hammer_init(void)
 MACHINE_START(TCT_HAMMER, "TCT_HAMMER")
        .atag_offset    = 0x100,
        .map_io         = tct_hammer_map_io,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2410_init_irq,
        .init_machine   = tct_hammer_init,
        .init_time      = samsung_timer_init,
        .restart        = s3c2410_restart,
diff --git a/arch/arm/mach-s3c24xx/mach-vr1000.c b/arch/arm/mach-s3c24xx/mach-vr1000.c
index deeb8a0a4034ba373b1143e781f82584e3b250d7..42e7187fed6090fbef193901984cbd9e5cc0582c 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-vr1000.c
+++ b/arch/arm/mach-s3c24xx/mach-vr1000.c
@@ -355,7 +355,7 @@ MACHINE_START(VR1000, "Thorcom-VR1000")
        .atag_offset    = 0x100,
        .map_io         = vr1000_map_io,
        .init_machine   = vr1000_init,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2410_init_irq,
        .init_time      = samsung_timer_init,
        .restart        = s3c2410_restart,
 MACHINE_END
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
index 0f6c47a6475bb60872b5db222631de178e621e0e..989fefe18be6b77bee4216be31948f49582a475b 100644 (file)
--- a/arch/arm/plat-samsung/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@ -183,7 +183,6 @@ extern void s3c_init_cpu(unsigned long idcode,
 
 /* core initialisation functions */
 
-extern void s3c24xx_init_irq(void);
 extern void s5p_init_irq(u32 *vic, u32 num_vic);
 
 extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);
Unnamed repository; edit this file 'description' to name the repository.