diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/cpu/sh2/setup-sh7619.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7705.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7709.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7710.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7750.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7760.c | 8 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-shx3.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/irq.c | 9 |
12 files changed, 13 insertions, 24 deletions
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c index 1a107fe22dde..a979b981e6a3 100644 --- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c +++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c | |||
@@ -88,7 +88,7 @@ static struct ipr_desc ipr_irq_desc = { | |||
88 | }, | 88 | }, |
89 | }; | 89 | }; |
90 | 90 | ||
91 | void __init init_IRQ_ipr(void) | 91 | void __init plat_irq_setup(void) |
92 | { | 92 | { |
93 | register_ipr_controller(&ipr_irq_desc); | 93 | register_ipr_controller(&ipr_irq_desc); |
94 | } | 94 | } |
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c index b6e3a6351fa6..deab16500167 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c | |||
@@ -107,7 +107,7 @@ static struct ipr_desc ipr_irq_desc = { | |||
107 | }, | 107 | }, |
108 | }; | 108 | }; |
109 | 109 | ||
110 | void __init init_IRQ_ipr(void) | 110 | void __init plat_irq_setup(void) |
111 | { | 111 | { |
112 | register_ipr_controller(&ipr_irq_desc); | 112 | register_ipr_controller(&ipr_irq_desc); |
113 | } | 113 | } |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c index a55b8ce2c54c..ebd9d06d8bdd 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c | |||
@@ -92,7 +92,7 @@ static struct ipr_desc ipr_irq_desc = { | |||
92 | }, | 92 | }, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | void __init init_IRQ_ipr(void) | 95 | void __init plat_irq_setup(void) |
96 | { | 96 | { |
97 | register_ipr_controller(&ipr_irq_desc); | 97 | register_ipr_controller(&ipr_irq_desc); |
98 | } | 98 | } |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7709.c b/arch/sh/kernel/cpu/sh3/setup-sh7709.c index d79ec0c0522f..086f8e2545af 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7709.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7709.c | |||
@@ -139,7 +139,7 @@ static struct ipr_desc ipr_irq_desc = { | |||
139 | }, | 139 | }, |
140 | }; | 140 | }; |
141 | 141 | ||
142 | void __init init_IRQ_ipr(void) | 142 | void __init plat_irq_setup(void) |
143 | { | 143 | { |
144 | register_ipr_controller(&ipr_irq_desc); | 144 | register_ipr_controller(&ipr_irq_desc); |
145 | } | 145 | } |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c index f40e6dac337d..132284893373 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c | |||
@@ -101,7 +101,7 @@ static struct ipr_desc ipr_irq_desc = { | |||
101 | }, | 101 | }, |
102 | }; | 102 | }; |
103 | 103 | ||
104 | void __init init_IRQ_ipr(void) | 104 | void __init plat_irq_setup(void) |
105 | { | 105 | { |
106 | register_ipr_controller(&ipr_irq_desc); | 106 | register_ipr_controller(&ipr_irq_desc); |
107 | } | 107 | } |
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index da153bcdfeb2..b0cd6e0b8539 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c | |||
@@ -151,7 +151,7 @@ static struct ipr_desc ipr_irq_desc_sh7751 = { | |||
151 | }; | 151 | }; |
152 | #endif | 152 | #endif |
153 | 153 | ||
154 | void __init init_IRQ_ipr(void) | 154 | void __init plat_irq_setup(void) |
155 | { | 155 | { |
156 | register_ipr_controller(&ipr_irq_desc); | 156 | register_ipr_controller(&ipr_irq_desc); |
157 | #ifdef CONFIG_CPU_SUBTYPE_SH7751 | 157 | #ifdef CONFIG_CPU_SUBTYPE_SH7751 |
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c index 3df169755673..47fa27056253 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c | |||
@@ -109,11 +109,6 @@ static struct intc2_desc intc2_irq_desc __read_mostly = { | |||
109 | }, | 109 | }, |
110 | }; | 110 | }; |
111 | 111 | ||
112 | void __init init_IRQ_intc2(void) | ||
113 | { | ||
114 | register_intc2_controller(&intc2_irq_desc); | ||
115 | } | ||
116 | |||
117 | static struct ipr_data ipr_irq_table[] = { | 112 | static struct ipr_data ipr_irq_table[] = { |
118 | /* IRQ, IPR-idx, shift, priority */ | 113 | /* IRQ, IPR-idx, shift, priority */ |
119 | { 16, 0, 12, 2 }, /* TMU0 TUNI*/ | 114 | { 16, 0, 12, 2 }, /* TMU0 TUNI*/ |
@@ -163,7 +158,8 @@ static struct ipr_desc ipr_irq_desc = { | |||
163 | }, | 158 | }, |
164 | }; | 159 | }; |
165 | 160 | ||
166 | void __init init_IRQ_ipr(void) | 161 | void __init plat_irq_setup(void) |
167 | { | 162 | { |
163 | register_intc2_controller(&intc2_irq_desc); | ||
168 | register_ipr_controller(&ipr_irq_desc); | 164 | register_ipr_controller(&ipr_irq_desc); |
169 | } | 165 | } |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index 9d87e36a4af0..25b913e07e2c 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
@@ -193,7 +193,7 @@ static struct intc_sense_reg sense_registers[] = { | |||
193 | static DECLARE_INTC_DESC(intc_desc, "sh7722", vectors, groups, priorities, | 193 | static DECLARE_INTC_DESC(intc_desc, "sh7722", vectors, groups, priorities, |
194 | mask_registers, prio_registers, sense_registers); | 194 | mask_registers, prio_registers, sense_registers); |
195 | 195 | ||
196 | void __init init_IRQ_ipr(void) | 196 | void __init plat_irq_setup(void) |
197 | { | 197 | { |
198 | register_intc_controller(&intc_desc); | 198 | register_intc_controller(&intc_desc); |
199 | } | 199 | } |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c index b57c760bffde..86cd6281fa4d 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c | |||
@@ -115,7 +115,7 @@ static struct intc2_desc intc2_irq_desc __read_mostly = { | |||
115 | }, | 115 | }, |
116 | }; | 116 | }; |
117 | 117 | ||
118 | void __init init_IRQ_intc2(void) | 118 | void __init plat_irq_setup(void) |
119 | { | 119 | { |
120 | register_intc2_controller(&intc2_irq_desc); | 120 | register_intc2_controller(&intc2_irq_desc); |
121 | } | 121 | } |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c index ce10ec5d6914..cf047562e43f 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c | |||
@@ -110,7 +110,7 @@ static struct intc2_desc intc2_irq_desc __read_mostly = { | |||
110 | }, | 110 | }, |
111 | }; | 111 | }; |
112 | 112 | ||
113 | void __init init_IRQ_intc2(void) | 113 | void __init plat_irq_setup(void) |
114 | { | 114 | { |
115 | register_intc2_controller(&intc2_irq_desc); | 115 | register_intc2_controller(&intc2_irq_desc); |
116 | } | 116 | } |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c index 70683ea12b83..704c064f70dc 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c +++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c | |||
@@ -79,7 +79,7 @@ static struct intc2_desc intc2_irq_desc __read_mostly = { | |||
79 | }, | 79 | }, |
80 | }; | 80 | }; |
81 | 81 | ||
82 | void __init init_IRQ_intc2(void) | 82 | void __init plat_irq_setup(void) |
83 | { | 83 | { |
84 | register_intc2_controller(&intc2_irq_desc); | 84 | register_intc2_controller(&intc2_irq_desc); |
85 | } | 85 | } |
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 27897798867a..03404987528d 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c | |||
@@ -253,14 +253,7 @@ void __init init_IRQ(void) | |||
253 | #ifdef CONFIG_CPU_HAS_PINT_IRQ | 253 | #ifdef CONFIG_CPU_HAS_PINT_IRQ |
254 | init_IRQ_pint(); | 254 | init_IRQ_pint(); |
255 | #endif | 255 | #endif |
256 | 256 | plat_irq_setup(); | |
257 | #ifdef CONFIG_CPU_HAS_INTC2_IRQ | ||
258 | init_IRQ_intc2(); | ||
259 | #endif | ||
260 | |||
261 | #ifdef CONFIG_CPU_HAS_IPR_IRQ | ||
262 | init_IRQ_ipr(); | ||
263 | #endif | ||
264 | 257 | ||
265 | /* Perform the machine specific initialisation */ | 258 | /* Perform the machine specific initialisation */ |
266 | if (sh_mv.mv_init_irq) | 259 | if (sh_mv.mv_init_irq) |