linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Maxime Coquelin <maxime.coquelin@stericsson.com>
Subject: [PATCH 05/17] mfd: dbx500-prcmu: Handle TCDM mapping
Date: Wed, 5 Sep 2012 11:59:01 +0200	[thread overview]
Message-ID: <1346839153-6465-6-git-send-email-loic.pallardy-ext@stericsson.com> (raw)
In-Reply-To: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com>

Signed-off-by: Loic Pallardy <loic.pallardy@stericsson.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-ux500/cpu.c        | 2 +-
 drivers/mfd/db8500-prcmu.c       | 2 +-
 include/linux/mfd/db8500-prcmu.h | 4 ++--
 include/linux/mfd/dbx500-prcmu.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 4a5177b..08672be 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -9,7 +9,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/clk.h>
-#include <linux/mfd/db8500-prcmu.h>
+#include <linux/mfd/dbx500-prcmu.h>
 #include <linux/clksrc-dbx500-prcmu.h>
 #include <linux/sys_soc.h>
 #include <linux/err.h>
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index de09113..1d2fb45 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2668,7 +2668,7 @@ static int db8500_irq_init(struct device_node *np)
 	return 0;
 }
 
-void __init db8500_prcmu_early_init(void)
+void __init db8500_prcmu_early_init(struct prcmu_tcdm_map *map)
 {
 	if (cpu_is_u8500v2()) {
 		void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K);
diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h
index b82f6ee..f932a56 100644
--- a/include/linux/mfd/db8500-prcmu.h
+++ b/include/linux/mfd/db8500-prcmu.h
@@ -509,7 +509,7 @@ struct prcmu_fw_version {
 
 #ifdef CONFIG_MFD_DB8500_PRCMU
 
-void db8500_prcmu_early_init(void);
+void db8500_prcmu_early_init(struct prcmu_tcdm_map *map);
 int prcmu_set_rc_a2p(enum romcode_write);
 enum romcode_read prcmu_get_rc_p2a(void);
 enum ap_pwrst prcmu_get_xp70_current_state(void);
@@ -573,7 +573,7 @@ void db8500_prcmu_write_masked(unsigned int reg, u32 mask, u32 value);
 
 #else /* !CONFIG_MFD_DB8500_PRCMU */
 
-static inline void db8500_prcmu_early_init(void) {}
+static inline void db8500_prcmu_early_init(struct prcmu_tcdm_map *map) {}
 
 static inline int prcmu_set_rc_a2p(enum romcode_write code)
 {
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index 55025ba..aab183d 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -226,7 +226,7 @@ struct prcmu_tcdm_map {
 
 static inline void __init prcmu_early_init(struct prcmu_tcdm_map *map)
 {
-	return db8500_prcmu_early_init();
+	return db8500_prcmu_early_init(map);
 }
 
 static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
-- 
1.7.11.1


  parent reply	other threads:[~2012-09-05  9:59 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 ` Loic Pallardy [this message]
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 ` [PATCH 12/17] mfd: prcmu: make fw_project_name generic Loic Pallardy
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-6-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=maxime.coquelin@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;
as well as URLs for NNTP newsgroup(s).