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

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

Merge changes Iffb2141a,I712a708b into msm-4.14 

* changes:
  defconfig: qcs405: enable required configs for SMP enablement
  drivers: soc: qcom: Add missing SCM call parameters
parents 1749bf6b 311544c2

arch/arm/configs/qcs405-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_QCOM=y

CONFIG_ARCH_QCS405=y

# CONFIG_VDSO is not set

CONFIG_ARM_PSCI=y

CONFIG_PREEMPT=y

CONFIG_CLEANCACHE=y

CONFIG_CMA=y
@@ -37,6 +38,7 @@ CONFIG_ZSMALLOC=y 
CONFIG_SECCOMP=y

CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_AUTOSLEEP=y
@@ -312,6 +314,7 @@ CONFIG_COMMON_CLK_QCOM=y 
CONFIG_HWSPINLOCK=y

CONFIG_MAILBOX=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_BOOT_STATS=y

arch/arm/configs/qcs405_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ CONFIG_ARCH_QCOM=y 
CONFIG_ARCH_QCS405=y

# CONFIG_VDSO is not set

CONFIG_SMP=y

CONFIG_ARM_PSCI=y

CONFIG_PREEMPT=y

CONFIG_CLEANCACHE=y

CONFIG_CMA=y
@@ -41,6 +42,7 @@ CONFIG_ZSMALLOC=y 
CONFIG_SECCOMP=y

CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_AUTOSLEEP=y
@@ -325,6 +327,7 @@ CONFIG_QCOM_LAZY_MAPPING=y 
CONFIG_IOMMU_DEBUG=y

CONFIG_QCOM_IOMMU=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_BOOT_STATS=y

arch/arm64/configs/qcs405-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ CONFIG_PM_WAKELOCKS=y 
CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -165,6 +166,7 @@ CONFIG_NET_EMATCH_U32=y 
CONFIG_NET_EMATCH_META=y

CONFIG_NET_EMATCH_TEXT=y

CONFIG_NET_CLS_ACT=y

CONFIG_QRTR=y

CONFIG_RMNET_DATA=y

CONFIG_RMNET_DATA_FC=y

CONFIG_BT=y
@@ -313,6 +315,7 @@ CONFIG_ION=y 
CONFIG_HWSPINLOCK=y

CONFIG_MAILBOX=y

CONFIG_IOMMU_IO_PGTABLE_LPAE=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

arch/arm64/configs/qcs405_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ CONFIG_PM_WAKELOCKS_LIMIT=0 
# CONFIG_PM_WAKELOCKS_GC is not set

CONFIG_PM_DEBUG=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -172,6 +173,7 @@ CONFIG_NET_EMATCH_U32=y 
CONFIG_NET_EMATCH_META=y

CONFIG_NET_EMATCH_TEXT=y

CONFIG_NET_CLS_ACT=y

CONFIG_QRTR=y

CONFIG_RMNET_DATA=y

CONFIG_RMNET_DATA_FC=y

CONFIG_RMNET_DATA_DEBUG_PKT=y
@@ -326,6 +328,7 @@ CONFIG_HWSPINLOCK=y 
CONFIG_MAILBOX=y

CONFIG_IOMMU_IO_PGTABLE_LPAE=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

drivers/soc/qcom/scm.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ DEFINE_MUTEX(scm_lmh_lock); 
#define R3_STR "r3"

#define R4_STR "r4"

#define R5_STR "r5"

#define R6_STR "r6"



#endif