summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorAlexander Shishkin <virtuoso@slind.org>2010-08-04 11:25:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-10 22:10:53 +0100
commit9e354ea8e0710baf05804168fdabe90231b3d363 (patch)
tree3f86f2e6c8b7fd08256d9a2496583d0a21c51a05 /arch/arm/kernel
parent686ff22812d908eaa537edd62fb1eb3d64336301 (diff)
ARM: 6292/1: coresight: add ETM management registers
Add notion of ETM OS lock, save and restore registers. Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Alexander Shishkin <virtuoso@slind.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/etm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index 82775396630..9e9db63c298 100644
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -543,7 +543,7 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id)
t->etm_portsz = 1;
etm_unlock(t);
- ret = etm_readl(t, CSCR_PRSR);
+ ret = etm_readl(t, ETMMR_PDSR);
t->ncmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf;
etm_writel(t, 0x440, ETMR_CTRL);