Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afe8dc25 authored by Andrew Bresticker's avatar Andrew Bresticker Committed by Ralf Baechle
Browse files

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: default avatarAndrew Bresticker <abrestic@chromium.org>
Reviewed-by: default avatarQais Yousef <qais.yousef@imgtec.com>
Tested-by: default avatarQais 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0f84c305

Documentation/devicetree/bindings/mips/cpu_irq.txt

+2 −2
Original line number Diff line number Diff line 
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
@@ -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 },

	{},

};

arch/mips/include/asm/irq_cpu.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 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,

extern int mips_cpu_irq_of_init(struct device_node *of_node,

				struct device_node *parent);

#endif

arch/mips/kernel/irq_cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void __init mips_cpu_irq_init(void) 
	__mips_cpu_irq_init(NULL);

}



int __init mips_cpu_intc_init(struct device_node *of_node,

int __init mips_cpu_irq_of_init(struct device_node *of_node,

				struct device_node *parent)

{

	__mips_cpu_irq_init(of_node);

arch/mips/ralink/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },

	{},

};