Skip to contentSkip to conversation

ARM: OMAP2+: Fix prm2xxx_3xxx.c INT_34XX_PRCM_MPU_IRQ build error

PATCH New Cousson, Benoit 2 participants 3 messages Feb 9, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP powerdomain SoC adaptation layer support
lore
Share & tools
lore

Cousson, Benoit

author
#0 lore raw

PATCH 1/1 ARM: OMAP2+: Fix prm2xxx_3xxx.c INT_34XX_PRCM_MPU_IRQ build error

If CONFIG_OF is not defined, the following error will happen.

arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error:
?INT_34XX_PRCM_MPU_IRQ? undeclared here (not in a function)

This is due to some hidden headers path from linux/of.h to plat/irqs.h already reported by Russell for prm4xxx.c.

Add the #include <plat/irqs.h> in prm2xxx_3xxx.c to avoid depending of that hidden dependency that should probably not exist in theory.

Signed-off-by Benoit Cousson <[email protected]>
---
 arch/arm/mach-omap2/prm2xxx_3xxx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/prm2xxx_3xxx.c +1 -0
index c1c4d86..09e2916 100644
@@ -18,6 +18,7 @@
 
 #include "common.h"
 #include <plat/cpu.h>
+#include <plat/irqs.h>
 #include <plat/prcm.h>
 
 #include "vp.h"
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/1 ARM: OMAP2+: Fix prm2xxx_3xxx.c INT_34XX_PRCM_MPU_IRQ build error

Quoted 7 lines · Benoit

If CONFIG_OF is not defined, the following error will happen.

arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error:
?INT_34XX_PRCM_MPU_IRQ? undeclared here (not in a function)

This is due to some hidden headers path from linux/of.h to plat/irqs.h already reported by Russell for prm4xxx.c.

I have the following commit from mainline. I suspect you have an old tree.

Note: for the next merge window, I'm removing the asm/irq.h include from asm/prom.h so that this kind of thing doesn't happen in the future.

commit d19e8f2e44a34b2a461f67ce9d0cb5bd43197c1e

Author: Paul Walmsley <[email protected]>
Date:   Wed Jan 25 12:57:49 2012 -0700

ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage

Commit 22f51371f8c35869ed850f46aa76b6cc2b502110 ("ARM: OMAP3: pm: use prcm chain handler") breaks the build on a 2420-only config, due to a missing include for plat/irqs.h:

CC arch/arm/mach-omap2/prm2xxx_3xxx.o
arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error: 'INT_34XX_PRCM_MPU_IRQ' undeclared here (not in a function)

Fix by explicitly including it.

Signed-off-by Paul Walmsley <[email protected]>
Cc Tero Kristo <[email protected]>
Cc Kevin Hilman <[email protected]>
arch/arm/mach-omap2/prm2xxx_3xxx.c +1 -0
index c1c4d86..9ce7654 100644
@@ -19,6 +19,7 @@
 #include "common.h"
 #include <plat/cpu.h>
 #include <plat/prcm.h>
+#include <plat/irqs.h>
 
 #include "vp.h"
author
#2 lore raw

PATCH 1/1 ARM: OMAP2+: Fix prm2xxx_3xxx.c INT_34XX_PRCM_MPU_IRQ build error

Quoted 11 lines · Russell King - ARM Linux
Quoted 7 lines · Benoit

If CONFIG_OF is not defined, the following error will happen.

arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error:
?INT_34XX_PRCM_MPU_IRQ? undeclared here (not in a function)

This is due to some hidden headers path from linux/of.h to plat/irqs.h already reported by Russell for prm4xxx.c.

I have the following commit from mainline. I suspect you have an old tree.

OK, it was part of the fixes Tony sent for for v3.3-rc2 but that are were not in mainline until now.
I've just pulled -rc3 and this is indeed there.

Thanks,
Benoit

Quoted 35 lines

Note: for the next merge window, I'm removing the asm/irq.h include from asm/prom.h so that this kind of thing doesn't happen in the future.

commit d19e8f2e44a34b2a461f67ce9d0cb5bd43197c1e

Author: Paul Walmsley<[email protected]>
Date:   Wed Jan 25 12:57:49 2012 -0700

ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage

Commit 22f51371f8c35869ed850f46aa76b6cc2b502110 ("ARM: OMAP3: pm: use prcm chain handler") breaks the build on a 2420-only config, due to a missing include for plat/irqs.h:

CC arch/arm/mach-omap2/prm2xxx_3xxx.o
arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error: 'INT_34XX_PRCM_MPU_IRQ' undeclared here (not in a function)

Fix by explicitly including it.

Signed-off-by Paul Walmsley<[email protected]>
Cc Tero Kristo<[email protected]>
Cc Kevin Hilman<[email protected]>
arch/arm/mach-omap2/prm2xxx_3xxx.c +1 -0
index c1c4d86..9ce7654 100644
@@ -19,6 +19,7 @@
  #include "common.h"
  #include<plat/cpu.h>
  #include<plat/prcm.h>
+#include<plat/irqs.h>
 
  #include "vp.h"