brcm2708: update to v3.18
[oweals/openwrt.git] / target / linux / brcm2708 / patches-3.18 / 0093-fiq_fsm-fix-build-on-bcm2708-and-bcm2709-platforms.patch
1 From e424348e42e85fa0224819055668845710c54887 Mon Sep 17 00:00:00 2001
2 From: P33M <P33M@github.com>
3 Date: Thu, 22 Jan 2015 11:59:41 +0000
4 Subject: [PATCH 093/114] fiq_fsm: fix build on bcm2708 and bcm2709 platforms
5
6 ---
7  drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c | 8 ++++++++
8  1 file changed, 8 insertions(+)
9
10 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
11 index 84618a5..0d2b04e 100644
12 --- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
13 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
14 @@ -78,6 +78,7 @@ void notrace _fiq_print(enum fiq_debug_level dbg_lvl, volatile struct fiq_state
15   * fiq_fsm_spin_lock() - ARMv6+ bare bones spinlock
16   * Must be called with local interrupts and FIQ disabled.
17   */
18 +#ifdef CONFIG_ARCH_BCM2709
19  inline void fiq_fsm_spin_lock(fiq_lock_t *lock)
20  {
21         unsigned long tmp;
22 @@ -103,16 +104,23 @@ inline void fiq_fsm_spin_lock(fiq_lock_t *lock)
23         }
24         smp_mb();
25  }
26 +#else
27 +inline void fiq_fsm_spin_lock(fiq_lock_t *lock) { }
28 +#endif
29  
30  /**
31   * fiq_fsm_spin_unlock() - ARMv6+ bare bones spinunlock
32   */
33 +#ifdef CONFIG_ARCH_BCM2709
34  inline void fiq_fsm_spin_unlock(fiq_lock_t *lock)
35  {
36         smp_mb();
37         lock->tickets.owner++;
38         dsb_sev();
39  }
40 +#else
41 +inline void fiq_fsm_spin_unlock(fiq_lock_t *lock) { }
42 +#endif
43  
44  /**
45   * fiq_fsm_restart_channel() - Poke channel enable bit for a split transaction
46 -- 
47 1.8.3.2
48