commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=f75ef00fba8e1a6d23cfd50da2e1c1d78f9539db branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Steven Miao <[email protected]> --- arch/blackfin/include/asm/pm.h | 8 ++++++++ arch/blackfin/kernel/setup.c | 13 +++---------- drivers/staging/icc/core/protocol.c | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/blackfin/include/asm/pm.h b/arch/blackfin/include/asm/pm.h index e9537ff..da63b46 100644 --- a/arch/blackfin/include/asm/pm.h +++ b/arch/blackfin/include/asm/pm.h @@ -9,6 +9,7 @@ #ifndef __PM_H__ #define __PM_H__ +#include <mach/pm.h> #include <linux/suspend.h> struct bfin_cpu_pm_fns { @@ -21,4 +22,11 @@ struct bfin_cpu_pm_fns { }; extern struct bfin_cpu_pm_fns *bfin_cpu_pm; + +# ifdef CONFIG_BFIN_COREB +void bfin_coreb_start(void); +void bfin_coreb_stop(void); +void bfin_coreb_reset(void); +# endif + #endif diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 9776b63..272c357 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c @@ -32,6 +32,7 @@ #include <asm/early_printk.h> #include <asm/irq_handler.h> #include <asm/pda.h> +#include <asm/pm.h> u16 _bfin_swrst; EXPORT_SYMBOL(_bfin_swrst); @@ -179,14 +180,6 @@ void __init bfin_cache_init(void) bfin_setup_caches(0); } -#ifdef CONFIG_BFIN_COREB -static void core1_enable(void) -{ - bfin_write32(RCU0_SVECT1, 0xff600000); - bfin_write32(RCU0_CRCTL, 0); -} -#endif - void __init bfin_relocate_l1_mem(void) { unsigned long text_l1_len = (unsigned long)_text_l1_len; @@ -214,10 +207,10 @@ void __init bfin_relocate_l1_mem(void) #ifdef CONFIG_BFIN_COREB - core1_enable(); + coreb_enable(); if (L1_CODE_LENGTH && text_l1_len) - early_dma_memcpy((void *)0xFF600000, _text_l1_lma, + early_dma_memcpy((void *)COREB_L1_CODE_START, _text_l1_lma, text_l1_len); bfin_write32(RCU0_CRCTL, 0x2); diff --git a/drivers/staging/icc/core/protocol.c b/drivers/staging/icc/core/protocol.c index 86d7a43..ce08509 100644 --- a/drivers/staging/icc/core/protocol.c +++ b/drivers/staging/icc/core/protocol.c @@ -226,7 +226,7 @@ static int sm_send_message_internal(struct sm_msg *msg, int dst_cpu, sm_debug("%s: dst %d src %d %08x\n", __func__, dst_cpu, src_cpu, (uint32_t)msg->type); ret = sm_message_enqueue(dst_cpu, src_cpu, msg); if (!ret) - icc_send_ipi_cpu(dst_cpu, IRQ_SUPPLE_0); + icc_send_ipi_cpu(dst_cpu, ICC_LOW_SEND); return ret; }
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
