aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bresticker <abrestic@chromium.org>2014-09-18 17:47:08 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-11-24 01:44:52 -0500
commitafe8dc254711b72ba8144295f4a8fcc66d30572d (patch)
tree5aacea8dcab8ead8ce770fd462c130d0c88e9257
parent0f84c305351c993e4307e1e8c128d44760314e31 (diff)
MIPS: Rename mips_cpu_intc_init() -> mips_cpu_irq_of_init()
mips_cpu_intc_init() is used for DT-based initialization of the CPU IRQ domain. Give it a more appropriate name. Signed-off-by: Andrew Bresticker <abrestic@chromium.org> Reviewed-by: Qais Yousef <qais.yousef@imgtec.com> Tested-by: Qais Yousef <qais.yousef@imgtec.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Bresticker <abrestic@chromium.org> Cc: Jeffrey Deans <jeffrey.deans@imgtec.com> Cc: Markos Chandras <markos.chandras@imgtec.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: Qais Yousef <qais.yousef@imgtec.com> Cc: Jonas Gorski <jogo@openwrt.org> Cc: John Crispin <blogic@openwrt.org> Cc: David Daney <ddaney.cavm@gmail.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/7800/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--Documentation/devicetree/bindings/mips/cpu_irq.txt4
-rw-r--r--arch/mips/include/asm/irq_cpu.h4
-rw-r--r--arch/mips/kernel/irq_cpu.c4
-rw-r--r--arch/mips/ralink/irq.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/mips/cpu_irq.txt b/Documentation/devicetree/bindings/mips/cpu_irq.txt
index 13aa4b62c62a..fc149f326dae 100644
--- a/Documentation/devicetree/bindings/mips/cpu_irq.txt
+++ b/Documentation/devicetree/bindings/mips/cpu_irq.txt
@@ -1,6 +1,6 @@
1MIPS CPU interrupt controller 1MIPS CPU interrupt controller
2 2
3On MIPS the mips_cpu_intc_init() helper can be used to initialize the 8 CPU 3On MIPS the mips_cpu_irq_of_init() helper can be used to initialize the 8 CPU
4IRQs from a devicetree file and create a irq_domain for IRQ controller. 4IRQs from a devicetree file and create a irq_domain for IRQ controller.
5 5
6With the irq_domain in place we can describe how the 8 IRQs are wired to the 6With the irq_domain in place we can describe how the 8 IRQs are wired to the
@@ -36,7 +36,7 @@ Example devicetree:
36 36
37Example platform irq.c: 37Example platform irq.c:
38static struct of_device_id __initdata of_irq_ids[] = { 38static struct of_device_id __initdata of_irq_ids[] = {
39 { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init }, 39 { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_irq_of_init },
40 { .compatible = "ralink,rt2880-intc", .data = intc_of_init }, 40 { .compatible = "ralink,rt2880-intc", .data = intc_of_init },
41 {}, 41 {},
42}; 42};
diff --git a/arch/mips/include/asm/irq_cpu.h b/arch/mips/include/asm/irq_cpu.h
index 3f11fdb3ed8c..39a160bb41dc 100644
--- a/arch/mips/include/asm/irq_cpu.h
+++ b/arch/mips/include/asm/irq_cpu.h
@@ -19,8 +19,8 @@ extern void rm9k_cpu_irq_init(void);
19 19
20#ifdef CONFIG_IRQ_DOMAIN 20#ifdef CONFIG_IRQ_DOMAIN
21struct device_node; 21struct device_node;
22extern int mips_cpu_intc_init(struct device_node *of_node, 22extern int mips_cpu_irq_of_init(struct device_node *of_node,
23 struct device_node *parent); 23 struct device_node *parent);
24#endif 24#endif
25 25
26#endif /* _ASM_IRQ_CPU_H */ 26#endif /* _ASM_IRQ_CPU_H */
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index b097f7df7a29..ca98a9f837d4 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -135,8 +135,8 @@ void __init mips_cpu_irq_init(void)
135 __mips_cpu_irq_init(NULL); 135 __mips_cpu_irq_init(NULL);
136} 136}
137 137
138int __init mips_cpu_intc_init(struct device_node *of_node, 138int __init mips_cpu_irq_of_init(struct device_node *of_node,
139 struct device_node *parent) 139 struct device_node *parent)
140{ 140{
141 __mips_cpu_irq_init(of_node); 141 __mips_cpu_irq_init(of_node);
142 return 0; 142 return 0;
diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
index 781b3d14a489..0495011a19df 100644
--- a/arch/mips/ralink/irq.c
+++ b/arch/mips/ralink/irq.c
@@ -173,7 +173,7 @@ static int __init intc_of_init(struct device_node *node,
173} 173}
174 174
175static struct of_device_id __initdata of_irq_ids[] = { 175static struct of_device_id __initdata of_irq_ids[] = {
176 { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init }, 176 { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_irq_of_init },
177 { .compatible = "ralink,rt2880-intc", .data = intc_of_init }, 177 { .compatible = "ralink,rt2880-intc", .data = intc_of_init },
178 {}, 178 {},
179}; 179};