cs: move shared data to external header
Move common shared data to external coresight header file.
Change-Id: I546ba939ef7d3d746cd171802498da5be872c234
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>
diff --git a/drivers/cs/cs-etb.c b/drivers/cs/cs-etb.c
index 74b69bb..84d8e72 100644
--- a/drivers/cs/cs-etb.c
+++ b/drivers/cs/cs-etb.c
@@ -24,6 +24,7 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/mutex.h>
+#include <linux/cs.h>
#include "cs-priv.h"
diff --git a/drivers/cs/cs-etm.c b/drivers/cs/cs-etm.c
index 3453697..724cc71 100644
--- a/drivers/cs/cs-etm.c
+++ b/drivers/cs/cs-etm.c
@@ -26,6 +26,7 @@
#include <linux/pm_qos.h>
#include <linux/sysfs.h>
#include <linux/stat.h>
+#include <linux/cs.h>
#include <asm/sections.h>
#include <mach/socinfo.h>
diff --git a/drivers/cs/cs-funnel.c b/drivers/cs/cs-funnel.c
index eb2b99f..2ae8ac9 100644
--- a/drivers/cs/cs-funnel.c
+++ b/drivers/cs/cs-funnel.c
@@ -18,6 +18,7 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/err.h>
+#include <linux/cs.h>
#include "cs-priv.h"
diff --git a/drivers/cs/cs-priv.h b/drivers/cs/cs-priv.h
index 37fe0a5..d89f461 100644
--- a/drivers/cs/cs-priv.h
+++ b/drivers/cs/cs-priv.h
@@ -10,11 +10,10 @@
* GNU General Public License for more details.
*/
-#ifndef _ARCH_ARM_MACH_MSM_QDSS_H_
-#define _ARCH_ARM_MACH_MSM_QDSS_H_
+#ifndef _CS_PRIV_H
+#define _CS_PRIV_H
#include <linux/bitops.h>
-#include <linux/cs.h>
/* Coresight management registers (0xF00-0xFCC)
* 0xFA0 - 0xFA4: Management registers in PFTv1.0
@@ -28,31 +27,10 @@
#define CS_AUTHSTATUS (0xFB8)
#define CS_DEVID (0xFC8)
#define CS_DEVTYPE (0xFCC)
-/* Peripheral id registers (0xFD0-0xFEC) */
-#define CS_PIDR4 (0xFD0)
-#define CS_PIDR5 (0xFD4)
-#define CS_PIDR6 (0xFD8)
-#define CS_PIDR7 (0xFDC)
-#define CS_PIDR0 (0xFE0)
-#define CS_PIDR1 (0xFE4)
-#define CS_PIDR2 (0xFE8)
-#define CS_PIDR3 (0xFEC)
-/* Component id registers (0xFF0-0xFFC) */
-#define CS_CIDR0 (0xFF0)
-#define CS_CIDR1 (0xFF4)
-#define CS_CIDR2 (0xFF8)
-#define CS_CIDR3 (0xFFC)
-/* DBGv7 with baseline CP14 registers implemented */
-#define ARM_DEBUG_ARCH_V7B (0x3)
-/* DBGv7 with all CP14 registers implemented */
-#define ARM_DEBUG_ARCH_V7 (0x4)
-#define ARM_DEBUG_ARCH_V7_1 (0x5)
-#define ETM_ARCH_V3_3 (0x23)
-#define PFT_ARCH_V1_1 (0x31)
+#define CS_UNLOCK_MAGIC (0xC5ACCE55)
#define TIMEOUT_US (100)
-#define CS_UNLOCK_MAGIC (0xC5ACCE55)
#define BM(lsb, msb) ((BIT(msb) - BIT(lsb)) + BIT(msb))
#define BMVAL(val, lsb, msb) ((val & BM(lsb, msb)) >> lsb)
diff --git a/drivers/cs/cs-stm.c b/drivers/cs/cs-stm.c
index 402deeb..c6df80d 100644
--- a/drivers/cs/cs-stm.c
+++ b/drivers/cs/cs-stm.c
@@ -22,6 +22,7 @@
#include <linux/miscdevice.h>
#include <linux/uaccess.h>
#include <linux/slab.h>
+#include <linux/cs.h>
#include <asm/unaligned.h>
#include <mach/stm.h>
diff --git a/drivers/cs/cs-tpiu.c b/drivers/cs/cs-tpiu.c
index 5e1069a..c5e28eb 100644
--- a/drivers/cs/cs-tpiu.c
+++ b/drivers/cs/cs-tpiu.c
@@ -17,6 +17,7 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/err.h>
+#include <linux/cs.h>
#include "cs-priv.h"
diff --git a/drivers/cs/cs.c b/drivers/cs/cs.c
index dc99062..e067380 100644
--- a/drivers/cs/cs.c
+++ b/drivers/cs/cs.c
@@ -20,6 +20,7 @@
#include <linux/err.h>
#include <linux/export.h>
#include <linux/clk.h>
+#include <linux/cs.h>
#include "cs-priv.h"
diff --git a/include/linux/cs.h b/include/linux/cs.h
index 05d8577..41761e1 100644
--- a/include/linux/cs.h
+++ b/include/linux/cs.h
@@ -10,8 +10,31 @@
* GNU General Public License for more details.
*/
-#ifndef __MACH_QDSS_H
-#define __MACH_QDSS_H
+#ifndef _LINUX_CS_H
+#define _LINUX_CS_H
+
+/* Peripheral id registers (0xFD0-0xFEC) */
+#define CS_PIDR4 (0xFD0)
+#define CS_PIDR5 (0xFD4)
+#define CS_PIDR6 (0xFD8)
+#define CS_PIDR7 (0xFDC)
+#define CS_PIDR0 (0xFE0)
+#define CS_PIDR1 (0xFE4)
+#define CS_PIDR2 (0xFE8)
+#define CS_PIDR3 (0xFEC)
+/* Component id registers (0xFF0-0xFFC) */
+#define CS_CIDR0 (0xFF0)
+#define CS_CIDR1 (0xFF4)
+#define CS_CIDR2 (0xFF8)
+#define CS_CIDR3 (0xFFC)
+
+/* DBGv7 with baseline CP14 registers implemented */
+#define ARM_DEBUG_ARCH_V7B (0x3)
+/* DBGv7 with all CP14 registers implemented */
+#define ARM_DEBUG_ARCH_V7 (0x4)
+#define ARM_DEBUG_ARCH_V7_1 (0x5)
+#define ETM_ARCH_V3_3 (0x23)
+#define PFT_ARCH_V1_1 (0x31)
struct qdss_source {
struct list_head link;