mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-25 13:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

u8500: Moving prcmu to cpu directory

Browse Source 
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>
This commit is contained in:
Mathieu J. Poirier 2012-07-31 08:59:24 +00:00 committed by Albert ARIBAUD
parent 84dee301c3
commit 42cb8fb6cb
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/u8500/Makefile
View File

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

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

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

0
board/st-ericsson/u8500/prcmu-fw.h → arch/arm/include/asm/arch-u8500/prcmu.h
View File

2
board/st-ericsson/u8500/Makefile
View File

@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
CFLAGS += -D__RELEASE -D__STN_8500 CFLAGS += -D__RELEASE -D__STN_8500
LIB = $(obj)lib$(BOARD).o 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) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS))

2
board/st-ericsson/u8500/u8500_href.c
View File

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