diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2012-02-28 16:46:07 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-06 12:46:55 -0500 |
commit | 9f60d33e1811e0aa696a3152050d6e3e4c3195aa (patch) | |
tree | 7cf702dca14b1be0e310b6c45d2c71b32bce2aa2 | |
parent | cc9a0f68d1f8b9bfd9c0c2ada13db64d63f63db3 (diff) |
mfd : Copy the db8500 gic setting to the prcmu
In the case we go to the retention mode, we decoupled the gic
in order to have the A9 core to reach a stable WFI state.
But we want the prcmu to wake up the A9 when the gic has a pending
irq which is done by copying the gic settings to the to the prcmu.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | drivers/mfd/db8500-prcmu.c | 20 | ||||
-rw-r--r-- | include/linux/mfd/db8500-prcmu.h | 1 | ||||
-rw-r--r-- | include/linux/mfd/dbx500-prcmu.h | 8 |
3 files changed, 29 insertions, 0 deletions
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 8346a0e39949..97341aa4025c 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c | |||
@@ -883,6 +883,26 @@ bool db8500_prcmu_gic_pending_irq(void) | |||
883 | return false; | 883 | return false; |
884 | } | 884 | } |
885 | 885 | ||
886 | /* | ||
887 | * This function copies the gic SPI settings to the prcmu in order to | ||
888 | * monitor them and abort/finish the retention/off sequence or state. | ||
889 | */ | ||
890 | int db8500_prcmu_copy_gic_settings(void) | ||
891 | { | ||
892 | u32 er; /* Enable register */ | ||
893 | void __iomem *dist_base = __io_address(U8500_GIC_DIST_BASE); | ||
894 | int i; | ||
895 | |||
896 | /* We skip the STI and PPI */ | ||
897 | for (i = 0; i < PRCMU_GIC_NUMBER_REGS - 1; i++) { | ||
898 | er = readl_relaxed(dist_base + | ||
899 | GIC_DIST_ENABLE_SET + (i + 1) * 4); | ||
900 | writel(er, PRCM_ARMITMSK31TO0 + i * 4); | ||
901 | } | ||
902 | |||
903 | return 0; | ||
904 | } | ||
905 | |||
886 | /* This function should only be called while mb0_transfer.lock is held. */ | 906 | /* This function should only be called while mb0_transfer.lock is held. */ |
887 | static void config_wakeups(void) | 907 | static void config_wakeups(void) |
888 | { | 908 | { |
diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h index 92dac13b9ee5..a5915852176a 100644 --- a/include/linux/mfd/db8500-prcmu.h +++ b/include/linux/mfd/db8500-prcmu.h | |||
@@ -582,6 +582,7 @@ int db8500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll); | |||
582 | u8 db8500_prcmu_get_power_state_result(void); | 582 | u8 db8500_prcmu_get_power_state_result(void); |
583 | int db8500_prcmu_gic_decouple(void); | 583 | int db8500_prcmu_gic_decouple(void); |
584 | int db8500_prcmu_gic_recouple(void); | 584 | int db8500_prcmu_gic_recouple(void); |
585 | int db8500_prcmu_copy_gic_settings(void); | ||
585 | bool db8500_prcmu_gic_pending_irq(void); | 586 | bool db8500_prcmu_gic_pending_irq(void); |
586 | void db8500_prcmu_enable_wakeups(u32 wakeups); | 587 | void db8500_prcmu_enable_wakeups(u32 wakeups); |
587 | int db8500_prcmu_set_epod(u16 epod_id, u8 epod_state); | 588 | int db8500_prcmu_set_epod(u16 epod_id, u8 epod_state); |
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h index 16418747dad1..f8429cad0db7 100644 --- a/include/linux/mfd/dbx500-prcmu.h +++ b/include/linux/mfd/dbx500-prcmu.h | |||
@@ -305,6 +305,14 @@ static inline bool prcmu_gic_pending_irq(void) | |||
305 | return db8500_prcmu_gic_pending_irq(); | 305 | return db8500_prcmu_gic_pending_irq(); |
306 | } | 306 | } |
307 | 307 | ||
308 | static inline int prcmu_copy_gic_settings(void) | ||
309 | { | ||
310 | if (cpu_is_u5500()) | ||
311 | return -EINVAL; | ||
312 | else | ||
313 | return db8500_prcmu_copy_gic_settings(); | ||
314 | } | ||
315 | |||
308 | static inline int prcmu_set_epod(u16 epod_id, u8 epod_state) | 316 | static inline int prcmu_set_epod(u16 epod_id, u8 epod_state) |
309 | { | 317 | { |
310 | if (cpu_is_u5500()) | 318 | if (cpu_is_u5500()) |