u8500: Moving prcmu to cpu directory
authorMathieu J. Poirier <mathieu.poirier@linaro.org>
Tue, 31 Jul 2012 08:59:24 +0000 (08:59 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 1 Sep 2012 12:58:19 +0000 (14:58 +0200)
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
arch/arm/cpu/armv7/u8500/prcmu.c [new file with mode: 0644]
arch/arm/include/asm/arch-u8500/prcmu.h [new file with mode: 0644]
board/st-ericsson/u8500/Makefile
board/st-ericsson/u8500/prcmu-fw.h [deleted file]
board/st-ericsson/u8500/prcmu.c [deleted file]
board/st-ericsson/u8500/u8500_href.c

index 270aa40c883b4b2500b9514d86e513347a68c6b7..77accde9c56439d2ce4da4ff77b98a7d432327dd 100644 (file)
@@ -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/arch/arm/cpu/armv7/u8500/prcmu.c b/arch/arm/cpu/armv7/u8500/prcmu.c
new file mode 100644 (file)
index 0000000..b256d27
--- /dev/null
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2009 ST-Ericsson SA
+ *
+ * Adapted from the Linux version:
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ */
+
+/*
+ * NOTE: This currently does not support the I2C workaround access method.
+ */
+
+#include <common.h>
+#include <config.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/types.h>
+#include <asm/io.h>
+#include <asm/errno.h>
+#include <asm/arch/prcmu.h>
+
+/* CPU mailbox registers */
+#define PRCM_MBOX_CPU_VAL (U8500_PRCMU_BASE + 0x0fc)
+#define PRCM_MBOX_CPU_SET (U8500_PRCMU_BASE + 0x100)
+#define PRCM_MBOX_CPU_CLR (U8500_PRCMU_BASE + 0x104)
+
+static int prcmu_is_ready(void)
+{
+       int ready = readb(PRCM_XP70_CUR_PWR_STATE) == AP_EXECUTE;
+       if (!ready)
+               printf("PRCMU firmware not ready\n");
+       return ready;
+}
+
+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)
+               timeout--;
+
+       timeout = 1000;
+
+       /* Set an interrupt to XP70 */
+       writel(1 << num, PRCM_MBOX_CPU_SET);
+
+       while ((readl(PRCM_MBOX_CPU_VAL) & (1 << num)) && timeout)
+               timeout--;
+
+       if (!timeout) {
+               printf("PRCMU operation timed out\n");
+               return -1;
+       }
+
+       return 0;
+}
+
+/**
+ * prcmu_i2c_read - PRCMU - 4500 communication using PRCMU I2C
+ * @reg: - db8500 register bank to be accessed
+ * @slave:  - db8500 register to be accessed
+ * Returns: ACK_MB5  value containing the status
+ */
+int prcmu_i2c_read(u8 reg, u16 slave)
+{
+       uint8_t i2c_status;
+       uint8_t i2c_val;
+
+       if (!prcmu_is_ready())
+               return -1;
+
+       debug("\nprcmu_4500_i2c_read:bank=%x;reg=%x;\n",
+                       reg, slave);
+
+       /* prepare the data for mailbox 5 */
+       writeb((reg << 1) | I2CREAD, PRCM_REQ_MB5_I2COPTYPE_REG);
+       writeb((1 << 3) | 0x0, PRCM_REQ_MB5_BIT_FIELDS);
+       writeb(slave, PRCM_REQ_MB5_I2CSLAVE);
+       writeb(0, PRCM_REQ_MB5_I2CVAL);
+
+       _wait_for_req_complete(REQ_MB5);
+
+       /* retrieve values */
+       debug("ack-mb5:transfer status = %x\n",
+                       readb(PRCM_ACK_MB5_STATUS));
+       debug("ack-mb5:reg bank = %x\n", readb(PRCM_ACK_MB5) >> 1);
+       debug("ack-mb5:slave_add = %x\n",
+                       readb(PRCM_ACK_MB5_SLAVE));
+       debug("ack-mb5:reg_val = %d\n", readb(PRCM_ACK_MB5_VAL));
+
+       i2c_status = readb(PRCM_ACK_MB5_STATUS);
+       i2c_val = readb(PRCM_ACK_MB5_VAL);
+
+       if (i2c_status == I2C_RD_OK)
+               return i2c_val;
+       else {
+
+               printf("prcmu_i2c_read:read return status= %d\n",
+                               i2c_status);
+               return -1;
+       }
+
+}
+
+/**
+ * prcmu_i2c_write - PRCMU-db8500 communication using PRCMU I2C
+ * @reg: - db8500 register bank to be accessed
+ * @slave:  - db800 register to be written to
+ * @reg_data: - the data to write
+ * Returns: ACK_MB5 value containing the status
+ */
+int prcmu_i2c_write(u8 reg, u16 slave, u8 reg_data)
+{
+       uint8_t i2c_status;
+
+       if (!prcmu_is_ready())
+               return -1;
+
+       debug("\nprcmu_4500_i2c_write:bank=%x;reg=%x;\n",
+                       reg, slave);
+
+       /* prepare the data for mailbox 5 */
+       writeb((reg << 1) | I2CWRITE, PRCM_REQ_MB5_I2COPTYPE_REG);
+       writeb((1 << 3) | 0x0, PRCM_REQ_MB5_BIT_FIELDS);
+       writeb(slave, PRCM_REQ_MB5_I2CSLAVE);
+       writeb(reg_data, PRCM_REQ_MB5_I2CVAL);
+
+       debug("\ncpu_is_u8500v11\n");
+       _wait_for_req_complete(REQ_MB5);
+
+       /* retrieve values */
+       debug("ack-mb5:transfer status = %x\n",
+                       readb(PRCM_ACK_MB5_STATUS));
+       debug("ack-mb5:reg bank = %x\n", readb(PRCM_ACK_MB5) >> 1);
+       debug("ack-mb5:slave_add = %x\n",
+                       readb(PRCM_ACK_MB5_SLAVE));
+       debug("ack-mb5:reg_val = %d\n", readb(PRCM_ACK_MB5_VAL));
+
+       i2c_status = readb(PRCM_ACK_MB5_STATUS);
+       debug("\ni2c_status = %x\n", i2c_status);
+       if (i2c_status == I2C_WR_OK)
+               return 0;
+       else {
+               printf("ape-i2c: i2c_status : 0x%x\n", i2c_status);
+               return -1;
+       }
+}
diff --git a/arch/arm/include/asm/arch-u8500/prcmu.h b/arch/arm/include/asm/arch-u8500/prcmu.h
new file mode 100644 (file)
index 0000000..0836983
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2009 ST-Ericsson SA
+ *
+ * Copied from the Linux version:
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __MACH_PRCMU_FW_V1_H
+#define __MACH_PRCMU_FW_V1_H
+
+#define AP_EXECUTE     2
+#define I2CREAD                1
+#define I2C_WR_OK      1
+#define I2C_RD_OK      2
+#define I2CWRITE       0
+
+#define _PRCMU_TCDM_BASE    U8500_PRCMU_TCDM_BASE
+#define PRCM_XP70_CUR_PWR_STATE (_PRCMU_TCDM_BASE + 0xFFC)      /* 4 BYTES */
+
+#define PRCM_REQ_MB5        (_PRCMU_TCDM_BASE + 0xE44)    /* 4 bytes  */
+#define PRCM_ACK_MB5        (_PRCMU_TCDM_BASE + 0xDF4)    /* 4 bytes */
+
+/* Mailbox 5 Requests */
+#define PRCM_REQ_MB5_I2COPTYPE_REG     (PRCM_REQ_MB5 + 0x0)
+#define PRCM_REQ_MB5_BIT_FIELDS                (PRCM_REQ_MB5 + 0x1)
+#define PRCM_REQ_MB5_I2CSLAVE          (PRCM_REQ_MB5 + 0x2)
+#define PRCM_REQ_MB5_I2CVAL            (PRCM_REQ_MB5 + 0x3)
+
+/* Mailbox 5 ACKs */
+#define PRCM_ACK_MB5_STATUS    (PRCM_ACK_MB5 + 0x1)
+#define PRCM_ACK_MB5_SLAVE     (PRCM_ACK_MB5 + 0x2)
+#define PRCM_ACK_MB5_VAL       (PRCM_ACK_MB5 + 0x3)
+
+#define LOW_POWER_WAKEUP       1
+#define EXE_WAKEUP             0
+
+#define REQ_MB5                        5
+
+extern int prcmu_i2c_read(u8 reg, u16 slave);
+extern int prcmu_i2c_write(u8 reg, u16 slave, u8 reg_data);
+
+#endif /* __MACH_PRCMU_FW_V1_H */
index 4091a428e72af1333b9f1a22dc5948d94ba2ea9e..4ea22121881196abf75a6772835bc1d4606602d5 100644 (file)
@@ -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/prcmu-fw.h b/board/st-ericsson/u8500/prcmu-fw.h
deleted file mode 100644 (file)
index 0836983..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2009 ST-Ericsson SA
- *
- * Copied from the Linux version:
- * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef __MACH_PRCMU_FW_V1_H
-#define __MACH_PRCMU_FW_V1_H
-
-#define AP_EXECUTE     2
-#define I2CREAD                1
-#define I2C_WR_OK      1
-#define I2C_RD_OK      2
-#define I2CWRITE       0
-
-#define _PRCMU_TCDM_BASE    U8500_PRCMU_TCDM_BASE
-#define PRCM_XP70_CUR_PWR_STATE (_PRCMU_TCDM_BASE + 0xFFC)      /* 4 BYTES */
-
-#define PRCM_REQ_MB5        (_PRCMU_TCDM_BASE + 0xE44)    /* 4 bytes  */
-#define PRCM_ACK_MB5        (_PRCMU_TCDM_BASE + 0xDF4)    /* 4 bytes */
-
-/* Mailbox 5 Requests */
-#define PRCM_REQ_MB5_I2COPTYPE_REG     (PRCM_REQ_MB5 + 0x0)
-#define PRCM_REQ_MB5_BIT_FIELDS                (PRCM_REQ_MB5 + 0x1)
-#define PRCM_REQ_MB5_I2CSLAVE          (PRCM_REQ_MB5 + 0x2)
-#define PRCM_REQ_MB5_I2CVAL            (PRCM_REQ_MB5 + 0x3)
-
-/* Mailbox 5 ACKs */
-#define PRCM_ACK_MB5_STATUS    (PRCM_ACK_MB5 + 0x1)
-#define PRCM_ACK_MB5_SLAVE     (PRCM_ACK_MB5 + 0x2)
-#define PRCM_ACK_MB5_VAL       (PRCM_ACK_MB5 + 0x3)
-
-#define LOW_POWER_WAKEUP       1
-#define EXE_WAKEUP             0
-
-#define REQ_MB5                        5
-
-extern int prcmu_i2c_read(u8 reg, u16 slave);
-extern int prcmu_i2c_write(u8 reg, u16 slave, u8 reg_data);
-
-#endif /* __MACH_PRCMU_FW_V1_H */
diff --git a/board/st-ericsson/u8500/prcmu.c b/board/st-ericsson/u8500/prcmu.c
deleted file mode 100644 (file)
index 6f9302f..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2009 ST-Ericsson SA
- *
- * Adapted from the Linux version:
- * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- */
-
-/*
- * NOTE: This currently does not support the I2C workaround access method.
- */
-
-#include <common.h>
-#include <config.h>
-#include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/types.h>
-#include <asm/io.h>
-#include <asm/errno.h>
-
-#include "prcmu-fw.h"
-
-/* CPU mailbox registers */
-#define PRCM_MBOX_CPU_VAL (U8500_PRCMU_BASE + 0x0fc)
-#define PRCM_MBOX_CPU_SET (U8500_PRCMU_BASE + 0x100)
-#define PRCM_MBOX_CPU_CLR (U8500_PRCMU_BASE + 0x104)
-
-static int prcmu_is_ready(void)
-{
-       int ready = readb(PRCM_XP70_CUR_PWR_STATE) == AP_EXECUTE;
-       if (!ready)
-               printf("PRCMU firmware not ready\n");
-       return ready;
-}
-
-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--)
-               ;
-
-       timeout = 1000;
-
-       /* Set an interrupt to XP70 */
-       writel(1 << num, PRCM_MBOX_CPU_SET);
-
-       while ((readl(PRCM_MBOX_CPU_VAL) & (1 << num)) && timeout--)
-               ;
-
-       if (!timeout) {
-               printf("PRCMU operation timed out\n");
-               return -1;
-       }
-
-       return 0;
-}
-
-/**
- * prcmu_i2c_read - PRCMU - 4500 communication using PRCMU I2C
- * @reg: - db8500 register bank to be accessed
- * @slave:  - db8500 register to be accessed
- * Returns: ACK_MB5  value containing the status
- */
-int prcmu_i2c_read(u8 reg, u16 slave)
-{
-       uint8_t i2c_status;
-       uint8_t i2c_val;
-
-       if (!prcmu_is_ready())
-               return -1;
-
-       debug("\nprcmu_4500_i2c_read:bank=%x;reg=%x;\n",
-                       reg, slave);
-
-       /* prepare the data for mailbox 5 */
-       writeb((reg << 1) | I2CREAD, PRCM_REQ_MB5_I2COPTYPE_REG);
-       writeb((1 << 3) | 0x0, PRCM_REQ_MB5_BIT_FIELDS);
-       writeb(slave, PRCM_REQ_MB5_I2CSLAVE);
-       writeb(0, PRCM_REQ_MB5_I2CVAL);
-
-       _wait_for_req_complete(REQ_MB5);
-
-       /* retrieve values */
-       debug("ack-mb5:transfer status = %x\n",
-                       readb(PRCM_ACK_MB5_STATUS));
-       debug("ack-mb5:reg bank = %x\n", readb(PRCM_ACK_MB5) >> 1);
-       debug("ack-mb5:slave_add = %x\n",
-                       readb(PRCM_ACK_MB5_SLAVE));
-       debug("ack-mb5:reg_val = %d\n", readb(PRCM_ACK_MB5_VAL));
-
-       i2c_status = readb(PRCM_ACK_MB5_STATUS);
-       i2c_val = readb(PRCM_ACK_MB5_VAL);
-
-       if (i2c_status == I2C_RD_OK)
-               return i2c_val;
-       else {
-
-               printf("prcmu_i2c_read:read return status= %d\n",
-                               i2c_status);
-               return -1;
-       }
-
-}
-
-/**
- * prcmu_i2c_write - PRCMU-db8500 communication using PRCMU I2C
- * @reg: - db8500 register bank to be accessed
- * @slave:  - db800 register to be written to
- * @reg_data: - the data to write
- * Returns: ACK_MB5 value containing the status
- */
-int prcmu_i2c_write(u8 reg, u16 slave, u8 reg_data)
-{
-       uint8_t i2c_status;
-
-       if (!prcmu_is_ready())
-               return -1;
-
-       debug("\nprcmu_4500_i2c_write:bank=%x;reg=%x;\n",
-                       reg, slave);
-
-       /* prepare the data for mailbox 5 */
-       writeb((reg << 1) | I2CWRITE, PRCM_REQ_MB5_I2COPTYPE_REG);
-       writeb((1 << 3) | 0x0, PRCM_REQ_MB5_BIT_FIELDS);
-       writeb(slave, PRCM_REQ_MB5_I2CSLAVE);
-       writeb(reg_data, PRCM_REQ_MB5_I2CVAL);
-
-       debug("\ncpu_is_u8500v11\n");
-       _wait_for_req_complete(REQ_MB5);
-
-       /* retrieve values */
-       debug("ack-mb5:transfer status = %x\n",
-                       readb(PRCM_ACK_MB5_STATUS));
-       debug("ack-mb5:reg bank = %x\n", readb(PRCM_ACK_MB5) >> 1);
-       debug("ack-mb5:slave_add = %x\n",
-                       readb(PRCM_ACK_MB5_SLAVE));
-       debug("ack-mb5:reg_val = %d\n", readb(PRCM_ACK_MB5_VAL));
-
-       i2c_status = readb(PRCM_ACK_MB5_STATUS);
-       debug("\ni2c_status = %x\n", i2c_status);
-       if (i2c_status == I2C_WR_OK)
-               return 0;
-       else {
-               printf("ape-i2c: i2c_status : 0x%x\n", i2c_status);
-               return -1;
-       }
-}
index 5f85fdcbfc30dd463e2b3d25d1fc07b47de6faa7..6e3fc87bc041113b2459756bc34af2da7c459257 100644 (file)
@@ -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