Menu
▾
▴
sh: plat_irq_setup() V2
|
From: Magnus D. <mag...@gm...> - 2007-07-18 03:34:52
|
sh: plat_irq_setup() V2
This patch unifies the cpu specific interrupt setup functions for interrupt
controller blocks such as ipr, intc2 and intc. There is no point in having
separate functions for each interrupt controller, so let's clean this up.
Version two removes the #ifdefs around plat_irq_setup() in irq.c
Signed-off-by: Magnus Damm <da...@ig...>
---
Applies to git linux-2.6 a5fcaa210626a79465321e344c91a6a7dc3881fa
Needs to be applied on top of sh7722 intc code.
arch/sh/kernel/cpu/sh2/setup-sh7619.c | 2 +-
arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 2 +-
arch/sh/kernel/cpu/sh3/setup-sh7705.c | 2 +-
arch/sh/kernel/cpu/sh3/setup-sh7709.c | 2 +-
arch/sh/kernel/cpu/sh3/setup-sh7710.c | 2 +-
arch/sh/kernel/cpu/sh4/setup-sh7750.c | 2 +-
arch/sh/kernel/cpu/sh4/setup-sh7760.c | 8 ++------
arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +-
arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 2 +-
arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 2 +-
arch/sh/kernel/cpu/sh4a/setup-shx3.c | 2 +-
arch/sh/kernel/irq.c | 9 +--------
include/asm-sh/hw_irq.h | 4 ++--
13 files changed, 15 insertions(+), 26 deletions(-)
--- 0001/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ work/arch/sh/kernel/cpu/sh2/setup-sh7619.c 2007-07-18 10:17:44.000000000 +0900
@@ -88,7 +88,7 @@ static struct ipr_desc ipr_irq_desc = {
},
};
-void __init init_IRQ_ipr(void)
+void __init plat_irq_setup(void)
{
register_ipr_controller(&ipr_irq_desc);
}
--- 0001/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ work/arch/sh/kernel/cpu/sh2a/setup-sh7206.c 2007-07-18 10:17:44.000000000 +0900
@@ -107,7 +107,7 @@ static struct ipr_desc ipr_irq_desc = {
},
};
-void __init init_IRQ_ipr(void)
+void __init plat_irq_setup(void)
{
register_ipr_controller(&ipr_irq_desc);
}
--- 0001/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ work/arch/sh/kernel/cpu/sh3/setup-sh7705.c 2007-07-18 10:17:44.000000000 +0900
@@ -92,7 +92,7 @@ static struct ipr_desc ipr_irq_desc = {
},
};
-void __init init_IRQ_ipr(void)
+void __init plat_irq_setup(void)
{
register_ipr_controller(&ipr_irq_desc);
}
--- 0001/arch/sh/kernel/cpu/sh3/setup-sh7709.c
+++ work/arch/sh/kernel/cpu/sh3/setup-sh7709.c 2007-07-18 10:17:44.000000000 +0900
@@ -139,7 +139,7 @@ static struct ipr_desc ipr_irq_desc = {
},
};
-void __init init_IRQ_ipr(void)
+void __init plat_irq_setup(void)
{
register_ipr_controller(&ipr_irq_desc);
}
--- 0001/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ work/arch/sh/kernel/cpu/sh3/setup-sh7710.c 2007-07-18 10:17:44.000000000 +0900
@@ -101,7 +101,7 @@ static struct ipr_desc ipr_irq_desc = {
},
};
-void __init init_IRQ_ipr(void)
+void __init plat_irq_setup(void)
{
register_ipr_controller(&ipr_irq_desc);
}
--- 0001/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ work/arch/sh/kernel/cpu/sh4/setup-sh7750.c 2007-07-18 10:17:44.000000000 +0900
@@ -151,7 +151,7 @@ static struct ipr_desc ipr_irq_desc_sh77
};
#endif
-void __init init_IRQ_ipr(void)
+void __init plat_irq_setup(void)
{
register_ipr_controller(&ipr_irq_desc);
#ifdef CONFIG_CPU_SUBTYPE_SH7751
--- 0001/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ work/arch/sh/kernel/cpu/sh4/setup-sh7760.c 2007-07-18 10:17:44.000000000 +0900
@@ -109,11 +109,6 @@ static struct intc2_desc intc2_irq_desc
},
};
-void __init init_IRQ_intc2(void)
-{
- register_intc2_controller(&intc2_irq_desc);
-}
-
static struct ipr_data ipr_irq_table[] = {
/* IRQ, IPR-idx, shift, priority */
{ 16, 0, 12, 2 }, /* TMU0 TUNI*/
@@ -163,7 +158,8 @@ static struct ipr_desc ipr_irq_desc = {
},
};
-void __init init_IRQ_ipr(void)
+void __init plat_irq_setup(void)
{
+ register_intc2_controller(&intc2_irq_desc);
register_ipr_controller(&ipr_irq_desc);
}
--- 0003/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ work/arch/sh/kernel/cpu/sh4a/setup-sh7722.c 2007-07-18 10:17:44.000000000 +0900
@@ -194,7 +194,7 @@ static struct intc_sense_reg sense_regis
DECLARE_INTC_DESC(intc_desc, "sh7722", vectors, groups, priorities,
mask_registers, prio_registers, sense_registers);
-void __init init_IRQ_ipr(void)
+void __init plat_irq_setup(void)
{
register_intc_controller(&intc_desc);
}
--- 0001/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ work/arch/sh/kernel/cpu/sh4a/setup-sh7780.c 2007-07-18 10:17:44.000000000 +0900
@@ -115,7 +115,7 @@ static struct intc2_desc intc2_irq_desc
},
};
-void __init init_IRQ_intc2(void)
+void __init plat_irq_setup(void)
{
register_intc2_controller(&intc2_irq_desc);
}
--- 0001/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ work/arch/sh/kernel/cpu/sh4a/setup-sh7785.c 2007-07-18 10:17:44.000000000 +0900
@@ -110,7 +110,7 @@ static struct intc2_desc intc2_irq_desc
},
};
-void __init init_IRQ_intc2(void)
+void __init plat_irq_setup(void)
{
register_intc2_controller(&intc2_irq_desc);
}
--- 0001/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ work/arch/sh/kernel/cpu/sh4a/setup-shx3.c 2007-07-18 10:17:44.000000000 +0900
@@ -79,7 +79,7 @@ static struct intc2_desc intc2_irq_desc
},
};
-void __init init_IRQ_intc2(void)
+void __init plat_irq_setup(void)
{
register_intc2_controller(&intc2_irq_desc);
}
--- 0001/arch/sh/kernel/irq.c
+++ work/arch/sh/kernel/irq.c 2007-07-18 11:41:21.000000000 +0900
@@ -253,14 +253,7 @@ void __init init_IRQ(void)
#ifdef CONFIG_CPU_HAS_PINT_IRQ
init_IRQ_pint();
#endif
-
-#ifdef CONFIG_CPU_HAS_INTC2_IRQ
- init_IRQ_intc2();
-#endif
-
-#ifdef CONFIG_CPU_HAS_IPR_IRQ
- init_IRQ_ipr();
-#endif
+ plat_irq_setup();
/* Perform the machine specific initialisation */
if (sh_mv.mv_init_irq)
--- 0002/include/asm-sh/hw_irq.h
+++ work/include/asm-sh/hw_irq.h 2007-07-18 10:17:44.000000000 +0900
@@ -23,7 +23,6 @@ struct intc2_desc {
};
void register_intc2_controller(struct intc2_desc *);
-void init_IRQ_intc2(void);
struct ipr_data {
unsigned char irq;
@@ -41,7 +40,6 @@ struct ipr_desc {
};
void register_ipr_controller(struct ipr_desc *);
-void init_IRQ_ipr(void);
/*
* Enable individual interrupt mode for external IPR IRQs.
@@ -115,4 +113,6 @@ static struct intc_desc symbol = { \
void __init register_intc_controller(struct intc_desc *desc);
+void __init plat_irq_setup(void);
+
#endif /* __ASM_SH_HW_IRQ_H */
|
