Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b0c4c56 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: smd: Support multiplatform"

parents 9927ec3d e432f9a6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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
+2 −1
Original line number Diff line number Diff line
@@ -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
@@ -546,6 +545,8 @@ CONFIG_MSM_IOMMU_VBIF_CHECK=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
+2 −1
Original line number Diff line number Diff line
@@ -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
@@ -561,6 +560,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
+2 −1
Original line number Diff line number Diff line
@@ -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
+2 −1
Original line number Diff line number Diff line
@@ -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
Loading