u8500: Moving prcmu to cpu directory

This is to allow the prcmu functions to be used by multiple
u8500-based processors.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: John Rigby <john.rigby@linaro.org>

arch/arm/cpu/armv7/u8500/Makefile

@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(SOC).o
 
-COBJS	= timer.o clock.o
+COBJS	= timer.o clock.o prcmu.o
 SOBJS	= lowlevel.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)

board/st-ericsson/u8500/prcmu.c → arch/arm/cpu/armv7/u8500/prcmu.c

@@ -33,8 +33,7 @@
 #include <asm/types.h>
 #include <asm/io.h>
 #include <asm/errno.h>
-
-#include "prcmu-fw.h"
+#include <asm/arch/prcmu.h>
 
 /* CPU mailbox registers */
 #define PRCM_MBOX_CPU_VAL (U8500_PRCMU_BASE + 0x0fc)
@@ -54,16 +53,16 @@ static int _wait_for_req_complete(int num)
 	int timeout = 1000;
 
 	/* checking any already on-going transaction */
-	while ((readl(PRCM_MBOX_CPU_VAL) & (1 << num)) && timeout--)
-		;
+	while ((readl(PRCM_MBOX_CPU_VAL) & (1 << num)) && timeout)
+		timeout--;
 
 	timeout = 1000;
 
 	/* Set an interrupt to XP70 */
 	writel(1 << num, PRCM_MBOX_CPU_SET);
 
-	while ((readl(PRCM_MBOX_CPU_VAL) & (1 << num)) && timeout--)
-		;
+	while ((readl(PRCM_MBOX_CPU_VAL) & (1 << num)) && timeout)
+		timeout--;
 
 	if (!timeout) {
 		printf("PRCMU operation timed out\n");

board/st-ericsson/u8500/Makefile

@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 CFLAGS += -D__RELEASE -D__STN_8500
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= u8500_href.o gpio.o prcmu.o
+COBJS	:= u8500_href.o gpio.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))

board/st-ericsson/u8500/u8500_href.c

@@ -27,7 +27,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #ifdef CONFIG_MMC
-#include "prcmu-fw.h"
+#include <asm/arch/prcmu.h>
 #include "../../../drivers/mmc/arm_pl180_mmci.h"
 #endif