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

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

Merge "defconfig: msmcortex: Enable CONFIG_MSM_AVTIMER"

parents 1c37e5b6 e33c56d8

arch/arm64/configs/msmcortex-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ CONFIG_TRACER_PKT=y 
CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_MSM_MPM_OF=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_AVTIMER=y

CONFIG_MSM_CORE_CTL_HELPER=y

CONFIG_QCOM_REMOTEQDSS=y

CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG=y

arch/arm64/configs/msmcortex_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ CONFIG_TRACER_PKT=y 
CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_MSM_MPM_OF=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_AVTIMER=y

CONFIG_MSM_CORE_CTL_HELPER=y

CONFIG_QCOM_REMOTEQDSS=y

CONFIG_MSM_SERVICE_NOTIFIER=y

drivers/soc/qcom/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ config MSM_EVENT_TIMER 


config MSM_AVTIMER

	tristate "Avtimer Driver"

	depends on MSM_QDSP6_APRV2 || MSM_QDSP6_APRV3

	depends on MSM_QDSP6_APRV2 || MSM_QDSP6_APRV3 || MSM_QDSP6_APRV2_GLINK

	help

		This driver gets the Q6 out of power collapsed state and

		exposes ioctl control to read avtimer tick.