ARM: OMAP: Moved prcm.h to include, changed system.h to use it

Moved prcm.h to include, changed system.h to use it

arch/arm/mach-omap2/clock.c

@@ -28,8 +28,8 @@
 #include <asm/hardware/clock.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sram.h>
+#include <asm/arch/prcm.h>
 
-#include "prcm.h"
 #include "clock.h"
 
 //#define DOWN_VARIABLE_DPLL 1			/* Experimental */

arch/arm/mach-omap2/sram-fn.S

@@ -28,7 +28,7 @@
 #include <asm/arch/io.h>
 #include <asm/hardware.h>
 
-#include "prcm.h"
+#include <asm/arch/prcm.h>
 
 #define TIMER_32KSYNCT_CR_V	IO_ADDRESS(OMAP24XX_32KSYNCT_BASE + 0x010)
 	

include/asm-arm/arch-omap/system.h

@@ -7,14 +7,13 @@
 #include <linux/config.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
-#include <asm/arch/clock.h>
+#include <asm/hardware/clock.h>
+#include <asm/arch/prcm.h>
 
 #ifndef CONFIG_MACH_VOICEBLUE
 #define voiceblue_reset()		do {} while (0)
 #endif
 
-#define OMAP24XX_PM_RSTCTRL_WKUP	(OMAP24XX_PRCM_BASE + 0x450)
-
 static inline void arch_idle(void)
 {
 	cpu_do_idle();
@@ -40,14 +39,14 @@ static inline void omap1_arch_reset(char mode)
 
 static inline void omap2_arch_reset(char mode)
 {
-	u32 flags, rate;
+	u32 rate;
         struct clk *vclk, *sclk;
 
         vclk = clk_get(NULL, "virt_prcm_set");
         sclk = clk_get(NULL, "sys_ck");
         rate = clk_get_rate(sclk);
         clk_set_rate(vclk, rate);	/* go to bypass for OMAP limitation */
-        omap_writel(0x2, OMAP24XX_PM_RSTCTRL_WKUP);
+        omap_writel(0x2, RM_RSTCTRL_WKUP);
 }
 
 static inline void arch_reset(char mode)