coresight: rename directory and files from cs to coresight
Since cs is not a well known acronym for CoreSight, rename
directory and files from cs to coresight.
Change-Id: I5f9b12794b80b1c01c9ce0621d53ee6be408a361
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 4998fc6..472a87e 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -17,7 +17,7 @@
#include <linux/msm_rotator.h>
#include <linux/clkdev.h>
#include <linux/dma-mapping.h>
-#include <linux/cs.h>
+#include <linux/coresight.h>
#include <mach/irqs-8064.h>
#include <mach/board.h>
#include <mach/msm_iomap.h>
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 60f9cd9..3522e80 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -17,7 +17,7 @@
#include <linux/msm_rotator.h>
#include <linux/ion.h>
#include <linux/gpio.h>
-#include <linux/cs.h>
+#include <linux/coresight.h>
#include <asm/clkdev.h>
#include <linux/msm_kgsl.h>
#include <linux/android_pmem.h>
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
index b4dc058..f8324ce 100644
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
@@ -11,7 +11,6 @@
#include <linux/errno.h>
#include <linux/smp.h>
#include <linux/cpu.h>
-#include <linux/cs.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
diff --git a/arch/arm/mach-msm/jtag.c b/arch/arm/mach-msm/jtag.c
index c6e013c..bf5857c 100644
--- a/arch/arm/mach-msm/jtag.c
+++ b/arch/arm/mach-msm/jtag.c
@@ -19,7 +19,7 @@
#include <linux/export.h>
#include <linux/printk.h>
#include <linux/ratelimit.h>
-#include <linux/cs.h>
+#include <linux/coresight.h>
#include <mach/scm.h>
#include <mach/jtag.h>
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 7225bdf..a73d713 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -148,6 +148,6 @@
source "drivers/gud/Kconfig"
-source "drivers/cs/Kconfig"
+source "drivers/coresight/Kconfig"
endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index 3272e2c..bd18a62 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -141,4 +141,4 @@
#MobiCore
obj-$(CONFIG_MOBICORE_SUPPORT) += gud/
-obj-$(CONFIG_MSM_QDSS) += cs/
+obj-$(CONFIG_MSM_QDSS) += coresight/
diff --git a/drivers/cs/Kconfig b/drivers/coresight/Kconfig
similarity index 100%
rename from drivers/cs/Kconfig
rename to drivers/coresight/Kconfig
diff --git a/drivers/coresight/Makefile b/drivers/coresight/Makefile
new file mode 100644
index 0000000..2ee2093
--- /dev/null
+++ b/drivers/coresight/Makefile
@@ -0,0 +1,2 @@
+
+obj-$(CONFIG_MSM_QDSS) += coresight.o coresight-etb.o coresight-tpiu.o coresight-funnel.o coresight-stm.o coresight-etm.o
diff --git a/drivers/cs/cs-etb.c b/drivers/coresight/coresight-etb.c
similarity index 98%
rename from drivers/cs/cs-etb.c
rename to drivers/coresight/coresight-etb.c
index 4076c00..678076c 100644
--- a/drivers/cs/cs-etb.c
+++ b/drivers/coresight/coresight-etb.c
@@ -25,9 +25,9 @@
#include <linux/delay.h>
#include <linux/mutex.h>
#include <linux/clk.h>
-#include <linux/cs.h>
+#include <linux/coresight.h>
-#include "cs-priv.h"
+#include "coresight-priv.h"
#define etb_writel(drvdata, val, off) __raw_writel((val), drvdata->base + off)
#define etb_readl(drvdata, off) __raw_readl(drvdata->base + off)
diff --git a/drivers/cs/cs-etm.c b/drivers/coresight/coresight-etm.c
similarity index 99%
rename from drivers/cs/cs-etm.c
rename to drivers/coresight/coresight-etm.c
index 4d02884..877b189 100644
--- a/drivers/cs/cs-etm.c
+++ b/drivers/coresight/coresight-etm.c
@@ -27,11 +27,11 @@
#include <linux/sysfs.h>
#include <linux/stat.h>
#include <linux/clk.h>
-#include <linux/cs.h>
+#include <linux/coresight.h>
#include <asm/sections.h>
#include <mach/socinfo.h>
-#include "cs-priv.h"
+#include "coresight-priv.h"
#define etm_writel(drvdata, cpu, val, off) \
__raw_writel((val), drvdata->base + (SZ_4K * cpu) + off)
@@ -142,7 +142,7 @@
#ifdef MODULE_PARAM_PREFIX
#undef MODULE_PARAM_PREFIX
#endif
-#define MODULE_PARAM_PREFIX "cs."
+#define MODULE_PARAM_PREFIX "coresight."
#ifdef CONFIG_MSM_QDSS_ETM_DEFAULT_ENABLE
static int etm_boot_enable = 1;
diff --git a/drivers/cs/cs-funnel.c b/drivers/coresight/coresight-funnel.c
similarity index 98%
rename from drivers/cs/cs-funnel.c
rename to drivers/coresight/coresight-funnel.c
index 2317e90..1fb2a2cf 100644
--- a/drivers/cs/cs-funnel.c
+++ b/drivers/coresight/coresight-funnel.c
@@ -20,9 +20,9 @@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/clk.h>
-#include <linux/cs.h>
+#include <linux/coresight.h>
-#include "cs-priv.h"
+#include "coresight-priv.h"
#define funnel_writel(drvdata, id, val, off) \
__raw_writel((val), drvdata->base + (SZ_4K * id) + off)
diff --git a/drivers/cs/cs-priv.h b/drivers/coresight/coresight-priv.h
similarity index 100%
rename from drivers/cs/cs-priv.h
rename to drivers/coresight/coresight-priv.h
diff --git a/drivers/cs/cs-stm.c b/drivers/coresight/coresight-stm.c
similarity index 98%
rename from drivers/cs/cs-stm.c
rename to drivers/coresight/coresight-stm.c
index 4444d12..7529cda 100644
--- a/drivers/cs/cs-stm.c
+++ b/drivers/coresight/coresight-stm.c
@@ -23,11 +23,11 @@
#include <linux/uaccess.h>
#include <linux/slab.h>
#include <linux/clk.h>
-#include <linux/cs.h>
-#include <linux/cs-stm.h>
+#include <linux/coresight.h>
+#include <linux/coresight-stm.h>
#include <asm/unaligned.h>
-#include "cs-priv.h"
+#include "coresight-priv.h"
#define stm_writel(drvdata, val, off) \
__raw_writel((val), drvdata->base + off)
diff --git a/drivers/cs/cs-tpiu.c b/drivers/coresight/coresight-tpiu.c
similarity index 97%
rename from drivers/cs/cs-tpiu.c
rename to drivers/coresight/coresight-tpiu.c
index a8d69a7..fc60ba2 100644
--- a/drivers/cs/cs-tpiu.c
+++ b/drivers/coresight/coresight-tpiu.c
@@ -19,9 +19,9 @@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/clk.h>
-#include <linux/cs.h>
+#include <linux/coresight.h>
-#include "cs-priv.h"
+#include "coresight-priv.h"
#define tpiu_writel(drvdata, val, off) __raw_writel((val), drvdata->base + off)
#define tpiu_readl(drvdata, off) __raw_readl(drvdata->base + off)
diff --git a/drivers/cs/cs.c b/drivers/coresight/coresight.c
similarity index 98%
rename from drivers/cs/cs.c
rename to drivers/coresight/coresight.c
index ee02f90..0a7bac3 100644
--- a/drivers/cs/cs.c
+++ b/drivers/coresight/coresight.c
@@ -22,9 +22,9 @@
#include <linux/slab.h>
#include <linux/mutex.h>
#include <linux/clk.h>
-#include <linux/cs.h>
+#include <linux/coresight.h>
-#include "cs-priv.h"
+#include "coresight-priv.h"
#define MAX_STR_LEN (65535)
diff --git a/drivers/cs/Makefile b/drivers/cs/Makefile
deleted file mode 100644
index e1bb2f4..0000000
--- a/drivers/cs/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-
-obj-$(CONFIG_MSM_QDSS) += cs.o cs-etb.o cs-tpiu.o cs-funnel.o cs-stm.o cs-etm.o
diff --git a/include/linux/cs-stm.h b/include/linux/coresight-stm.h
similarity index 100%
rename from include/linux/cs-stm.h
rename to include/linux/coresight-stm.h
diff --git a/include/linux/cs.h b/include/linux/coresight.h
similarity index 100%
rename from include/linux/cs.h
rename to include/linux/coresight.h