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

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

Merge "msm: mpm-of: move mpm-of driver to a new kernel location"

parents c362411b ccc86174

arch/arm/mach-msm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -345,17 +345,6 @@ config MSM_KRAIT_WFE_FIXUP 
config  ARCH_MSM_CORTEX_A5

	bool



config MSM_MPM_OF

	bool "Modem Power Manager"

	depends on OF

	help

	  MPM is a dedicated hardware resource responsible for entering and

	  waking up from a system wide low power mode. The MPM driver tracks

	  the wakeup interrupts and configures the MPM to monitor the wakeup

	  interrupts when going to a system wide sleep mode. This config option

	  enables the MPM driver that supports initialization from a device

	  tree



config MSM_LPM_TEST

	bool "Low Power Mode test framework"

	depends on MSM_RPM || MSM_RPM_SMD

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ CFLAGS_msm_vibrator.o += -Idrivers/staging/android 


obj-$(CONFIG_MSM_RMT_STORAGE_CLIENT) += rmt_storage_client.o

obj-$(CONFIG_MSM_LPM_TEST) += test-lpm.o

obj-$(CONFIG_MSM_MPM_OF) += mpm-of.o

obj-$(CONFIG_MSM_RPM_STATS_LOG) += rpm_stats.o rpm_master_stat.o

obj-$(CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG) += rpm_rbcpr_stats_v2.o

obj-$(CONFIG_MSM_RPM_LOG) += rpm_log.o

drivers/soc/qcom/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -87,6 +87,17 @@ config MSM_SMD_DEBUG 
	  what channels caused interrupt activity, and when internal state

	  change events occur.



config MSM_MPM_OF

	bool "Modem Power Manager"

	depends on OF

	help

	  MPM is a dedicated hardware resource responsible for entering and

	  waking up from a system wide low power mode. The MPM driver tracks

	  the wakeup interrupts and configures the MPM to monitor the wakeup

	  interrupts when going to a system wide sleep mode. This config option

	  enables the MPM driver that supports initialization from a device

	  tree



config MSM_RPM_SMD

	select MSM_MPM_OF

	bool "RPM driver using SMD protocol"

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ obj-$(CONFIG_MSM_BAM_DMUX) += bam_dmux.o 
obj-$(CONFIG_MSM_IPC_ROUTER_HSIC_XPRT) += ipc_router_hsic_xprt.o

obj-$(CONFIG_MSM_IPC_ROUTER_SMD_XPRT) += ipc_router_smd_xprt.o

obj-$(CONFIG_MSM_MEMORY_DUMP) += memory_dump.o

obj-$(CONFIG_MSM_MPM_OF) += mpm-of.o

obj-$(CONFIG_MSM_RPM_SMD) += rpm-smd.o

ifdef CONFIG_DEBUG_FS

obj-$(CONFIG_MSM_RPM_SMD) += rpm-smd-debug.o

arch/arm/mach-msm/mpm-of.c→drivers/soc/qcom/mpm-of.c

+1 −1

File changed and moved.

Contains only whitespace changes.