From: Mark Brown <broonie@linaro.org>
Date: Mon, 31 Mar 2014 09:43:50 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~154
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dc767302872a55c9849aade1719134a2ba7528b0;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	arch/arm/include/asm/hardware/coresight.h
---

dc767302872a55c9849aade1719134a2ba7528b0
diff --cc arch/arm/include/asm/hardware/coresight.h
index 4aee45da6d59,ad774f37c47c..fc53019c304b
--- a/arch/arm/include/asm/hardware/coresight.h
+++ b/arch/arm/include/asm/hardware/coresight.h
@@@ -166,16 -140,14 +166,16 @@@
  #define ETBFF_TRIGIN		BIT(8)
  #define ETBFF_TRIGEVT		BIT(9)
  #define ETBFF_TRIGFL		BIT(10)
 +#define ETBFF_STOPFL		BIT(12)
  
  #define etb_writel(t, v, x) \
- 	(__raw_writel((v), (t)->etb_regs + (x)))
- #define etb_readl(t, x) (__raw_readl((t)->etb_regs + (x)))
+ 	(writel_relaxed((v), (t)->etb_regs + (x)))
+ #define etb_readl(t, x) (readl_relaxed((t)->etb_regs + (x)))
  
 -#define etm_lock(t) do { etm_writel((t), 0, CSMR_LOCKACCESS); } while (0)
 -#define etm_unlock(t) \
 -	do { etm_writel((t), CS_LAR_KEY, CSMR_LOCKACCESS); } while (0)
 +#define etm_lock(t, id) \
 +	do { etm_writel((t), (id), 0, CSMR_LOCKACCESS); } while (0)
 +#define etm_unlock(t, id) \
 +	do { etm_writel((t), (id), CS_LAR_KEY, CSMR_LOCKACCESS); } while (0)
  
  #define etb_lock(t) do { etb_writel((t), 0, CSMR_LOCKACCESS); } while (0)
  #define etb_unlock(t) \