aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-03-21 07:27:25 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-04-08 07:57:27 -0400
commit9a47a8dccf8866b497bd80809da1c665e7b07c2c (patch)
tree6be1e1e5f220e804d1d0ae43a7c3fcd264a42b0b /include/linux/mfd
parenta937536b868b8369b98967929045f1df54234323 (diff)
mfd: prcmu: pass a base and size with the early initcall
This patch will make an early remapping of the PRCMU, to be used when setting up the clocks, that will call down into parts of the PRCMU driver before it is probed. Going forward this will be removed like this: - The mailbox subsystem need to be merged. http://marc.info/?l=linux-kernel&m=136314559201983&w=2 - At this point the PRCMU clock code can be moved over to the ux500 clock driver in drivers/clk/ux500/* and maintained there in a decentralized manner. - This early initcall and PRCMU base parameters become part of the ux500_clk_init() call instead. Cc: Suman Anna <s-anna@ti.com> Cc: Loic Pallardy <loic.pallardy@st.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/db8500-prcmu.h4
-rw-r--r--include/linux/mfd/dbx500-prcmu.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h
index 77a46ae2fc17..ac943df93489 100644
--- a/include/linux/mfd/db8500-prcmu.h
+++ b/include/linux/mfd/db8500-prcmu.h
@@ -489,7 +489,7 @@ struct prcmu_auto_pm_config {
489 489
490#ifdef CONFIG_MFD_DB8500_PRCMU 490#ifdef CONFIG_MFD_DB8500_PRCMU
491 491
492void db8500_prcmu_early_init(void); 492void db8500_prcmu_early_init(u32 phy_base, u32 size);
493int prcmu_set_rc_a2p(enum romcode_write); 493int prcmu_set_rc_a2p(enum romcode_write);
494enum romcode_read prcmu_get_rc_p2a(void); 494enum romcode_read prcmu_get_rc_p2a(void);
495enum ap_pwrst prcmu_get_xp70_current_state(void); 495enum ap_pwrst prcmu_get_xp70_current_state(void);
@@ -553,7 +553,7 @@ void db8500_prcmu_write_masked(unsigned int reg, u32 mask, u32 value);
553 553
554#else /* !CONFIG_MFD_DB8500_PRCMU */ 554#else /* !CONFIG_MFD_DB8500_PRCMU */
555 555
556static inline void db8500_prcmu_early_init(void) {} 556static inline void db8500_prcmu_early_init(u32 phy_base, u32 size) {}
557 557
558static inline int prcmu_set_rc_a2p(enum romcode_write code) 558static inline int prcmu_set_rc_a2p(enum romcode_write code)
559{ 559{
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index 3abcca91eecd..8c546cbcb9a6 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -276,9 +276,9 @@ struct prcmu_fw_version {
276 276
277#if defined(CONFIG_UX500_SOC_DB8500) 277#if defined(CONFIG_UX500_SOC_DB8500)
278 278
279static inline void __init prcmu_early_init(void) 279static inline void prcmu_early_init(u32 phy_base, u32 size)
280{ 280{
281 return db8500_prcmu_early_init(); 281 return db8500_prcmu_early_init(phy_base, size);
282} 282}
283 283
284static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk, 284static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
@@ -500,7 +500,7 @@ static inline int prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
500} 500}
501#else 501#else
502 502
503static inline void __init prcmu_early_init(void) {} 503static inline void prcmu_early_init(u32 phy_base, u32 size) {}
504 504
505static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk, 505static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
506 bool keep_ap_pll) 506 bool keep_ap_pll)