diff options
| -rw-r--r-- | arch/arm/cpu/armv7/u8500/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/u8500/prcmu.c (renamed from board/st-ericsson/u8500/prcmu.c) | 11 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-u8500/prcmu.h (renamed from board/st-ericsson/u8500/prcmu-fw.h) | 0 | ||||
| -rw-r--r-- | board/st-ericsson/u8500/Makefile | 2 | ||||
| -rw-r--r-- | board/st-ericsson/u8500/u8500_href.c | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/cpu/armv7/u8500/Makefile b/arch/arm/cpu/armv7/u8500/Makefile index 270aa40c88..77accde9c5 100644 --- a/arch/arm/cpu/armv7/u8500/Makefile +++ b/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) diff --git a/board/st-ericsson/u8500/prcmu.c b/arch/arm/cpu/armv7/u8500/prcmu.c index 6f9302f4ab..b256d27b84 100644 --- a/board/st-ericsson/u8500/prcmu.c +++ b/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"); diff --git a/board/st-ericsson/u8500/prcmu-fw.h b/arch/arm/include/asm/arch-u8500/prcmu.h index 0836983fae..0836983fae 100644 --- a/board/st-ericsson/u8500/prcmu-fw.h +++ b/arch/arm/include/asm/arch-u8500/prcmu.h diff --git a/board/st-ericsson/u8500/Makefile b/board/st-ericsson/u8500/Makefile index 4091a428e7..4ea2212188 100644 --- a/board/st-ericsson/u8500/Makefile +++ b/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)) diff --git a/board/st-ericsson/u8500/u8500_href.c b/board/st-ericsson/u8500/u8500_href.c index 5f85fdcbfc..6e3fc87bc0 100644 --- a/board/st-ericsson/u8500/u8500_href.c +++ b/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 |