3430SDP: Build break in pm-2.6.29 branch

3430SDP: Build break in pm-2.6.29 branch

[Gadiyar, Anand]

With the omap_3430sdp_pm_defconfig, I get the following build break

  CC      arch/arm/mach-omap2/pm34xx.o
arch/arm/mach-omap2/pm34xx.c: In function 'prcm_interrupt_handler':
arch/arm/mach-omap2/pm34xx.c:286: error: 'OMAP3_PRM_IRQSTATUS_MPU_OFFSET' undeclared (first use in this function)
arch/arm/mach-omap2/pm34xx.c:286: error: (Each undeclared identifier is reported only once
arch/arm/mach-omap2/pm34xx.c:286: error: for each function it appears in.)
make[1]: *** [arch/arm/mach-omap2/pm34xx.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

- Anand

Re: 3430SDP: Build break in pm-2.6.29 branch

[Kevin Hilman]

"Gadiyar, Anand" <gadiyar@ti.com> writes:

> With the omap_3430sdp_pm_defconfig, I get the following build break
>
>   CC      arch/arm/mach-omap2/pm34xx.o
> arch/arm/mach-omap2/pm34xx.c: In function 'prcm_interrupt_handler':
> arch/arm/mach-omap2/pm34xx.c:286: error: 'OMAP3_PRM_IRQSTATUS_MPU_OFFSET' undeclared (first use in this function)
> arch/arm/mach-omap2/pm34xx.c:286: error: (Each undeclared identifier is reported only once
> arch/arm/mach-omap2/pm34xx.c:286: error: for each function it appears in.)
> make[1]: *** [arch/arm/mach-omap2/pm34xx.o] Error 1
> make: *** [arch/arm/mach-omap2] Error 2

Thanks for the report.  This is a problem with my backport of Jon
Hunter's PRCM IRQ rework.

Just pushed the fix below to pm-2.6.29.

Kevin


commit e63cf0710a4fb639d91d3e8b05aa485fbfa381b3
Author: Kevin Hilman <khilman@deeprootsystems.com>
Date:   Thu Aug 13 07:21:15 2009 -0700

    OMAP3: PM: PRCM IRQ rework: fix backport error.
    
    Reported-by: Anand Gadiyar <gadiyar@ti.com>
    Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 1fee053..a064605 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -283,7 +283,7 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
 
 	do {
 		irqstatus_mpu = prm_read_mod_reg(OCP_MOD,
-					OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
+					OMAP2_PRM_IRQSTATUS_MPU_OFFSET);
 
 		if (irqstatus_mpu & (OMAP3430_WKUP_ST | OMAP3430_IO_ST)) {
 			c = _prcm_int_handle_wakeup();
@@ -301,9 +301,9 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
 		}
 
 		prm_write_mod_reg(irqstatus_mpu, OCP_MOD,
-					OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
+					OMAP2_PRM_IRQSTATUS_MPU_OFFSET);
 
-	} while (prm_read_mod_reg(OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET));
+	} while (prm_read_mod_reg(OCP_MOD, OMAP2_PRM_IRQSTATUS_MPU_OFFSET));
 
 	return IRQ_HANDLED;
 }