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

Commit 3da52167 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP4: Remove legacy IRQ for PRM 



We have the PRM IRQ mapped in device tree and this legacy code
is no longer needed.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 82e5051b

arch/arm/mach-omap2/prcm-common.h

+0 −1
Original line number Diff line number Diff line
@@ -506,7 +506,6 @@ struct omap_prcm_irq_setup { 
	u8 nr_irqs;

	const struct omap_prcm_irq *irqs;

	int irq;

	unsigned int (*xlate_irq)(unsigned int);

	void (*read_pending_irqs)(unsigned long *events);

	void (*ocp_barrier)(void);

	void (*save_and_clear_irqen)(u32 *saved_mask);

arch/arm/mach-omap2/prm.h

+0 −2
Original line number Diff line number Diff line
@@ -29,11 +29,9 @@ int omap2_prcm_base_init(void); 
 *

 * PRM_HAS_IO_WAKEUP: has IO wakeup capability

 * PRM_HAS_VOLTAGE: has voltage domains

 * PRM_IRQ_DEFAULT: use default irq number for PRM irq

 */

#define PRM_HAS_IO_WAKEUP	BIT(0)

#define PRM_HAS_VOLTAGE		BIT(1)

#define PRM_IRQ_DEFAULT		BIT(2)



/*

 * MAX_MODULE_SOFTRESET_WAIT: Maximum microseconds to wait for OMAP

arch/arm/mach-omap2/prm44xx.c

+3 −18
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ static struct omap_prcm_irq_setup omap4_prcm_irq_setup = { 
	.nr_regs		= 2,

	.irqs			= omap4_prcm_irqs,

	.nr_irqs		= ARRAY_SIZE(omap4_prcm_irqs),

	.irq			= 11 + OMAP44XX_IRQ_GIC_START,

	.xlate_irq		= omap4_xlate_irq,

	.read_pending_irqs	= &omap44xx_prm_read_pending_irqs,

	.ocp_barrier		= &omap44xx_prm_ocp_barrier,

	.save_and_clear_irqen	= &omap44xx_prm_save_and_clear_irqen,
@@ -743,23 +741,10 @@ static int omap44xx_prm_late_init(void) 
		return 0;



	irq_num = of_irq_get(prm_init_data->np, 0);

	/*

	 * Already have OMAP4 IRQ num. For all other platforms, we need

	 * IRQ numbers from DT

	 */

	if (irq_num <= 0 && !(prm_init_data->flags & PRM_IRQ_DEFAULT)) {

	if (irq_num == -EPROBE_DEFER)

		return irq_num;



		/* Have nothing to do */

		return 0;

	}



	/* Once OMAP4 DT is filled as well */

	if (irq_num > 0) {

	omap4_prcm_irq_setup.irq = irq_num;

		omap4_prcm_irq_setup.xlate_irq = NULL;

	}



	omap44xx_prm_enable_io_wakeup();

arch/arm/mach-omap2/prm_common.c

+3 −9
Original line number Diff line number Diff line
@@ -218,9 +218,6 @@ void omap_prcm_irq_cleanup(void) 
	kfree(prcm_irq_setup->priority_mask);

	prcm_irq_setup->priority_mask = NULL;



	if (prcm_irq_setup->xlate_irq)

		irq = prcm_irq_setup->xlate_irq(prcm_irq_setup->irq);

	else

	irq = prcm_irq_setup->irq;

	irq_set_chained_handler(irq, NULL);
@@ -307,9 +304,6 @@ int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup) 
				1 << (offset & 0x1f);

	}



	if (irq_setup->xlate_irq)

		irq = irq_setup->xlate_irq(irq_setup->irq);

	else

	irq = irq_setup->irq;

	irq_set_chained_handler(irq, omap_prcm_irq_handler);
@@ -671,7 +665,7 @@ static struct omap_prcm_init_data omap4_prm_data __initdata = { 
	.index = TI_CLKM_PRM,

	.init = omap44xx_prm_init,

	.device_inst_offset = OMAP4430_PRM_DEVICE_INST,

	.flags = PRM_HAS_IO_WAKEUP | PRM_HAS_VOLTAGE | PRM_IRQ_DEFAULT,

	.flags = PRM_HAS_IO_WAKEUP | PRM_HAS_VOLTAGE,

};

#endif