ARM: imx: Fix build error due to missing irqs.h include

Commit Message

Fabio Estevam July 4, 2012, 1:25 a.m. UTC

From: Fabio Estevam <[e-mail]>

commit bc8966 (ARM: fiq: change FIQ_START to a variable) introduced the 
following build error for imx_v4_v5_defconfig:

arch/arm/plat-mxc/avic.c:220:11: error: 'FIQ_START' undeclared (first use in this function)

Include the missing header file to fix it.

Signed-off-by: Fabio Estevam <[e-mail]>
---
 arch/arm/plat-mxc/avic.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Arnd Bergmann July 4, 2012, 8:44 a.m. UTC | #1

On Wednesday 04 July 2012, Shawn Guo wrote:
> 
> Dammit.  I forgot testing imx_v4_v5_defconfig again with the last FIQ
> change.  Thanks, Fabio.
> 
> Arnd,
> 
> I just updated the branch imx/sparse-irq with this fix applied.  Can
> you please pull it?

In the train at the moment without internet access, so I just applied
the patch and added your S-o-b, on top of the next/irq branch.

	Arnd

Russell King - ARM Linux July 4, 2012, 9:53 a.m. UTC | #2

On Wed, Jul 04, 2012 at 11:30:22AM +0800, Shawn Guo wrote:
> Dammit.  I forgot testing imx_v4_v5_defconfig again with the last FIQ
> change.  Thanks, Fabio.

So, this begs the question - which configs have you tested this series with?

Shawn Guo July 4, 2012, 1:25 p.m. UTC | #3

On Wed, Jul 04, 2012 at 10:53:02AM +0100, Russell King - ARM Linux wrote:
> On Wed, Jul 04, 2012 at 11:30:22AM +0800, Shawn Guo wrote:
> > Dammit.  I forgot testing imx_v4_v5_defconfig again with the last FIQ
> > change.  Thanks, Fabio.
> 
> So, this begs the question - which configs have you tested this series with?

For the patch changing FIQ_START to variable, I tested the following
defconfigs.

rpc_defconfig
s3c2410_defconfig
imx_v6_v7_defconfig

As avic.c is built with imx_v6_v7_defconfig as well, I thought it's
been covered there.  But it turns out that CONFIG_FIQ is not enabled
by imx_v6_v7_defconfig in any way, while it's enabled for
imx_v4_v5_defconfig because there are a couple of imx_v4_v5 audio
drivers selecting the symbol.

sound/soc/fsl/Kconfig:

config SND_SOC_IMX_PCM_FIQ
        tristate
        select FIQ
        select SND_SOC_IMX_PCM

Patch

diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c
index f3d671f..cbd55c3 100644
--- a/arch/arm/plat-mxc/avic.c
+++ b/arch/arm/plat-mxc/avic.c
@@ -26,6 +26,7 @@ 
 #include <asm/mach/irq.h>
 #include <asm/exception.h>
 #include <mach/hardware.h>
+#include <mach/irqs.h>
 
 #include "irq-common.h"