diff options
61 files changed, 123 insertions, 112 deletions
diff --git a/Documentation/devicetree/bindings/arm/msm/rpm-smd.txt b/Documentation/devicetree/bindings/arm/msm/rpm-smd.txt index c96ac53e9b79..c422477fd2a2 100644 --- a/Documentation/devicetree/bindings/arm/msm/rpm-smd.txt +++ b/Documentation/devicetree/bindings/arm/msm/rpm-smd.txt @@ -18,7 +18,7 @@ Required properties - rpm-channel-name: The string corresponding to the channel name of the peripheral subsystem - rpm-channel-type: The interal SMD edge for this subsystem found in - <mach/msm_smd.h> + <soc/qcom/smd.h> Optional properties - rpm-standalone: Allow RPM driver to run in standalone mode irrespective of RPM diff --git a/arch/arm/configs/apq8084-perf_defconfig b/arch/arm/configs/apq8084-perf_defconfig index ee95e03e399f..d2eaf464f119 100644 --- a/arch/arm/configs/apq8084-perf_defconfig +++ b/arch/arm/configs/apq8084-perf_defconfig @@ -40,7 +40,6 @@ CONFIG_ARCH_APQ8084=y CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_PCIE=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y @@ -545,6 +544,8 @@ CONFIG_IOMMU_LPAE=y CONFIG_PWM=y CONFIG_PWM_QPNP=y CONFIG_PHY_MSM_SATA=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/apq8084_defconfig b/arch/arm/configs/apq8084_defconfig index b34f7647166b..151835b1468e 100644 --- a/arch/arm/configs/apq8084_defconfig +++ b/arch/arm/configs/apq8084_defconfig @@ -39,7 +39,6 @@ CONFIG_ARCH_APQ8084=y CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_PCIE=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y @@ -560,6 +559,8 @@ CONFIG_CORESIGHT_AUDIO_ETM=y CONFIG_CORESIGHT_RPM_ETM=y CONFIG_CORESIGHT_EVENT=y CONFIG_PHY_MSM_SATA=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/fsm9900-perf_defconfig b/arch/arm/configs/fsm9900-perf_defconfig index 7a7c875584d5..15666f71e193 100644 --- a/arch/arm/configs/fsm9900-perf_defconfig +++ b/arch/arm/configs/fsm9900-perf_defconfig @@ -41,7 +41,6 @@ CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y CONFIG_MSM_MPM_OF=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_PCIE=y CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SYSMON_COMM=y @@ -244,6 +243,8 @@ CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_PWM=y CONFIG_PWM_QPNP=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/fsm9900_defconfig b/arch/arm/configs/fsm9900_defconfig index 53f77b81235c..6e7b8dddc475 100644 --- a/arch/arm/configs/fsm9900_defconfig +++ b/arch/arm/configs/fsm9900_defconfig @@ -40,7 +40,6 @@ CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y CONFIG_MSM_MPM_OF=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_PCIE=y CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SYSMON_COMM=y @@ -244,6 +243,8 @@ CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_PWM=y CONFIG_PWM_QPNP=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/mdm9630_defconfig b/arch/arm/configs/mdm9630_defconfig index 716097bb49d8..90ab9680bbef 100644 --- a/arch/arm/configs/mdm9630_defconfig +++ b/arch/arm/configs/mdm9630_defconfig @@ -34,7 +34,6 @@ CONFIG_ARCH_MSM=y CONFIG_ARCH_MDM9630=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_PCIE=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y @@ -301,6 +300,8 @@ CONFIG_CORESIGHT_ETM=y CONFIG_CORESIGHT_AUDIO_ETM=y CONFIG_CORESIGHT_MODEM_ETM=y CONFIG_CORESIGHT_RPM_ETM=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y diff --git a/arch/arm/configs/mpq8092_defconfig b/arch/arm/configs/mpq8092_defconfig index 86046402174c..dcfd54fb4f0e 100644 --- a/arch/arm/configs/mpq8092_defconfig +++ b/arch/arm/configs/mpq8092_defconfig @@ -37,7 +37,6 @@ CONFIG_ARCH_MPQ8092=y CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y CONFIG_MSM_QMI_INTERFACE=y @@ -408,6 +407,8 @@ CONFIG_CORESIGHT_ETM=y CONFIG_CORESIGHT_ETM_PCSAVE_DEFAULT_ENABLE=y CONFIG_CORESIGHT_AUDIO_ETM=y CONFIG_CORESIGHT_RPM_ETM=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_PHY_MSM_SATA=y diff --git a/arch/arm/configs/msm8226-perf_defconfig b/arch/arm/configs/msm8226-perf_defconfig index 0c60548fff33..172b05d23bd1 100644 --- a/arch/arm/configs/msm8226-perf_defconfig +++ b/arch/arm/configs/msm8226-perf_defconfig @@ -38,7 +38,6 @@ CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8226=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y CONFIG_MSM_QMI_INTERFACE=y @@ -411,6 +410,8 @@ CONFIG_PWM_QPNP=y CONFIG_MOBICORE_SUPPORT=m CONFIG_MOBICORE_API=m CONFIG_MSM_BAM_DMUX=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/msm8226_defconfig b/arch/arm/configs/msm8226_defconfig index 11f7cdfac3f1..39c9aa3deb16 100644 --- a/arch/arm/configs/msm8226_defconfig +++ b/arch/arm/configs/msm8226_defconfig @@ -37,7 +37,6 @@ CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8226=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y CONFIG_MSM_QMI_INTERFACE=y @@ -426,6 +425,8 @@ CONFIG_CORESIGHT_WCN_ETM=y CONFIG_CORESIGHT_RPM_ETM=y CONFIG_CORESIGHT_EVENT=y CONFIG_MSM_BAM_DMUX=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig index 1a322ee3861d..0b458473755e 100644 --- a/arch/arm/configs/msm8610-perf_defconfig +++ b/arch/arm/configs/msm8610-perf_defconfig @@ -40,7 +40,6 @@ CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8610=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y CONFIG_MSM_QMI_INTERFACE=y @@ -376,6 +375,8 @@ CONFIG_PWM=y CONFIG_PWM_QPNP=y CONFIG_SENSORS=y CONFIG_MSM_BAM_DMUX=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig index d43690a1c50b..251b227032f7 100644 --- a/arch/arm/configs/msm8610_defconfig +++ b/arch/arm/configs/msm8610_defconfig @@ -37,7 +37,6 @@ CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8610=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y CONFIG_MSM_QMI_INTERFACE=y @@ -385,6 +384,8 @@ CONFIG_CORESIGHT_RPM_ETM=y CONFIG_CORESIGHT_EVENT=y CONFIG_SENSORS=y CONFIG_MSM_BAM_DMUX=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/msm8916_defconfig b/arch/arm/configs/msm8916_defconfig index d0def4596cfa..5fc6481f7151 100644 --- a/arch/arm/configs/msm8916_defconfig +++ b/arch/arm/configs/msm8916_defconfig @@ -40,8 +40,6 @@ CONFIG_MSM_MPM_OF=y CONFIG_CPU_HAS_L2_PMU=y # CONFIG_MSM_FIQ_SUPPORT is not set # CONFIG_MSM_PROC_COMM is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG4=y CONFIG_MSM_BAM_DMUX=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y @@ -379,6 +377,8 @@ CONFIG_CORESIGHT_FUNNEL=y CONFIG_CORESIGHT_REPLICATOR=y CONFIG_CORESIGHT_STM=y CONFIG_MSM_SMEM=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT3_FS=y diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig index b7c0871cdb13..4f584e5e087b 100644 --- a/arch/arm/configs/msm8974-perf_defconfig +++ b/arch/arm/configs/msm8974-perf_defconfig @@ -42,7 +42,6 @@ CONFIG_ARCH_MSM8974=y CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y CONFIG_MSM_QMI_INTERFACE=y @@ -457,6 +456,8 @@ CONFIG_MOBICORE_API=m CONFIG_BIF=y CONFIG_BIF_QPNP=y CONFIG_MSM_BAM_DMUX=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig index 2c0ad9daadab..571c5c8f0679 100644 --- a/arch/arm/configs/msm8974_defconfig +++ b/arch/arm/configs/msm8974_defconfig @@ -41,7 +41,6 @@ CONFIG_ARCH_MSMSAMARIUM=y CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y -CONFIG_MSM_SMD=y CONFIG_MSM_SMP2P=y CONFIG_MSM_SMP2P_TEST=y CONFIG_MSM_QMI_INTERFACE=y @@ -481,6 +480,8 @@ CONFIG_CORESIGHT_EVENT=y CONFIG_BIF=y CONFIG_BIF_QPNP=y CONFIG_MSM_BAM_DMUX=y +CONFIG_MSM_SMD=y +CONFIG_MSM_SMD_DEBUG=y CONFIG_MSM_SMEM=y CONFIG_MSM_SMEM_LOGGING=y CONFIG_EXT2_FS=y diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 91594608f83e..3b40883701fe 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -656,16 +656,6 @@ config MSM_SERIAL_DEBUGGER_CONSOLE Enables a console so that printk messages are displayed on the debugger serial port as the occur. -config MSM_SMD - depends on MSM_SMEM - bool "MSM Shared Memory Driver (SMD)" - help - Support for the shared memory interface between the apps - processor and the baseband processor. Provides access to - the "shared heap", as well as virtual serial channels - used to communicate with various services on the baseband - processor. - config MSM_PCIE bool "MSM PCIe Controller driver" depends on PCI && PCI_MSI @@ -674,14 +664,6 @@ config MSM_PCIE Enables the PCIe functionality by configures PCIe core on MSM chipset and by enabling the ARM PCI framework extension. -config MSM_SMD_DEBUG - depends on MSM_SMD - default y - bool "MSM SMD debug support" - help - Support for debugging the SMD for communication - between the ARM9 and ARM11 - config MSM_SMP2P bool "SMSM Point-to-Point (SMP2P)" depends on MSM_SMD diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 45db9b369573..42aabef7428e 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -20,7 +20,6 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_MSM_AVS_HW) += avs.o obj-$(CONFIG_CPU_V7) += idle-v7.o -obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o smd_private.o smd_init_dt.o smsm_debug.o obj-$(CONFIG_MSM_SMP2P) += smp2p.o smp2p_debug.o smp2p_gpio.o obj-$(CONFIG_MSM_SMP2P_TEST) += smp2p_loopback.o smp2p_test.o smp2p_gpio_test.o smp2p_spinlock_test.o obj-$(CONFIG_MSM_SCM) += scm-boot.o diff --git a/arch/arm/mach-msm/board-8084.c b/arch/arm/mach-msm/board-8084.c index aa256ad1838f..09d2c8866002 100644 --- a/arch/arm/mach-msm/board-8084.c +++ b/arch/arm/mach-msm/board-8084.c @@ -27,10 +27,10 @@ #include <mach/gpiomux.h> #include <mach/msm_iomap.h> #include <mach/msm_memtypes.h> -#include <mach/msm_smd.h> #include <mach/restart.h> #include <soc/qcom/socinfo.h> #include <soc/qcom/rpm-smd.h> +#include <soc/qcom/smd.h> #include <soc/qcom/smem.h> #include <soc/qcom/spm.h> #include <soc/qcom/pm.h> diff --git a/arch/arm/mach-msm/board-8092.c b/arch/arm/mach-msm/board-8092.c index 99cad0d44536..1905df910b06 100644 --- a/arch/arm/mach-msm/board-8092.c +++ b/arch/arm/mach-msm/board-8092.c @@ -31,7 +31,7 @@ #include <soc/qcom/spm.h> #include <soc/qcom/pm.h> #include <soc/qcom/rpm-smd.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <mach/restart.h> #include <linux/io.h> diff --git a/arch/arm/mach-msm/board-8226.c b/arch/arm/mach-msm/board-8226.c index b1e613ad7a1e..b3ca6c4bc304 100644 --- a/arch/arm/mach-msm/board-8226.c +++ b/arch/arm/mach-msm/board-8226.c @@ -43,8 +43,8 @@ #include <mach/msm_memtypes.h> #include <soc/qcom/socinfo.h> #include <mach/board.h> -#include <mach/msm_smd.h> #include <soc/qcom/rpm-smd.h> +#include <soc/qcom/smd.h> #include <soc/qcom/smem.h> #include <linux/msm_thermal.h> #include <soc/qcom/spm.h> diff --git a/arch/arm/mach-msm/board-8610.c b/arch/arm/mach-msm/board-8610.c index 405b6e735a9e..8fe5163c62b6 100644 --- a/arch/arm/mach-msm/board-8610.c +++ b/arch/arm/mach-msm/board-8610.c @@ -37,8 +37,8 @@ #include <mach/msm_memtypes.h> #include <soc/qcom/socinfo.h> #include <mach/board.h> -#include <mach/msm_smd.h> #include <soc/qcom/rpm-smd.h> +#include <soc/qcom/smd.h> #include <soc/qcom/smem.h> #include <soc/qcom/spm.h> #include <soc/qcom/pm.h> diff --git a/arch/arm/mach-msm/board-8916.c b/arch/arm/mach-msm/board-8916.c index ab60e3fbb7c0..632226c5e063 100644 --- a/arch/arm/mach-msm/board-8916.c +++ b/arch/arm/mach-msm/board-8916.c @@ -22,8 +22,8 @@ #include <soc/qcom/socinfo.h> #include <mach/board.h> #include <mach/msm_memtypes.h> -#include <mach/msm_smd.h> #include <soc/qcom/rpm-smd.h> +#include <soc/qcom/smd.h> #include <soc/qcom/smem.h> #include <soc/qcom/spm.h> #include <soc/qcom/pm.h> diff --git a/arch/arm/mach-msm/board-8974.c b/arch/arm/mach-msm/board-8974.c index 3b142d3ec4b5..8c6aa46c40bf 100644 --- a/arch/arm/mach-msm/board-8974.c +++ b/arch/arm/mach-msm/board-8974.c @@ -32,10 +32,10 @@ #include <mach/gpiomux.h> #include <mach/msm_iomap.h> #include <mach/msm_memtypes.h> -#include <mach/msm_smd.h> #include <mach/restart.h> #include <soc/qcom/rpm-smd.h> #include <soc/qcom/socinfo.h> +#include <soc/qcom/smd.h> #include <soc/qcom/smem.h> #include <soc/qcom/spm.h> #include <soc/qcom/pm.h> diff --git a/arch/arm/mach-msm/board-9630.c b/arch/arm/mach-msm/board-9630.c index 41aa27892f67..fd122ff4b662 100644 --- a/arch/arm/mach-msm/board-9630.c +++ b/arch/arm/mach-msm/board-9630.c @@ -27,9 +27,9 @@ #include <mach/gpiomux.h> #include <mach/msm_iomap.h> #include <mach/msm_memtypes.h> -#include <mach/msm_smd.h> #include <mach/restart.h> #include <soc/qcom/socinfo.h> +#include <soc/qcom/smd.h> #include <soc/qcom/smem.h> #include <soc/qcom/spm.h> #include "board-dt.h" diff --git a/arch/arm/mach-msm/board-fsm9900.c b/arch/arm/mach-msm/board-fsm9900.c index 87d4f0f3d523..9f8a36451482 100644 --- a/arch/arm/mach-msm/board-fsm9900.c +++ b/arch/arm/mach-msm/board-fsm9900.c @@ -25,9 +25,9 @@ #include <mach/board.h> #include <mach/gpiomux.h> #include <mach/msm_iomap.h> -#include <mach/msm_smd.h> #include <mach/restart.h> #include <soc/qcom/socinfo.h> +#include <soc/qcom/smd.h> #include "board-dt.h" #include "clock.h" #include "platsmp.h" diff --git a/arch/arm/mach-msm/board-samarium.c b/arch/arm/mach-msm/board-samarium.c index 17933b3b4be9..77e938f76479 100644 --- a/arch/arm/mach-msm/board-samarium.c +++ b/arch/arm/mach-msm/board-samarium.c @@ -32,7 +32,7 @@ #include <soc/qcom/spm.h> #include <soc/qcom/pm.h> #include <soc/qcom/rpm-smd.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include "board-dt.h" #include "clock.h" #include "platsmp.h" diff --git a/arch/arm/mach-msm/rpm-smd.c b/arch/arm/mach-msm/rpm-smd.c index 0154e31d7e0e..99d5e3f290df 100644 --- a/arch/arm/mach-msm/rpm-smd.c +++ b/arch/arm/mach-msm/rpm-smd.c @@ -35,8 +35,8 @@ #include <linux/rbtree.h> #include <soc/qcom/rpm-notifier.h> #include <soc/qcom/rpm-smd.h> +#include <soc/qcom/smd.h> -#include <mach/msm_smd.h> #define CREATE_TRACE_POINTS #include <trace/events/trace_rpm_smd.h> diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 60466217d0d0..10b5daf0acf9 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -36,7 +36,7 @@ #include <soc/qcom/smem.h> #if defined(CONFIG_MSM_SMD) -#include <mach/msm_smsm.h> +#include <soc/qcom/smsm.h> #endif #include "timer.h" diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c index 15d6ac1b9f4a..e6e052dd44e4 100644 --- a/drivers/char/adsprpc.c +++ b/drivers/char/adsprpc.c @@ -24,7 +24,7 @@ #include <linux/list.h> #include <linux/hash.h> #include <linux/msm_ion.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <linux/msm_iommu_domains.h> #include <linux/scatterlist.h> #include <linux/fs.h> diff --git a/drivers/char/diag/diagchar.h b/drivers/char/diag/diagchar.h index 3284aba4c655..e2a3b585d03e 100644 --- a/drivers/char/diag/diagchar.h +++ b/drivers/char/diag/diagchar.h @@ -22,7 +22,7 @@ #include <linux/workqueue.h> #include <linux/sched.h> #include <linux/wakelock.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <asm/atomic.h> /* Size of the USB buffers used for read and write*/ diff --git a/drivers/char/diag/diagfwd.c b/drivers/char/diag/diagfwd.c index baed2146387e..f6f5f1950164 100644 --- a/drivers/char/diag/diagfwd.c +++ b/drivers/char/diag/diagfwd.c @@ -27,8 +27,8 @@ #ifdef CONFIG_DIAG_OVER_USB #include <mach/usbdiag.h> #endif -#include <mach/msm_smd.h> #include <soc/qcom/socinfo.h> +#include <soc/qcom/smd.h> #include <mach/restart.h> #include "diagmem.h" #include "diagchar.h" diff --git a/drivers/char/msm_smd_pkt.c b/drivers/char/msm_smd_pkt.c index d25334b7f91b..65f2c6b9d352 100644 --- a/drivers/char/msm_smd_pkt.c +++ b/drivers/char/msm_smd_pkt.c @@ -30,14 +30,14 @@ #include <linux/completion.h> #include <linux/msm_smd_pkt.h> #include <linux/poll.h> -#include <soc/qcom/subsystem_restart.h> #include <asm/ioctls.h> #include <linux/pm.h> #include <linux/of.h> #include <linux/ipc_logging.h> -#include <mach/msm_smd.h> -#include <mach/msm_smsm.h> +#include <soc/qcom/smd.h> +#include <soc/qcom/smsm.h> +#include <soc/qcom/subsystem_restart.h> #ifdef CONFIG_ARCH_FSM9XXX #define DEFAULT_NUM_SMD_PKT_PORTS 4 diff --git a/drivers/char/rdbg.c b/drivers/char/rdbg.c index a399d2455cd0..9e6d7d8d1250 100644 --- a/drivers/char/rdbg.c +++ b/drivers/char/rdbg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -22,7 +22,7 @@ #include <linux/completion.h> #include <linux/of_gpio.h> #include <linux/mutex.h> -#include <mach/msm_smsm.h> +#include <soc/qcom/smsm.h> #include <linux/uaccess.h> #define SMP2P_NUM_PROCS 8 diff --git a/drivers/media/radio/radio-iris-transport.c b/drivers/media/radio/radio-iris-transport.c index d3fe11cd5a89..88133ce5cae8 100644 --- a/drivers/media/radio/radio-iris-transport.c +++ b/drivers/media/radio/radio-iris-transport.c @@ -4,7 +4,8 @@ * FM HCI_SMD ( FM HCI Shared Memory Driver) is Qualcomm's Shared memory driver * for the HCI protocol. This file is based on drivers/bluetooth/hci_vhci.c * - * Copyright (c) 2000-2001, 2011-2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2000-2001, 2011-2012, 2014 The Linux Foundation. + * All rights reserved. * * Copyright (C) 2002-2003 Maxim Krasnyansky <maxk@qualcomm.com> * Copyright (C) 2004-2006 Marcel Holtmann <marcel@holtmann.org> @@ -26,7 +27,7 @@ #include <linux/string.h> #include <linux/skbuff.h> #include <linux/workqueue.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <media/radio-iris.h> struct radio_data { diff --git a/drivers/net/wireless/wcnss/wcnss_wlan.c b/drivers/net/wireless/wcnss/wcnss_wlan.c index 8fa99c4fc84c..cee4fb061a6c 100644 --- a/drivers/net/wireless/wcnss/wcnss_wlan.c +++ b/drivers/net/wireless/wcnss/wcnss_wlan.c @@ -38,7 +38,8 @@ #include <soc/qcom/subsystem_restart.h> #include <soc/qcom/subsystem_notif.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> + #include <mach/msm_iomap.h> #ifdef CONFIG_WCNSS_MEM_PRE_ALLOC diff --git a/drivers/platform/msm/ipa/a2_service.c b/drivers/platform/msm/ipa/a2_service.c index 3d13252b9219..bdecb9984a52 100644 --- a/drivers/platform/msm/ipa/a2_service.c +++ b/drivers/platform/msm/ipa/a2_service.c @@ -22,7 +22,7 @@ #include <linux/clk.h> #include <linux/wakelock.h> #include <linux/msm-sps.h> -#include <mach/msm_smsm.h> +#include <soc/qcom/smsm.h> #include <soc/qcom/socinfo.h> #include <linux/ipa.h> #include "ipa_i.h" diff --git a/drivers/platform/msm/ssm.c b/drivers/platform/msm/ssm.c index fe612a683a60..3aaa75140bfd 100644 --- a/drivers/platform/msm/ssm.c +++ b/drivers/platform/msm/ssm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -28,7 +28,7 @@ #include <linux/msm_ion.h> #include <linux/platform_data/qcom_ssm.h> #include <soc/qcom/scm.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include "qseecom_kernel.h" #include "ssm.h" diff --git a/drivers/platform/msm/usb_bam.c b/drivers/platform/msm/usb_bam.c index 3cd52006d2c2..3e9e5db0237a 100644 --- a/drivers/platform/msm/usb_bam.c +++ b/drivers/platform/msm/usb_bam.c @@ -26,7 +26,7 @@ #include <linux/ipa.h> #include <linux/workqueue.h> #include <linux/dma-mapping.h> -#include <mach/msm_smsm.h> +#include <soc/qcom/smsm.h> #include <linux/pm_runtime.h> #define USB_THRESHOLD 512 diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 3e5bf62c8d98..86da7cf9d8a2 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -66,6 +66,27 @@ config MSM_QMI_INTERFACE to perform QMI message marshaling and transport them over IPC Router. +config MSM_SMD + depends on MSM_SMEM + bool "MSM Shared Memory Driver (SMD)" + help + Support for the shared memory interprocessor communication protocol + which provides virual point to point serial channels between processes + on the apps processor and processes on other processors in the SoC. + Also includes support for the Shared Memory State Machine (SMSM) + protocol which provides a mechanism to publish single bit state + information to one or more processors in the SoC. + +config MSM_SMD_DEBUG + depends on MSM_SMD + bool "MSM SMD debug support" + help + Support for debugging SMD and SMSM communication between apps and + other processors in the SoC. Debug support primarily consists of + logs consisting of information such as what interrupts were processed, + what channels caused interrupt activity, and when internal state + change events occur. + config MSM_SMEM depends on REMOTE_SPINLOCK_MSM bool "MSM Shared Memory (SMEM)" diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 07e7fd4b10d6..2c61aafef989 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_MSM_QMI_INTERFACE) += qmi_interface.o obj-$(CONFIG_MSM_SCM) += scm.o +obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o smd_private.o smd_init_dt.o smsm_debug.o obj-$(CONFIG_MSM_SMEM) += smem.o smem_debug.o obj-$(CONFIG_MSM_SMEM_LOGGING) += smem_log.o obj-$(CONFIG_MSM_WATCHDOG_V2) += watchdog_v2.o diff --git a/drivers/soc/qcom/bam_dmux.c b/drivers/soc/qcom/bam_dmux.c index 46d931e27bb7..4d99e709d70f 100644 --- a/drivers/soc/qcom/bam_dmux.c +++ b/drivers/soc/qcom/bam_dmux.c @@ -29,15 +29,13 @@ #include <linux/of.h> #include <linux/ipc_logging.h> #include <linux/srcu.h> +#include <linux/msm-sps.h> +#include <soc/qcom/bam_dmux.h> +#include <soc/qcom/smsm.h> #include <soc/qcom/subsystem_restart.h> #include <soc/qcom/subsystem_notif.h> #include <soc/qcom/socinfo.h> -#include <linux/msm-sps.h> -#include <mach/msm_smsm.h> - -#include <soc/qcom/bam_dmux.h> - #include "bam_dmux_private.h" #define BAM_CH_LOCAL_OPEN 0x1 diff --git a/drivers/soc/qcom/ipc_router_smd_xprt.c b/drivers/soc/qcom/ipc_router_smd_xprt.c index 1af1e563866b..a4112cb944cf 100644 --- a/drivers/soc/qcom/ipc_router_smd_xprt.c +++ b/drivers/soc/qcom/ipc_router_smd_xprt.c @@ -23,10 +23,10 @@ #include <linux/skbuff.h> #include <linux/delay.h> #include <linux/sched.h> -#include <soc/qcom/subsystem_restart.h> -#include <mach/msm_smd.h> -#include <mach/msm_smsm.h> +#include <soc/qcom/smd.h> +#include <soc/qcom/smsm.h> +#include <soc/qcom/subsystem_restart.h> static int msm_ipc_router_smd_xprt_debug_mask; module_param_named(debug_mask, msm_ipc_router_smd_xprt_debug_mask, diff --git a/drivers/soc/qcom/pil-q6v5-mss.c b/drivers/soc/qcom/pil-q6v5-mss.c index b2075f5370b9..4328d66bbf8b 100644 --- a/drivers/soc/qcom/pil-q6v5-mss.c +++ b/drivers/soc/qcom/pil-q6v5-mss.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -30,10 +30,8 @@ #include <soc/qcom/sysmon.h> #include <soc/qcom/subsystem_restart.h> #include <soc/qcom/ramdump.h> - -#include <mach/msm_smsm.h> - #include <soc/qcom/smem.h> +#include <soc/qcom/smsm.h> #include "peripheral-loader.h" #include "pil-q6v5.h" diff --git a/drivers/soc/qcom/qdsp6v2/apr.c b/drivers/soc/qcom/qdsp6v2/apr.c index d7d9448b0c4d..060dae74de8a 100644 --- a/drivers/soc/qcom/qdsp6v2/apr.c +++ b/drivers/soc/qcom/qdsp6v2/apr.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -29,7 +29,7 @@ #include <soc/qcom/subsystem_restart.h> #include <soc/qcom/subsystem_notif.h> #include <sound/apr_audio-v2.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <linux/qdsp6v2/apr.h> #include <linux/qdsp6v2/apr_tal.h> #include <linux/qdsp6v2/dsp_debug.h> diff --git a/drivers/soc/qcom/qdsp6v2/apr_tal.c b/drivers/soc/qcom/qdsp6v2/apr_tal.c index d978cce835b5..6d93d260cfde 100644 --- a/drivers/soc/qcom/qdsp6v2/apr_tal.c +++ b/drivers/soc/qcom/qdsp6v2/apr_tal.c @@ -26,7 +26,7 @@ #include <linux/platform_device.h> #include <linux/delay.h> #include <linux/clk.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <linux/qdsp6v2/apr_tal.h> static char *svc_names[APR_DEST_MAX][APR_CLIENT_MAX] = { diff --git a/arch/arm/mach-msm/smd.c b/drivers/soc/qcom/smd.c index 4fe0eefeb7db..66be388dd6e4 100644 --- a/arch/arm/mach-msm/smd.c +++ b/drivers/soc/qcom/smd.c @@ -1,4 +1,4 @@ -/* arch/arm/mach-msm/smd.c +/* drivers/soc/qcom/smd.c * * Copyright (C) 2007 Google, Inc. * Copyright (c) 2008-2014, The Linux Foundation. All rights reserved. @@ -38,16 +38,15 @@ #include <linux/of.h> #include <linux/of_irq.h> #include <linux/ipc_logging.h> -#include <soc/qcom/subsystem_restart.h> -#include <soc/qcom/subsystem_notif.h> -#include <soc/qcom/ramdump.h> - -#include <mach/msm_smd.h> +#include <soc/qcom/ramdump.h> +#include <soc/qcom/smd.h> #include <soc/qcom/smem.h> +#include <soc/qcom/subsystem_notif.h> +#include <soc/qcom/subsystem_restart.h> #include "smd_private.h" -#include "../../../drivers/soc/qcom/smem_private.h" +#include "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/drivers/soc/qcom/smd_debug.c index 65ad8abdbd5a..283914440136 100644 --- a/arch/arm/mach-msm/smd_debug.c +++ b/drivers/soc/qcom/smd_debug.c @@ -1,4 +1,4 @@ -/* arch/arm/mach-msm/smd_debug.c +/* drivers/soc/qcom/smd_debug.c * * Copyright (C) 2007 Google, Inc. * Copyright (c) 2009-2014, The Linux Foundation. All rights reserved. diff --git a/arch/arm/mach-msm/smd_init_dt.c b/drivers/soc/qcom/smd_init_dt.c index f1e870f5d4fc..5b5c3b4d5fee 100644 --- a/arch/arm/mach-msm/smd_init_dt.c +++ b/drivers/soc/qcom/smd_init_dt.c @@ -1,6 +1,6 @@ -/* arch/arm/mach-msm/smd_init_dt.c +/* drivers/soc/qcom/smd_init_dt.c * - * Copyright (c) 2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and diff --git a/arch/arm/mach-msm/smd_private.c b/drivers/soc/qcom/smd_private.c index a7ef87fc723d..a7ef87fc723d 100644 --- a/arch/arm/mach-msm/smd_private.c +++ b/drivers/soc/qcom/smd_private.c diff --git a/arch/arm/mach-msm/smd_private.h b/drivers/soc/qcom/smd_private.h index fb6ceb2896ae..ec0502afc598 100644 --- a/arch/arm/mach-msm/smd_private.h +++ b/drivers/soc/qcom/smd_private.h @@ -1,7 +1,7 @@ -/* arch/arm/mach-msm/smd_private.h +/* drivers/soc/qcom/smd_private.h * * Copyright (C) 2007 Google, Inc. - * Copyright (c) 2007-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2007-2014, The Linux Foundation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -22,8 +22,9 @@ #include <linux/remote_spinlock.h> #include <linux/platform_device.h> #include <linux/interrupt.h> -#include <mach/msm_smsm.h> -#include <mach/msm_smd.h> + +#include <soc/qcom/smd.h> +#include <soc/qcom/smsm.h> #define VERSION_QDSP6 4 #define VERSION_APPS_SBL 6 diff --git a/arch/arm/mach-msm/smsm_debug.c b/drivers/soc/qcom/smsm_debug.c index 611bc8fec001..5884daea150c 100644 --- a/arch/arm/mach-msm/smsm_debug.c +++ b/drivers/soc/qcom/smsm_debug.c @@ -1,4 +1,4 @@ -/* arch/arm/mach-msm/smsm_debug.c +/* drivers/soc/qcom/smsm_debug.c * * Copyright (C) 2007 Google, Inc. * Copyright (c) 2009-2014, The Linux Foundation. All rights reserved. @@ -20,9 +20,8 @@ #include <linux/ctype.h> #include <linux/jiffies.h> -#include <mach/msm_smsm.h> - #include <soc/qcom/smem.h> +#include <soc/qcom/smsm.h> #if defined(CONFIG_DEBUG_FS) diff --git a/drivers/soc/qcom/sysmon.c b/drivers/soc/qcom/sysmon.c index 3dd4989fa8f8..511b8e0f2875 100644 --- a/drivers/soc/qcom/sysmon.c +++ b/drivers/soc/qcom/sysmon.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -23,8 +23,7 @@ #include <soc/qcom/hsic_sysmon.h> #include <soc/qcom/sysmon.h> #include <soc/qcom/subsystem_notif.h> - -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #define TX_BUF_SIZE 50 #define RX_BUF_SIZE 500 diff --git a/drivers/tty/serial/msm_smd_tty.c b/drivers/tty/serial/msm_smd_tty.c index 8cdf8bd636ca..36a44c25680c 100644 --- a/drivers/tty/serial/msm_smd_tty.c +++ b/drivers/tty/serial/msm_smd_tty.c @@ -27,14 +27,14 @@ #include <linux/slab.h> #include <linux/ipc_logging.h> #include <linux/of.h> -#include <soc/qcom/subsystem_restart.h> #include <linux/tty.h> #include <linux/tty_driver.h> #include <linux/tty_flip.h> -#include <mach/msm_smd.h> -#include <mach/msm_smsm.h> +#include <soc/qcom/smd.h> +#include <soc/qcom/smsm.h> +#include <soc/qcom/subsystem_restart.h> #define MODULE_NAME "msm_smdtty" #define MAX_SMD_TTYS 37 diff --git a/drivers/usb/gadget/f_rmnet_smd.c b/drivers/usb/gadget/f_rmnet_smd.c index 5a1cf10f7395..ddb1bb067008 100644 --- a/drivers/usb/gadget/f_rmnet_smd.c +++ b/drivers/usb/gadget/f_rmnet_smd.c @@ -5,7 +5,7 @@ * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger * Copyright (C) 2003 Al Borchers (alborchers@steinerpoint.com) * Copyright (C) 2008 Nokia Corporation - * Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ #include <linux/termios.h> #include <linux/debugfs.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <linux/usb/cdc.h> #include <linux/usb/composite.h> #include <linux/usb/ch9.h> diff --git a/drivers/usb/gadget/f_rmnet_smd_sdio.c b/drivers/usb/gadget/f_rmnet_smd_sdio.c index c78f9f3fb3b8..1eac911e9a03 100644 --- a/drivers/usb/gadget/f_rmnet_smd_sdio.c +++ b/drivers/usb/gadget/f_rmnet_smd_sdio.c @@ -5,7 +5,7 @@ * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger * Copyright (C) 2003 Al Borchers (alborchers@steinerpoint.com) * Copyright (C) 2008 Nokia Corporation - * Copyright (c) 2011,2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011,2013-2014 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -39,7 +39,7 @@ #include <linux/termios.h> #include <linux/debugfs.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <mach/sdio_cmux.h> #include <mach/sdio_dmux.h> #include <mach/usb_gadget_xport.h> diff --git a/drivers/usb/gadget/u_bam.c b/drivers/usb/gadget/u_bam.c index f505eb081a92..c4abc7d7a0f4 100644 --- a/drivers/usb/gadget/u_bam.c +++ b/drivers/usb/gadget/u_bam.c @@ -16,7 +16,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/termios.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <linux/netdevice.h> #include <linux/debugfs.h> #include <linux/bitops.h> diff --git a/drivers/usb/gadget/u_rmnet_ctrl_smd.c b/drivers/usb/gadget/u_rmnet_ctrl_smd.c index c97bbabb90d1..fba72e88277b 100644 --- a/drivers/usb/gadget/u_rmnet_ctrl_smd.c +++ b/drivers/usb/gadget/u_rmnet_ctrl_smd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -17,7 +17,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/termios.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <linux/debugfs.h> #include <linux/bitops.h> #include <linux/termios.h> diff --git a/drivers/usb/gadget/u_smd.c b/drivers/usb/gadget/u_smd.c index 44ad0452e983..3cda6b67e6a0 100644 --- a/drivers/usb/gadget/u_smd.c +++ b/drivers/usb/gadget/u_smd.c @@ -1,7 +1,7 @@ /* * u_smd.c - utilities for USB gadget serial over smd * - * Copyright (c) 2011, 2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2013-2014, The Linux Foundation. All rights reserved. * * This code also borrows from drivers/usb/gadget/u_serial.c, which is * Copyright (C) 2000 - 2003 Al Borchers (alborchers@steinerpoint.com) @@ -25,7 +25,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/termios.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <linux/debugfs.h> #include "u_serial.h" diff --git a/arch/arm/mach-msm/include/mach/msm_smd.h b/include/soc/qcom/smd.h index 3cda8041361d..926990ed0533 100644 --- a/arch/arm/mach-msm/include/mach/msm_smd.h +++ b/include/soc/qcom/smd.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/msm_smd.h +/* include/soc/qcom/smd.h * * Copyright (C) 2007 Google, Inc. * Copyright (c) 2009-2014, The Linux Foundation. All rights reserved. diff --git a/arch/arm/mach-msm/include/mach/msm_smsm.h b/include/soc/qcom/smsm.h index 96ca0c86912c..96ca0c86912c 100644 --- a/arch/arm/mach-msm/include/mach/msm_smsm.h +++ b/include/soc/qcom/smsm.h diff --git a/include/soc/qcom/sysmon.h b/include/soc/qcom/sysmon.h index ad399c9cdc61..851e74d7aa92 100644 --- a/include/soc/qcom/sysmon.h +++ b/include/soc/qcom/sysmon.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -15,7 +15,7 @@ #ifndef __MSM_SYSMON_H #define __MSM_SYSMON_H -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <soc/qcom/subsystem_notif.h> /** diff --git a/sound/soc/msm/qdsp6v2/q6core.c b/sound/soc/msm/qdsp6v2/q6core.c index 4fc0877efd7f..eecd6f248167 100644 --- a/sound/soc/msm/qdsp6v2/q6core.c +++ b/sound/soc/msm/qdsp6v2/q6core.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -18,7 +18,7 @@ #include <linux/mutex.h> #include <linux/sched.h> #include <linux/slab.h> -#include <mach/msm_smd.h> +#include <soc/qcom/smd.h> #include <linux/qdsp6v2/apr.h> #include "q6core.h" #include <mach/ocmem.h> |