Skip to content

Commit

Permalink
MIPS: Rename mips_cpu_intc_init() -> mips_cpu_irq_of_init()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Bresticker authored and Ralf Baechle committed Nov 24, 2014
1 parent 0f84c30 commit afe8dc2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/mips/cpu_irq.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIPS CPU interrupt controller

On MIPS the mips_cpu_intc_init() helper can be used to initialize the 8 CPU
On MIPS the mips_cpu_irq_of_init() helper can be used to initialize the 8 CPU
IRQs from a devicetree file and create a irq_domain for IRQ controller.

With the irq_domain in place we can describe how the 8 IRQs are wired to the
Expand Down Expand Up @@ -36,7 +36,7 @@ Example devicetree:

Example platform irq.c:
static struct of_device_id __initdata of_irq_ids[] = {
{ .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init },
{ .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_irq_of_init },
{ .compatible = "ralink,rt2880-intc", .data = intc_of_init },
{},
};
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/include/asm/irq_cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ extern void rm9k_cpu_irq_init(void);

#ifdef CONFIG_IRQ_DOMAIN
struct device_node;
extern int mips_cpu_intc_init(struct device_node *of_node,
struct device_node *parent);
extern int mips_cpu_irq_of_init(struct device_node *of_node,
struct device_node *parent);
#endif

#endif /* _ASM_IRQ_CPU_H */
4 changes: 2 additions & 2 deletions arch/mips/kernel/irq_cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ void __init mips_cpu_irq_init(void)
__mips_cpu_irq_init(NULL);
}

int __init mips_cpu_intc_init(struct device_node *of_node,
struct device_node *parent)
int __init mips_cpu_irq_of_init(struct device_node *of_node,
struct device_node *parent)
{
__mips_cpu_irq_init(of_node);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/ralink/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static int __init intc_of_init(struct device_node *node,
}

static struct of_device_id __initdata of_irq_ids[] = {
{ .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init },
{ .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_irq_of_init },
{ .compatible = "ralink,rt2880-intc", .data = intc_of_init },
{},
};
Expand Down

0 comments on commit afe8dc2

Please sign in to comment.