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

Commit 0fb22a8f authored by Marc Zyngier's avatar Marc Zyngier Committed by Tony Lindgren
Browse files

ARM: OMAP: Work around hardcoded interrupts 



Commit 9a1091ef ("irqchip: gic: Support hierarchy irq domain")
changed the GIC driver to use a non-legacy IRQ domain on DT
platforms. This patch assumes that DT-driven systems are getting
all of their interrupts from device tree.

Turns out that OMAP has quite a few hidden gems, and still uses
hardcoded interrupts despite having fairly complete DTs.

This patch attempts to work around these by offering a translation
method that can be called directly from the hwmod code, if present.
The same hack is sprinkled over PRCM and TWL.

It isn't pretty, but it seems to do the job without having to add
more hacks to the interrupt controller code.

Tested on OMAP4 (Panda-ES) and OMAP5 (UEVM5432).

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarNishanth Menon <nm@ti.com>
[tony@atomide.com: updated to fix make randconfig issue]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 8c606735

arch/arm/mach-omap2/common.h

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ extern struct device *omap2_get_iva_device(void); 
extern struct device *omap2_get_l3_device(void);

extern struct device *omap4_get_dsp_device(void);



unsigned int omap4_xlate_irq(unsigned int hwirq);

void omap_gic_of_init(void);



#ifdef CONFIG_CACHE_L2X0

arch/arm/mach-omap2/omap4-common.c

+32 −0
Original line number Diff line number Diff line
@@ -256,6 +256,38 @@ static int __init omap4_sar_ram_init(void) 
}

omap_early_initcall(omap4_sar_ram_init);



static struct of_device_id gic_match[] = {

	{ .compatible = "arm,cortex-a9-gic", },

	{ .compatible = "arm,cortex-a15-gic", },

	{ },

};



static struct device_node *gic_node;



unsigned int omap4_xlate_irq(unsigned int hwirq)

{

	struct of_phandle_args irq_data;

	unsigned int irq;



	if (!gic_node)

		gic_node = of_find_matching_node(NULL, gic_match);



	if (WARN_ON(!gic_node))

		return hwirq;



	irq_data.np = gic_node;

	irq_data.args_count = 3;

	irq_data.args[0] = 0;

	irq_data.args[1] = hwirq - OMAP44XX_IRQ_GIC_START;

	irq_data.args[2] = IRQ_TYPE_LEVEL_HIGH;



	irq = irq_create_of_mapping(&irq_data);

	if (WARN_ON(!irq))

		irq = hwirq;



	return irq;

}



void __init omap_gic_of_init(void)

{

	struct device_node *np;

arch/arm/mach-omap2/omap_hwmod.c

+8 −2
Original line number Diff line number Diff line
@@ -3534,9 +3534,15 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res) 


	mpu_irqs_cnt = _count_mpu_irqs(oh);

	for (i = 0; i < mpu_irqs_cnt; i++) {

		unsigned int irq;



		if (oh->xlate_irq)

			irq = oh->xlate_irq((oh->mpu_irqs + i)->irq);

		else

			irq = (oh->mpu_irqs + i)->irq;

		(res + r)->name = (oh->mpu_irqs + i)->name;

		(res + r)->start = (oh->mpu_irqs + i)->irq;

		(res + r)->end = (oh->mpu_irqs + i)->irq;

		(res + r)->start = irq;

		(res + r)->end = irq;

		(res + r)->flags = IORESOURCE_IRQ;

		r++;

	}

arch/arm/mach-omap2/omap_hwmod.h

+1 −0
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ struct omap_hwmod { 
	spinlock_t			_lock;

	struct list_head		node;

	struct omap_hwmod_ocp_if	*_mpu_port;

	unsigned int			(*xlate_irq)(unsigned int);

	u16				flags;

	u8				mpu_rt_idx;

	u8				response_lat;

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+5 −0
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ static struct omap_hwmod omap44xx_dma_system_hwmod = { 
	.class		= &omap44xx_dma_hwmod_class,

	.clkdm_name	= "l3_dma_clkdm",

	.mpu_irqs	= omap44xx_dma_system_irqs,

	.xlate_irq	= omap4_xlate_irq,

	.main_clk	= "l3_div_ck",

	.prcm = {

		.omap4 = {
@@ -640,6 +641,7 @@ static struct omap_hwmod omap44xx_dss_dispc_hwmod = { 
	.class		= &omap44xx_dispc_hwmod_class,

	.clkdm_name	= "l3_dss_clkdm",

	.mpu_irqs	= omap44xx_dss_dispc_irqs,

	.xlate_irq	= omap4_xlate_irq,

	.sdma_reqs	= omap44xx_dss_dispc_sdma_reqs,

	.main_clk	= "dss_dss_clk",

	.prcm = {
@@ -693,6 +695,7 @@ static struct omap_hwmod omap44xx_dss_dsi1_hwmod = { 
	.class		= &omap44xx_dsi_hwmod_class,

	.clkdm_name	= "l3_dss_clkdm",

	.mpu_irqs	= omap44xx_dss_dsi1_irqs,

	.xlate_irq	= omap4_xlate_irq,

	.sdma_reqs	= omap44xx_dss_dsi1_sdma_reqs,

	.main_clk	= "dss_dss_clk",

	.prcm = {
@@ -726,6 +729,7 @@ static struct omap_hwmod omap44xx_dss_dsi2_hwmod = { 
	.class		= &omap44xx_dsi_hwmod_class,

	.clkdm_name	= "l3_dss_clkdm",

	.mpu_irqs	= omap44xx_dss_dsi2_irqs,

	.xlate_irq	= omap4_xlate_irq,

	.sdma_reqs	= omap44xx_dss_dsi2_sdma_reqs,

	.main_clk	= "dss_dss_clk",

	.prcm = {
@@ -784,6 +788,7 @@ static struct omap_hwmod omap44xx_dss_hdmi_hwmod = { 
	 */

	.flags		= HWMOD_SWSUP_SIDLE,

	.mpu_irqs	= omap44xx_dss_hdmi_irqs,

	.xlate_irq	= omap4_xlate_irq,

	.sdma_reqs	= omap44xx_dss_hdmi_sdma_reqs,

	.main_clk	= "dss_48mhz_clk",

	.prcm = {