diff options
| author |   Bob Liu <lliubbo@gmail.com> | 2012-07-23 14:59:36 +0800 |
|---|---|---|
| committer | Bob Liu <lliubbo@gmail.com> | 2012-07-24 13:39:53 +0800 |
| commit | 719154c6d1c1a3a404f4ff570c4b36bb2ef868ca (patch) | |
| tree | b6489ebea97c3ba0aaa43a79ca7d0fc2e9b1f0a0 | |
| parent | PM: add BF60x flash suspend and resume support (diff) | |
| download | linux-dev-719154c6d1c1a3a404f4ff570c4b36bb2ef868ca.tar.xz linux-dev-719154c6d1c1a3a404f4ff570c4b36bb2ef868ca.zip | |
bf60x: fix build warning
Fix several build warning while using bf609-ezkit_defconfig.
Signed-off-by: Bob Liu <lliubbo@gmail.com>
| -rw-r--r-- | arch/blackfin/mach-bf609/boards/ezkit.c | 1 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf609/include/mach/anomaly.h | 3 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf609/pm.c | 9 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c index 36fbdacc0b76..c2cf1ae31189 100644 --- a/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/arch/blackfin/mach-bf609/boards/ezkit.c @@ -688,7 +688,6 @@ void bf609_nor_flash_exit(struct platform_device *dev) peripheral_free_list(pins); bfin_write32(SMC_GCTL, 0); - return 0; } static struct physmap_flash_data ezkit_flash_data = { diff --git a/arch/blackfin/mach-bf609/include/mach/anomaly.h b/arch/blackfin/mach-bf609/include/mach/anomaly.h index 51d78657cf31..7a07374308ac 100644 --- a/arch/blackfin/mach-bf609/include/mach/anomaly.h +++ b/arch/blackfin/mach-bf609/include/mach/anomaly.h @@ -67,6 +67,7 @@ #define ANOMALY_05000158 (0) #define ANOMALY_05000189 (0) #define ANOMALY_05000198 (0) +#define ANOMALY_05000220 (0) #define ANOMALY_05000230 (0) #define ANOMALY_05000231 (0) #define ANOMALY_05000244 (0) @@ -81,7 +82,9 @@ #define ANOMALY_05000323 (0) #define ANOMALY_05000363 (0) #define ANOMALY_05000380 (0) +#define ANOMALY_05000448 (0) #define ANOMALY_05000450 (0) +#define ANOMALY_05000456 (0) #define ANOMALY_05000480 (0) #define ANOMALY_05000481 (1) diff --git a/arch/blackfin/mach-bf609/pm.c b/arch/blackfin/mach-bf609/pm.c index 0211ebd142c4..dacafc163f76 100644 --- a/arch/blackfin/mach-bf609/pm.c +++ b/arch/blackfin/mach-bf609/pm.c @@ -174,11 +174,7 @@ void bfin_hibernate_syscontrol(void) bfin_write32(DPM0_RESTORE5, bfin_read32(DPM0_RESTORE5) | 4); } -#ifndef CONFIG_BF60x -# define SIC_SYSIRQ(irq) (irq - (IRQ_CORETMR + 1)) -#else -# define SIC_SYSIRQ(irq) ((irq) - IVG15) -#endif +#define IRQ_SID(irq) ((irq) - IVG15) asmlinkage void enter_deepsleep(void); __attribute__((l1_text)) @@ -314,6 +310,8 @@ static struct syscore_ops smc_pm_syscore_ops = { static irqreturn_t test_isr(int irq, void *dev_id) { printk(KERN_DEBUG "gpio irq %d\n", irq); + if (irq == 231) + bfin_sec_raise_irq(IRQ_SID(IRQ_SOFT1)); return IRQ_HANDLED; } @@ -323,7 +321,6 @@ static irqreturn_t dpm0_isr(int irq, void *dev_id) bfin_write32(CGU0_STAT, bfin_read32(CGU0_STAT)); return IRQ_HANDLED; } -#endif static int __init bf609_init_pm(void) { diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 9660d5fdbed4..7ca09ec2ca53 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c @@ -328,7 +328,7 @@ static void bfin_sec_set_priority(unsigned int sec_int_levels, u8 *sec_int_prior hard_local_irq_restore(flags); } -static void bfin_sec_raise_irq(unsigned int sid) +void bfin_sec_raise_irq(unsigned int sid) { unsigned long flags = hard_local_irq_save(); @@ -434,10 +434,10 @@ void handle_core_fault(unsigned int irq, struct irq_desc *desc) panic("Kernel core hardware error"); break; case IRQ_C0_NMI_L1_PARITY_ERR: - panic("NMI %d occurs unexpectedly"); + panic("NMI occurs unexpectedly"); break; default: - panic("Core 1 fault %d occurs unexpectedly"); + panic("Core 1 fault occurs unexpectedly"); } raw_spin_unlock(&desc->lock); |