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

Commit 07bf3283 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.19/gic-regression-v2' of... 

Merge tag 'omap-for-v3.19/gic-regression-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "Urgent omap4 legacy interrupt regression fix for v3.19-rc series" from
Tony Lindgren:

A rather urgent pull request to fix omap4 legacy interrupts.

The legacy interrupts on omap4 got broken when gic got changed to
use irq_domain_add_linear() instead of the irq_domain_add_legacy(). We
still have the hardcoded legacy IRQ numbers in use in several places,
most notably the in the legacy DMA. It took a while to figure out
what the problem was and how it should be fixed for the -rc series.

Also include is a regression fix for the dra7 dwc3 suspend.

* tag 'omap-for-v3.19/gic-regression-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP: Work around hardcoded interrupts
  arm: boot: dts: dra7: enable dwc3 suspend PHY quirk

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f2c3c67f 0fb22a8f

arch/arm/boot/dts/dra7.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -1257,6 +1257,8 @@ 
				tx-fifo-resize;

				maximum-speed = "super-speed";

				dr_mode = "otg";

				snps,dis_u3_susphy_quirk;

				snps,dis_u2_susphy_quirk;

			};

		};
@@ -1278,6 +1280,8 @@ 
				tx-fifo-resize;

				maximum-speed = "high-speed";

				dr_mode = "otg";

				snps,dis_u3_susphy_quirk;

				snps,dis_u2_susphy_quirk;

			};

		};
@@ -1299,6 +1303,8 @@ 
				tx-fifo-resize;

				maximum-speed = "high-speed";

				dr_mode = "otg";

				snps,dis_u3_susphy_quirk;

				snps,dis_u2_susphy_quirk;

			};

		};

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;