diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwspinlock/msm_remote_spinlock.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/msm_iommu-v0.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/msm/vidc/hfi_response_handler.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/msm/vidc/venus_hfi.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/devices/msm_qpic_nand.c | 2 | ||||
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_bridge.c | 2 | ||||
| -rw-r--r-- | drivers/soc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/soc/Makefile | 3 | ||||
| -rw-r--r-- | drivers/soc/qcom/Kconfig (renamed from drivers/soc/msm/Kconfig) | 4 | ||||
| -rw-r--r-- | drivers/soc/qcom/Makefile (renamed from drivers/soc/msm/Makefile) | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/memshare/Kconfig (renamed from drivers/soc/msm/memshare/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/soc/qcom/memshare/Makefile (renamed from drivers/soc/msm/memshare/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/soc/qcom/memshare/heap_mem_ext_v01.c (renamed from drivers/soc/msm/memshare/heap_mem_ext_v01.c) | 0 | ||||
| -rw-r--r-- | drivers/soc/qcom/memshare/heap_mem_ext_v01.h (renamed from drivers/soc/msm/memshare/heap_mem_ext_v01.h) | 0 | ||||
| -rw-r--r-- | drivers/soc/qcom/memshare/msm_memshare.c (renamed from drivers/soc/msm/memshare/msm_memshare.c) | 0 | ||||
| -rw-r--r-- | drivers/soc/qcom/memshare/msm_memshare.h (renamed from drivers/soc/msm/memshare/msm_memshare.h) | 0 | ||||
| -rw-r--r-- | drivers/soc/qcom/smem.c (renamed from drivers/soc/msm/smem.c) | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/smem_debug.c (renamed from drivers/soc/msm/smem_debug.c) | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/smem_private.h (renamed from drivers/soc/msm/smem_private.h) | 0 |
19 files changed, 13 insertions, 14 deletions
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 |