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

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

Merge changes Ib86172a1,I591d4916 into msm-4.14 

* changes:
  defconfig: sm8150: enable the smcinvoke driver
  drivers/soc/qcom: enable smcinvoke driver
parents 22fe5c91 c7aec0e7

arch/arm64/configs/sm8150-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -511,6 +511,7 @@ CONFIG_QCOM_GLINK=y 
CONFIG_QCOM_GLINK_PKT=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_MSM_CDSP_LOADER=y

CONFIG_QCOM_SMCINVOKE=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_PM=y

CONFIG_QCOM_FSA4480_I2C=y

arch/arm64/configs/sm8150_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ CONFIG_QCOM_GLINK=y 
CONFIG_QCOM_GLINK_PKT=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_MSM_CDSP_LOADER=y

CONFIG_QCOM_SMCINVOKE=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_PM=y

CONFIG_QCOM_FSA4480_I2C=y

drivers/soc/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -547,6 +547,14 @@ config MSM_CDSP_LOADER 
	  for platforms that have compute DSP.

	  Say M if you want to enable this module.



config QCOM_SMCINVOKE

       bool "Secure QSEE Support"

       help

         Enable SMCInvoke driver which supports capability based secure

         communication between QTI Secure Execution Environment (QSEE)

         and high level operating system. It exposes APIs for both

         userspace and kernel clients.



config MSM_EVENT_TIMER

	bool "Event timer"

        help

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ obj-$(CONFIG_QTI_SYSTEM_PM) += system_pm.o 
obj-$(MSM_REMOTEQDSS) += remoteqdss.o

obj-$(CONFIG_MSM_JTAGV8) += jtagv8.o jtagv8-etm.o

obj-$(CONFIG_MSM_CDSP_LOADER) += qdsp6v2/

obj-$(CONFIG_QCOM_SMCINVOKE) += smcinvoke.o



ifdef CONFIG_MSM_SUBSYSTEM_RESTART

       obj-y += subsystem_notif.o