From: Tony Lindgren <tony@atomide.com>
Date: Wed, 4 Jun 2008 19:21:21 +0000 (-0700)
Subject: ARM: OMAP: Remove duplicate PRM defines, use prm_read/write_mod_reg()
X-Git-Tag: v2.6.26-omap1~123^2~16
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=204b13bda11061f987a093ca1b0d1f71b122bdaa;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Remove duplicate PRM defines, use prm_read/write_mod_reg()

Remove duplicate PRM defines, use prm_read/write_mod_reg()

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 7e775cc2b20..f8d11c7e50d 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -131,9 +131,12 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
 		}
 	}
 
-	irqstatus_mpu = __raw_readl(OMAP3430_PRM_IRQSTATUS_MPU);
-	__raw_writel(irqstatus_mpu, OMAP3430_PRM_IRQSTATUS_MPU);
-	while (__raw_readl(OMAP3430_PRM_IRQSTATUS_MPU));
+	irqstatus_mpu = prm_read_mod_reg(OCP_MOD,
+					OMAP3430_PRM_IRQSTATUS_MPU_OFFSET);
+	prm_write_mod_reg(irqstatus_mpu, OCP_MOD,
+					OMAP3430_PRM_IRQSTATUS_MPU_OFFSET);
+
+	while (prm_read_mod_reg(OCP_MOD, OMAP3430_PRM_IRQSTATUS_MPU_OFFSET));
 
 	return IRQ_HANDLED;
 }
@@ -320,8 +323,6 @@ static struct platform_suspend_ops omap_pm_ops = {
 
 static void __init prcm_setup_regs(void)
 {
-	u32 v;
-
 	/* setup wakup source */
 	prm_write_mod_reg(OMAP3430_EN_IO | OMAP3430_EN_GPIO1 | OMAP3430_EN_GPT1,
 			  WKUP_MOD, PM_WKEN);
@@ -330,8 +331,8 @@ static void __init prcm_setup_regs(void)
 			  WKUP_MOD, OMAP3430_PM_MPUGRPSEL);
 	/* For some reason IO doesn't generate wakeup event even if
 	 * it is selected to mpu wakeup goup */
-	__raw_writel(OMAP3430_IO_EN | OMAP3430_WKUP_EN,
-		     OMAP3430_PRM_IRQENABLE_MPU);
+	prm_write_mod_reg(OMAP3430_IO_EN | OMAP3430_WKUP_EN,
+			OCP_MOD, OMAP3430_PRM_IRQENABLE_MPU_OFFSET);
 }
 
 static int __init pwrdms_setup(struct powerdomain *pwrdm)
diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h
index aad5093ce9c..f7dac2e3b27 100644
--- a/arch/arm/mach-omap2/prm.h
+++ b/arch/arm/mach-omap2/prm.h
@@ -94,11 +94,6 @@
 #define OMAP3_PRM_CLKSEL_OFFSET			0x0040
 #define OMAP3_PRM_CLKOUT_CTRL_OFFSET		0x0070
 
-/* These will disappear */
-
-#define OMAP3430_PRM_IRQSTATUS_MPU	OMAP34XX_PRM_REGADDR(OCP_MOD, 0x0018)
-#define OMAP3430_PRM_IRQENABLE_MPU	OMAP34XX_PRM_REGADDR(OCP_MOD, 0x001c)
-
 /*
  * Module specific PRM registers from PRM_BASE + domain offset
  *