msm: soc: Rename soc/msm to soc/qcom

We are using 'qcom' now for DT, file and directory names so rename
drivers/soc/msm to drivers/soc/qcom and fixup related header files
and path issues.

Change-Id: Ibd32a507afaec1920b0289df107231eb7d6ef5e1
Signed-off-by: Kumar Gala <galak@codeaurora.org>

42 files changed, 38 insertions, 39 deletions

diff --git a/arch/arm/mach-msm/board-8084.c b/arch/arm/mach-msm/board-8084.c
index c0a142925612..ae9f8f9cb9dd 100644
--- a/arch/arm/mach-msm/board-8084.c
+++ b/arch/arm/mach-msm/board-8084.c
@@ -31,7 +31,7 @@
 #include <mach/restart.h>
 #include <mach/socinfo.h>
 #include <mach/rpm-smd.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include "spm.h"
 #include "board-dt.h"
 #include "clock.h"
diff --git a/arch/arm/mach-msm/board-8092.c b/arch/arm/mach-msm/board-8092.c
index 98cfb141709a..ab8f7dd6d0de 100644
--- a/arch/arm/mach-msm/board-8092.c
+++ b/arch/arm/mach-msm/board-8092.c
@@ -26,7 +26,7 @@
 #include <mach/socinfo.h>
 #include <mach/board.h>
 #include <mach/msm_memtypes.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include <mach/msm_smd.h>
 #include <mach/restart.h>
 #include <mach/rpm-smd.h>
diff --git a/arch/arm/mach-msm/board-8226.c b/arch/arm/mach-msm/board-8226.c
index 146fdc9a5658..fbc550241717 100644
--- a/arch/arm/mach-msm/board-8226.c
+++ b/arch/arm/mach-msm/board-8226.c
@@ -40,7 +40,7 @@
 #include <mach/board.h>
 #include <mach/msm_smd.h>
 #include <mach/rpm-smd.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include <linux/msm_thermal.h>
 #include "board-dt.h"
 #include "clock.h"
diff --git a/arch/arm/mach-msm/board-8610.c b/arch/arm/mach-msm/board-8610.c
index bceadf15afe5..82c986c26594 100644
--- a/arch/arm/mach-msm/board-8610.c
+++ b/arch/arm/mach-msm/board-8610.c
@@ -39,7 +39,7 @@
 #include <mach/board.h>
 #include <mach/msm_smd.h>
 #include <mach/rpm-smd.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include <linux/msm_thermal.h>
 #include "board-dt.h"
 #include "clock.h"
diff --git a/arch/arm/mach-msm/board-8974.c b/arch/arm/mach-msm/board-8974.c
index 169d069ec52b..4b9a95f4357b 100644
--- a/arch/arm/mach-msm/board-8974.c
+++ b/arch/arm/mach-msm/board-8974.c
@@ -36,7 +36,7 @@
 #include <mach/restart.h>
 #include <mach/rpm-smd.h>
 #include <mach/socinfo.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include "board-dt.h"
 #include "clock.h"
 #include "spm.h"
diff --git a/arch/arm/mach-msm/board-krypton.c b/arch/arm/mach-msm/board-krypton.c
index 2b00331fa1d4..a17fe7595dff 100644
--- a/arch/arm/mach-msm/board-krypton.c
+++ b/arch/arm/mach-msm/board-krypton.c
@@ -30,7 +30,7 @@
 #include <mach/rpm-smd.h>
 #include <mach/restart.h>
 #include <mach/socinfo.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include "board-dt.h"
 #include "clock.h"
 #include "spm.h"
diff --git a/arch/arm/mach-msm/board-samarium.c b/arch/arm/mach-msm/board-samarium.c
index d51340ca2146..800bace7b279 100644
--- a/arch/arm/mach-msm/board-samarium.c
+++ b/arch/arm/mach-msm/board-samarium.c
@@ -28,7 +28,7 @@
 #include <mach/msm_memtypes.h>
 #include <mach/restart.h>
 #include <mach/socinfo.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include <mach/msm_smd.h>
 #include <mach/rpm-smd.h>
 #include "spm.h"
