diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-06-12 10:07:44 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-06-12 10:07:44 +0300 |
| commit | 018b732458ac39c4858d9840c0e32310bc0930dd (patch) | |
| tree | 84f178b1fe40e67eeb8dc523686f73a02dc5cb00 /arch/arm/mach-omap2/prm_common.c | |
| parent | c76e4d2e50068ddd82fe18f86d05a33733877059 (diff) | |
| parent | 0e78b1218df37f1a1834dff853d967444e332bab (diff) | |
| download | linux-018b732458ac39c4858d9840c0e32310bc0930dd.tar.xz | |
Merge branch 'omap-for-v4.13/legacy-v2' into omap-for-v4.13/soc-v3
Diffstat (limited to 'arch/arm/mach-omap2/prm_common.c')
| -rw-r--r-- | arch/arm/mach-omap2/prm_common.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c index 2b138b65129a..538980ee20d4 100644 --- a/arch/arm/mach-omap2/prm_common.c +++ b/arch/arm/mach-omap2/prm_common.c @@ -267,10 +267,9 @@ int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup) { int nr_regs; u32 mask[OMAP_PRCM_MAX_NR_PENDING_REG]; - int offset, i; + int offset, i, irq; struct irq_chip_generic *gc; struct irq_chip_type *ct; - unsigned int irq; if (!irq_setup) return -EINVAL; @@ -344,10 +343,8 @@ int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup) prcm_irq_chips[i] = gc; } - if (of_have_populated_dt()) { - int irq = omap_prcm_event_to_irq("io"); - omap_pcs_legacy_init(irq, irq_setup->reconfigure_io_chain); - } + irq = omap_prcm_event_to_irq("io"); + omap_pcs_legacy_init(irq, irq_setup->reconfigure_io_chain); return 0; |