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

Commit 2da01884 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: JZ4740: Avoid JZ4740-specific naming 



Rename the functions including jz4740 in their names to be more generic
in preparation for supporting further SoCs, and for moving this
interrupt controller code to drivers/irqchip.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Patchwork: https://patchwork.linux-mips.org/patch/10146/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3aa94590

arch/mips/jz4740/gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -442,8 +442,8 @@ static void jz4740_gpio_chip_init(struct jz_gpio_chip *chip, unsigned int id) 
	ct->chip.irq_mask = irq_gc_mask_disable_reg;

	ct->chip.irq_unmask = jz_gpio_irq_unmask;

	ct->chip.irq_ack = irq_gc_ack_set_bit;

	ct->chip.irq_suspend = jz4740_irq_suspend;

	ct->chip.irq_resume = jz4740_irq_resume;

	ct->chip.irq_suspend = ingenic_intc_irq_suspend;

	ct->chip.irq_resume = ingenic_intc_irq_resume;

	ct->chip.irq_startup = jz_gpio_irq_startup;

	ct->chip.irq_shutdown = jz_gpio_irq_shutdown;

	ct->chip.irq_set_type = jz_gpio_irq_set_type;

arch/mips/jz4740/irq.c

+12 −12
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct ingenic_intc_data { 
#define JZ_REG_INTC_PENDING	0x10

#define CHIP_SIZE		0x20



static irqreturn_t jz4740_cascade(int irq, void *data)

static irqreturn_t intc_cascade(int irq, void *data)

{

	struct ingenic_intc_data *intc = irq_get_handler_data(irq);

	uint32_t irq_reg;
@@ -61,7 +61,7 @@ static irqreturn_t jz4740_cascade(int irq, void *data) 
	return IRQ_HANDLED;

}



static void jz4740_irq_set_mask(struct irq_chip_generic *gc, uint32_t mask)

static void intc_irq_set_mask(struct irq_chip_generic *gc, uint32_t mask)

{

	struct irq_chip_regs *regs = &gc->chip_types->regs;
@@ -69,21 +69,21 @@ static void jz4740_irq_set_mask(struct irq_chip_generic *gc, uint32_t mask) 
	writel(~mask, gc->reg_base + regs->disable);

}



void jz4740_irq_suspend(struct irq_data *data)

void ingenic_intc_irq_suspend(struct irq_data *data)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);

	jz4740_irq_set_mask(gc, gc->wake_active);

	intc_irq_set_mask(gc, gc->wake_active);

}



void jz4740_irq_resume(struct irq_data *data)

void ingenic_intc_irq_resume(struct irq_data *data)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);

	jz4740_irq_set_mask(gc, gc->mask_cache);

	intc_irq_set_mask(gc, gc->mask_cache);

}



static struct irqaction jz4740_cascade_action = {

	.handler = jz4740_cascade,

	.name = "JZ4740 cascade interrupt",

static struct irqaction intc_cascade_action = {

	.handler = intc_cascade,

	.name = "SoC intc cascade interrupt",

};



static int __init ingenic_intc_of_init(struct device_node *node,
@@ -138,8 +138,8 @@ static int __init ingenic_intc_of_init(struct device_node *node, 
		ct->chip.irq_mask = irq_gc_mask_disable_reg;

		ct->chip.irq_mask_ack = irq_gc_mask_disable_reg;

		ct->chip.irq_set_wake = irq_gc_set_wake;

		ct->chip.irq_suspend = jz4740_irq_suspend;

		ct->chip.irq_resume = jz4740_irq_resume;

		ct->chip.irq_suspend = ingenic_intc_irq_suspend;

		ct->chip.irq_resume = ingenic_intc_irq_resume;



		irq_setup_generic_chip(gc, IRQ_MSK(32), 0, 0,

				       IRQ_NOPROBE | IRQ_LEVEL);
@@ -150,7 +150,7 @@ static int __init ingenic_intc_of_init(struct device_node *node, 
	if (!domain)

		pr_warn("unable to register IRQ domain\n");



	setup_irq(parent_irq, &jz4740_cascade_action);

	setup_irq(parent_irq, &intc_cascade_action);

	return 0;



out_unmap_irq:

arch/mips/jz4740/irq.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#include <linux/irq.h>



extern void jz4740_irq_suspend(struct irq_data *data);

extern void jz4740_irq_resume(struct irq_data *data);

extern void ingenic_intc_irq_suspend(struct irq_data *data);

extern void ingenic_intc_irq_resume(struct irq_data *data);



#endif