From: Loic Pallardy <loic.pallardy-ext@stericsson.com>
To: Samuel Ortiz <sameo@linux.intel.com>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Linus Walleij <linus.walleij@linaro.com>
Cc: Lee Jones <lee.jones@linaro.org>,
Loic Pallardy <loic.pallardy@gmail.com>,
LT ST-Ericsson <st-ericsson@lists.linaro.org>,
STEricsson_nomadik_linux <STEricsson_nomadik_linux@list.st.com>,
Loic Pallardy <loic.pallardy-ext@stericsson.com>,
Loic Pallardy <loic.pallardy@stericsson.com>
Subject: [PATCH 12/17] mfd: prcmu: make fw_project_name generic
Date: Wed, 5 Sep 2012 11:59:08 +0200 [thread overview]
Message-ID: <1346839153-6465-13-git-send-email-loic.pallardy-ext@stericsson.com> (raw)
In-Reply-To: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com>
Project_name_id must be increased to support 8500 and x540 project.
Signed-off-by: Loic Pallardy <loic.pallardy@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/mfd/db8500-prcmu.c | 4 +++-
include/linux/mfd/db8500-prcmu.h | 14 --------------
include/linux/mfd/dbx500-prcmu.h | 17 +++++++++++++++++
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 96487a0..327e9f6 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2335,7 +2335,7 @@ static struct irq_chip prcmu_irq_chip = {
.irq_unmask = prcmu_irq_unmask,
};
-static char *fw_project_name(u8 project)
+char *fw_project_name(u32 project)
{
switch (project) {
case PRCMU_FW_PROJECT_U8500:
@@ -2350,6 +2350,8 @@ static char *fw_project_name(u8 project)
return "U8520";
case PRCMU_FW_PROJECT_U8420:
return "U8420";
+ case PRCMU_FW_PROJECT_U9540:
+ return "U9540";
default:
return "Unknown";
}
diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h
index a6d7298..f3b8b60 100644
--- a/include/linux/mfd/db8500-prcmu.h
+++ b/include/linux/mfd/db8500-prcmu.h
@@ -470,20 +470,6 @@ struct prcmu_auto_pm_config {
u8 sva_policy;
};
-#define PRCMU_FW_PROJECT_U8500 2
-#define PRCMU_FW_PROJECT_U9500 4
-#define PRCMU_FW_PROJECT_U8500_C2 7
-#define PRCMU_FW_PROJECT_U9500_C2 11
-#define PRCMU_FW_PROJECT_U8520 13
-#define PRCMU_FW_PROJECT_U8420 14
-
-struct prcmu_fw_version {
- u8 project;
- u8 api_version;
- u8 func_version;
- u8 errata;
-};
-
#ifdef CONFIG_MFD_DB8500_PRCMU
struct prcmu_fops_register_data *db8500_prcmu_early_init(
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index d76114e..49e71a7 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -235,6 +235,23 @@ struct prcmu_tcdm_map {
u32 legacy_offset;
};
+#define PRCMU_FW_PROJECT_U8500 2
+#define PRCMU_FW_PROJECT_U9500 4 /* Customer specific */
+#define PRCMU_FW_PROJECT_U8500_C2 7
+#define PRCMU_FW_PROJECT_U9500_C2 11 /* Customer specific */
+#define PRCMU_FW_PROJECT_U8520 13
+#define PRCMU_FW_PROJECT_U8420 14
+#define PRCMU_FW_PROJECT_U9540 (6<<8)
+
+#define PRCMU_FW_PROJECT_NAME_LEN 20
+struct prcmu_fw_version {
+ u8 project;
+ u8 api_version;
+ u8 func_version;
+ u8 errata;
+ char project_name[PRCMU_FW_PROJECT_NAME_LEN];
+};
+
#include <linux/mfd/db8500-prcmu.h>
#if defined(CONFIG_UX500_SOC_DB8500)
--
1.7.11.1
next prev parent reply other threads:[~2012-09-05 10:03 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 9:58 [PATCH 00/17] Add ST-Ericsson U9540 support Loic Pallardy
2012-09-05 9:58 ` [PATCH 01/17] arm: ux500: add u9540 pin configuration Loic Pallardy
2012-09-05 9:58 ` [PATCH 02/17] arm: ux500: add ccu9540 board support Loic Pallardy
2012-09-05 10:42 ` Arnd Bergmann
2012-09-05 11:38 ` Loic PALLARDY
2012-09-05 12:08 ` Linus Walleij
2012-09-05 12:11 ` Arnd Bergmann
2012-09-05 12:41 ` [st-ericsson] " Linus Walleij
2012-09-05 9:58 ` [PATCH 03/17] arm: ux500: Create board-specific IRQ init callback Loic Pallardy
2012-09-05 9:59 ` [PATCH 04/17] mfd: dbx500-prcmu: Introduce TCDM mapping struct Loic Pallardy
2012-09-05 9:59 ` [PATCH 05/17] mfd: dbx500-prcmu: Handle TCDM mapping Loic Pallardy
2012-09-05 9:59 ` [PATCH 06/17] arm: ux500: Add u9540 PRCMU TCDM configuration Loic Pallardy
2012-09-05 9:59 ` [PATCH 07/17] mfd: prcmu: configurable tcdm base address Loic Pallardy
2012-09-05 9:59 ` [PATCH 08/17] arm: ux500: update DB internal irq nb Loic Pallardy
2012-09-05 9:59 ` [PATCH 09/17] mfd: prcmu: add db9540 support Loic Pallardy
2012-09-05 9:59 ` [PATCH 10/17] mfd: prcmu: dbx500-prmcu creation Loic Pallardy
2012-09-05 9:59 ` [PATCH 11/17] mfd: pcrmu: create common header file for legacy mailbox Loic Pallardy
2012-09-05 9:59 ` Loic Pallardy [this message]
2012-09-05 9:59 ` [PATCH 13/17] mfd: prcmu: make legacy mailbox services configurable Loic Pallardy
2012-09-05 9:59 ` [PATCH 14/17] mfd: db8500-prcmu: use db8500 legacy services Loic Pallardy
2012-09-05 11:01 ` Arnd Bergmann
2012-09-05 9:59 ` [PATCH 15/17] mfd: dbx540-prcmu creation Loic Pallardy
2012-09-05 12:10 ` Arnd Bergmann
2012-09-05 12:39 ` [st-ericsson] " Linus Walleij
2012-09-05 12:52 ` Arnd Bergmann
2012-09-05 9:59 ` [PATCH 16/17] arm: ux500: add dbx540 prcmu platform data Loic Pallardy
2012-09-05 9:59 ` [PATCH 17/17] mfd: db8500-prcmu: activate dbx540-prcmu driver Loic Pallardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346839153-6465-13-git-send-email-loic.pallardy-ext@stericsson.com \
--to=loic.pallardy-ext@stericsson.com \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.pallardy@gmail.com \
--cc=loic.pallardy@stericsson.com \
--cc=sameo@linux.intel.com \
--cc=st-ericsson@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®