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

Commit 880ff3e2 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

ARM: orion: remove no longer needed DT IRQ code 



Following the move of the Orion5x Device Tree support to use
irqchip_init() for the interrupt controller probing, the
plat-orion/irq.c code for DT-probing of the interrupt controller is no
longer necessary, so we can get rid of it.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: https://lkml.kernel.org/r/1398202002-28530-38-git-send-email-thomas.petazzoni@free-electrons.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent fbf04d81

arch/arm/plat-orion/include/plat/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -12,5 +12,4 @@ 
#define __PLAT_IRQ_H



void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr);

void __init orion_dt_init_irq(void);

#endif

arch/arm/plat-orion/irq.c

+0 −32
Original line number Diff line number Diff line
@@ -38,35 +38,3 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr) 
	irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_MASK_CACHE,

			       IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);

}
 


#ifdef CONFIG_OF

static int __init orion_add_irq_domain(struct device_node *np,

				       struct device_node *interrupt_parent)

{

	int i = 0;

	void __iomem *base;



	do {

		base = of_iomap(np, i);

		if (base) {

			orion_irq_init(i * 32, base + 0x04);

			i++;

		}

	} while (base);



	irq_domain_add_legacy(np, i * 32, 0, 0,

			      &irq_domain_simple_ops, NULL);

	return 0;

}



static const struct of_device_id orion_irq_match[] = {

	{ .compatible = "marvell,orion-intc",

	  .data = orion_add_irq_domain, },

	{},

};



void __init orion_dt_init_irq(void)

{

	of_irq_init(orion_irq_match);

}

#endif