diff --git a/arch/arm/mach-msm/include/mach/msm_smd.h b/arch/arm/mach-msm/include/mach/msm_smd.h
index d2e98e901632..68e7809eab5a 100644
--- a/arch/arm/mach-msm/include/mach/msm_smd.h
+++ b/arch/arm/mach-msm/include/mach/msm_smd.h
@@ -20,7 +20,7 @@
 
 #include <linux/io.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 typedef struct smd_channel smd_channel_t;
 
diff --git a/arch/arm/mach-msm/include/mach/msm_smsm.h b/arch/arm/mach-msm/include/mach/msm_smsm.h
index f679426d46c3..96ca0c86912c 100644
--- a/arch/arm/mach-msm/include/mach/msm_smsm.h
+++ b/arch/arm/mach-msm/include/mach/msm_smsm.h
@@ -13,7 +13,7 @@
 #ifndef _ARCH_ARM_MACH_MSM_SMSM_H_
 #define _ARCH_ARM_MACH_MSM_SMSM_H_
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 enum {
 	SMSM_APPS_STATE,
diff --git a/arch/arm/mach-msm/pil-pronto.c b/arch/arm/mach-msm/pil-pronto.c
index 19586f70fd54..a7d08c665e11 100644
--- a/arch/arm/mach-msm/pil-pronto.c
+++ b/arch/arm/mach-msm/pil-pronto.c
@@ -32,7 +32,7 @@
 #include <mach/ramdump.h>
 #include <mach/msm_bus_board.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #include "peripheral-loader.h"
 #include "scm-pas.h"
diff --git a/arch/arm/mach-msm/pil-q6v5-lpass.c b/arch/arm/mach-msm/pil-q6v5-lpass.c
index 1f65e907d938..98bae909588f 100644
--- a/arch/arm/mach-msm/pil-q6v5-lpass.c
+++ b/arch/arm/mach-msm/pil-q6v5-lpass.c
@@ -32,7 +32,7 @@
 #include <mach/msm_bus_board.h>
 #include <mach/sysmon.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #include "peripheral-loader.h"
 #include "pil-q6v5.h"
diff --git a/arch/arm/mach-msm/pil-q6v5-mss.c b/arch/arm/mach-msm/pil-q6v5-mss.c
index e3aae8852509..8b25ef92a77a 100644
--- a/arch/arm/mach-msm/pil-q6v5-mss.c
+++ b/arch/arm/mach-msm/pil-q6v5-mss.c
@@ -33,7 +33,7 @@
 #include <mach/ramdump.h>
 #include <mach/sysmon.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #include "peripheral-loader.h"
 #include "pil-q6v5.h"
diff --git a/arch/arm/mach-msm/rmt_storage_client.c b/arch/arm/mach-msm/rmt_storage_client.c
index e869e3b277aa..2311be62df7a 100644
--- a/arch/arm/mach-msm/rmt_storage_client.c
+++ b/arch/arm/mach-msm/rmt_storage_client.c
@@ -35,7 +35,7 @@
 #ifdef CONFIG_MSM_SDIO_SMEM
 #include <mach/sdio_smem.h>
 #endif
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 enum {
 	RMT_STORAGE_EVNT_OPEN = 0,
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index f05ee4a26c38..c423c54951f4 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -44,10 +44,10 @@
 #include <mach/subsystem_restart.h>
 #include <mach/ramdump.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #include "smd_private.h"
-#include "../../../drivers/soc/msm/smem_private.h"
+#include "../../../drivers/soc/qcom/smem_private.h"
 
 #define SMSM_SNAPSHOT_CNT 64
 #define SMSM_SNAPSHOT_SIZE ((SMSM_NUM_ENTRIES + 1) * 4 + sizeof(uint64_t))
diff --git a/arch/arm/mach-msm/smd_debug.c b/arch/arm/mach-msm/smd_debug.c
index 2a82567e4702..caf5506a9635 100644
--- a/arch/arm/mach-msm/smd_debug.c
+++ b/arch/arm/mach-msm/smd_debug.c
@@ -20,7 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/jiffies.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #include "smd_private.h"
 
diff --git a/arch/arm/mach-msm/smem_log.c b/arch/arm/mach-msm/smem_log.c
index 8c402193b784..aa67c49f27fd 100644
--- a/arch/arm/mach-msm/smem_log.c
+++ b/arch/arm/mach-msm/smem_log.c
@@ -33,12 +33,12 @@
 #include <mach/msm_iomap.h>
 #include <mach/smem_log.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #include <asm/arch_timer.h>
 
 #include "smd_rpc_sym.h"
-#include "../../../drivers/soc/msm/smem_private.h"
+#include "../../../drivers/soc/qcom/smem_private.h"
 
 #define DEBUG
 #undef DEBUG
diff --git a/arch/arm/mach-msm/smp2p.c b/arch/arm/mach-msm/smp2p.c
index 2d343760f7df..c271838f3e4c 100644
--- a/arch/arm/mach-msm/smp2p.c
+++ b/arch/arm/mach-msm/smp2p.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/ipc_logging.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include "smp2p_private_api.h"
 #include "smp2p_private.h"
 
diff --git a/arch/arm/mach-msm/smp2p_loopback.c b/arch/arm/mach-msm/smp2p_loopback.c
index 7d18b1794534..2cb7954a2337 100644
--- a/arch/arm/mach-msm/smp2p_loopback.c
+++ b/arch/arm/mach-msm/smp2p_loopback.c
@@ -21,7 +21,7 @@
 #include <linux/termios.h>
 #include <linux/module.h>
 #include <linux/remote_spinlock.h>
-#include "../../../drivers/soc/msm/smem_private.h"
+#include "../../../drivers/soc/qcom/smem_private.h"
 #include "smp2p_private.h"
 
 /**
diff --git a/arch/arm/mach-msm/smp2p_spinlock_test.c b/arch/arm/mach-msm/smp2p_spinlock_test.c
index 5434bc12a0df..9efb0fb33e57 100644
--- a/arch/arm/mach-msm/smp2p_spinlock_test.c
+++ b/arch/arm/mach-msm/smp2p_spinlock_test.c
@@ -17,8 +17,8 @@
 #include <linux/delay.h>
 #include <linux/completion.h>
 #include <linux/remote_spinlock.h>
-#include <soc/msm/smem.h>
-#include "../../../drivers/soc/msm/smem_private.h"
+#include <soc/qcom/smem.h>
+#include "../../../drivers/soc/qcom/smem_private.h"
 #include "smp2p_private.h"
 #include "smp2p_test_common.h"
 
diff --git a/arch/arm/mach-msm/smsm_debug.c b/arch/arm/mach-msm/smsm_debug.c
index bb50422a88ca..ad8f48d4dea0 100644
--- a/arch/arm/mach-msm/smsm_debug.c
+++ b/arch/arm/mach-msm/smsm_debug.c
@@ -22,7 +22,7 @@
 
 #include <mach/msm_smsm.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #if defined(CONFIG_DEBUG_FS)
 
diff --git a/arch/arm/mach-msm/socinfo.c b/arch/arm/mach-msm/socinfo.c
index 9b2eabd79f61..2e93707f95a5 100644
--- a/arch/arm/mach-msm/socinfo.c
+++ b/arch/arm/mach-msm/socinfo.c
@@ -27,7 +27,7 @@
 
 #include <mach/socinfo.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #include "boot_stats.h"
 
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 8f67b39fb0b8..9962ec05135f 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -34,7 +34,7 @@
 #include <mach/irqs.h>
 #include <mach/socinfo.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #if defined(CONFIG_MSM_SMD)
 #include <mach/msm_smsm.h>
 #endif
diff --git a/drivers/hwspinlock/msm_remote_spinlock.c b/drivers/hwspinlock/msm_remote_spinlock.c
index b3ee91721873..c0ac7b0eae9f 100644
--- a/drivers/hwspinlock/msm_remote_spinlock.c
+++ b/drivers/hwspinlock/msm_remote_spinlock.c
@@ -19,7 +19,7 @@
 #include <linux/of_address.h>
 #include <linux/msm_remote_spinlock.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 
 #define SPINLOCK_PID_APPS 1
diff --git a/drivers/iommu/msm_iommu-v0.c b/drivers/iommu/msm_iommu-v0.c
index 8ed73cb42bf0..bc59d6ca5192 100644
--- a/drivers/iommu/msm_iommu-v0.c
+++ b/drivers/iommu/msm_iommu-v0.c
@@ -33,7 +33,7 @@
 #include <mach/iommu.h>
 #include <mach/msm_bus.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 /* Sharability attributes of MSM IOMMU mappings */
 #define MSM_IOMMU_ATTR_NON_SH		0x0
diff --git a/drivers/media/platform/msm/vidc/hfi_response_handler.c b/drivers/media/platform/msm/vidc/hfi_response_handler.c
index 1746050965c8..8b98c4be10db 100644
--- a/drivers/media/platform/msm/vidc/hfi_response_handler.c
+++ b/drivers/media/platform/msm/vidc/hfi_response_handler.c
@@ -14,7 +14,7 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/interrupt.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include "vidc_hfi_helper.h"
 #include "vidc_hfi_io.h"
 #include "msm_vidc_debug.h"
diff --git a/drivers/media/platform/msm/vidc/venus_hfi.c b/drivers/media/platform/msm/vidc/venus_hfi.c
index eba658e83ae9..e251ad0ab4d1 100644
--- a/drivers/media/platform/msm/vidc/venus_hfi.c
+++ b/drivers/media/platform/msm/vidc/venus_hfi.c
@@ -23,7 +23,7 @@
 #include <mach/ocmem.h>
 #include <mach/scm.h>
 #include <mach/subsystem_restart.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include <asm/memory.h>
 #include <linux/iopoll.h>
 #include "hfi_packetization.h"
diff --git a/drivers/mtd/devices/msm_qpic_nand.c b/drivers/mtd/devices/msm_qpic_nand.c
index 149d01cb011d..cca5c8cc5c1b 100644
--- a/drivers/mtd/devices/msm_qpic_nand.c
+++ b/drivers/mtd/devices/msm_qpic_nand.c
@@ -33,7 +33,7 @@
 #include <linux/ctype.h>
 #include <mach/sps.h>
 #include <mach/msm_bus.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #define PAGE_SIZE_2K 2048
 #define PAGE_SIZE_4K 4096
diff --git a/drivers/platform/msm/ipa/ipa_bridge.c b/drivers/platform/msm/ipa/ipa_bridge.c
index a54be264cd2c..3cb889cab1cd 100644
--- a/drivers/platform/msm/ipa/ipa_bridge.c
+++ b/drivers/platform/msm/ipa/ipa_bridge.c
@@ -12,7 +12,7 @@
 
 #include <linux/delay.h>
 #include <linux/ratelimit.h>
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 #include "ipa_i.h"
 
 /*
diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index cb0f6cca5ed6..f5ec29e86629 100644
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -1,2 +1,2 @@
-source "drivers/soc/msm/Kconfig"
+source "drivers/soc/qcom/Kconfig"
 source "drivers/soc/qti/Kconfig"
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 935f31d1189a..7d36d53c6cdc 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -1,3 +1,2 @@
-obj-$(CONFIG_ARCH_MSM)		+= msm/
+obj-$(CONFIG_ARCH_MSM)		+= qcom/
 obj-y				+= qti/
-obj-$(CONFIG_MSM_QMI_INTERFACE)    += msm/
diff --git a/drivers/soc/msm/Kconfig b/drivers/soc/qcom/Kconfig
index e6d91915a0bb..41e750a39151 100644
--- a/drivers/soc/msm/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -10,6 +10,6 @@ config MSM_SMEM
 	  processors in the System on a Chip (SoC) which allows basic
 	  inter-processor communication.
 
-endif # ARCH_MSM
+source "drivers/soc/qcom/memshare/Kconfig"
 
-source "drivers/soc/msm/memshare/Kconfig"
\ No newline at end of file
+endif # ARCH_MSM
diff --git a/drivers/soc/msm/Makefile b/drivers/soc/qcom/Makefile
index 9176562ebfe8..fecd0cb28b40 100644
--- a/drivers/soc/msm/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -1,4 +1,4 @@
 # When adding new entries keep the list in alphabetical order
 
 obj-$(CONFIG_MSM_SMEM) += smem.o smem_debug.o
-obj-y         += memshare/
\ No newline at end of file
+obj-$(CONFIG_MSM_QMI_INTERFACE)		+= memshare/
diff --git a/drivers/soc/msm/memshare/Kconfig b/drivers/soc/qcom/memshare/Kconfig
index 7eb1415b350b..7eb1415b350b 100644
--- a/drivers/soc/msm/memshare/Kconfig
+++ b/drivers/soc/qcom/memshare/Kconfig
diff --git a/drivers/soc/msm/memshare/Makefile b/drivers/soc/qcom/memshare/Makefile
index c119ad317ed7..c119ad317ed7 100644
--- a/drivers/soc/msm/memshare/Makefile
+++ b/drivers/soc/qcom/memshare/Makefile
diff --git a/drivers/soc/msm/memshare/heap_mem_ext_v01.c b/drivers/soc/qcom/memshare/heap_mem_ext_v01.c
index 3f9fe995fc87..3f9fe995fc87 100644
--- a/drivers/soc/msm/memshare/heap_mem_ext_v01.c
+++ b/drivers/soc/qcom/memshare/heap_mem_ext_v01.c
diff --git a/drivers/soc/msm/memshare/heap_mem_ext_v01.h b/drivers/soc/qcom/memshare/heap_mem_ext_v01.h
index bc2a8cd69b98..bc2a8cd69b98 100644
--- a/drivers/soc/msm/memshare/heap_mem_ext_v01.h
+++ b/drivers/soc/qcom/memshare/heap_mem_ext_v01.h
diff --git a/drivers/soc/msm/memshare/msm_memshare.c b/drivers/soc/qcom/memshare/msm_memshare.c
index 7371717f268a..7371717f268a 100644
--- a/drivers/soc/msm/memshare/msm_memshare.c
+++ b/drivers/soc/qcom/memshare/msm_memshare.c
diff --git a/drivers/soc/msm/memshare/msm_memshare.h b/drivers/soc/qcom/memshare/msm_memshare.h
index 9f12f3a267a3..9f12f3a267a3 100644
--- a/drivers/soc/msm/memshare/msm_memshare.h
+++ b/drivers/soc/qcom/memshare/msm_memshare.h
diff --git a/drivers/soc/msm/smem.c b/drivers/soc/qcom/smem.c
index 42310e346c7c..ffbb47573523 100644
--- a/drivers/soc/msm/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -24,7 +24,7 @@
 #include <linux/slab.h>
 #include <linux/stat.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #include <mach/ramdump.h>
 #include <mach/subsystem_notif.h>
diff --git a/drivers/soc/msm/smem_debug.c b/drivers/soc/qcom/smem_debug.c
index f5f1da7c9d75..ace89afb614c 100644
--- a/drivers/soc/msm/smem_debug.c
+++ b/drivers/soc/qcom/smem_debug.c
@@ -20,7 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/jiffies.h>
 
-#include <soc/msm/smem.h>
+#include <soc/qcom/smem.h>
 
 #include "smem_private.h"
 
diff --git a/drivers/soc/msm/smem_private.h b/drivers/soc/qcom/smem_private.h
index 02e2f0e77c13..02e2f0e77c13 100644
--- a/drivers/soc/msm/smem_private.h
+++ b/drivers/soc/qcom/smem_private.h
diff --git a/include/soc/msm/smem.h b/include/soc/qcom/smem.h
index 92939dd78463..92939dd78463 100644
--- a/include/soc/msm/smem.h
+++ b/include/soc/qcom/smem.h