From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH] ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge Date: Fri, 29 Jun 2012 07:20:32 -0700 Message-ID: <20120629142032.GI4202@atomide.com> References: <1340978614-12558-1-git-send-email-khilman@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:32019 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751080Ab2F2OUf (ORCPT ); Fri, 29 Jun 2012 10:20:35 -0400 Content-Disposition: inline In-Reply-To: <1340978614-12558-1-git-send-email-khilman@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Kevin Hilman Cc: linux-omap@vger.kernel.org, Javier Martinez Canillas , linux-arm-kernel@lists.infradead.org, Paul Walmsley * Kevin Hilman [120629 07:08]: > commit 99b59df0 (ARM: OMAP3: PM: fix shared PRCM interrupt leave > disabled at boot) added IRQ_NOAUTOEN to the PRCM interrupt so it could > be enabled later if needed. However, this commit was partially undone > when merging the IO daisy chain rework in 9a17d88e (Merge tag > 'omap-devel-c-for-3.6' of > git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into > devel-pm > > This patch adds back the IRQ_NOAUTOEN fix that was removed by the > merge resolution. > > This also fixes the following boot-time warning that showed up after > merging the IO daisy chain rework: > > [ 3.849334] WARNING: at kernel/irq/manage.c:436 enable_irq+0x3c/0x78() > [ 3.856231] Unbalanced enable for IRQ 297 > [ 3.860473] Modules linked in: > [ 3.863739] [] (unwind_backtrace+0x0/0xf0) from [] (warn_slowpath_common+0x4c/0x64) > [ 3.873687] [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_fmt+0x30/0x40) > [ 3.883819] [] (warn_slowpath_fmt+0x30/0x40) from [] (enable_irq+0x3c/0x78) > [ 3.893035] [] (enable_irq+0x3c/0x78) from [] (omap3_pm_init+0x328/0x5f4) > [ 3.902099] [] (omap3_pm_init+0x328/0x5f4) from [] (init_machine_late+0x1c/0x28) > [ 3.911773] [] (init_machine_late+0x1c/0x28) from [] (do_one_initcall+0x34/0x178) > [ 3.921539] [] (do_one_initcall+0x34/0x178) from [] (kernel_init+0xfc/0x1c0) > [ 3.930847] [] (kernel_init+0xfc/0x1c0) from [] (kernel_thread_exit+0x0/0x8) > [ 3.940246] ---[ end trace 55a0ad32ca2ca682 ]--- > > Reported-by: Javier Martinez Canillas > Cc: Paul Walmsley > Signed-off-by: Kevin Hilman > --- > Tony, this applies on top of your current devel-pm branch. Thanks applying into devel-pm. Tony