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

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

Merge "msm: rpm-smd: move rpm-smd driver to a new location"

parents c9838029 1fd38f13

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_RPM_SMD

	depends on MSM_SMD

	select MSM_MPM_OF

	bool "RPM driver using SMD protocol"

	help

	  RPM is the dedicated hardware engine for managing shared SoC

	  resources. This config adds driver support for using SMD as a

	  transport layer communication with RPM hardware. It also selects

	  the MSM_MPM config that programs the MPM module to monitor interrupts

	  during sleep modes.



config MSM_MPM_OF

	bool "Modem Power Manager"

	depends on OF

arch/arm/mach-msm/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -69,10 +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_RPM_SMD) += rpm-smd.o

ifdef CONFIG_DEBUG_FS

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

endif

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
@@ -104,7 +100,6 @@ obj-$(CONFIG_MSM_CACHE_DUMP) += msm_cache_dump.o 
obj-$(CONFIG_MSM_HSIC_SYSMON) += hsic_sysmon.o

obj-$(CONFIG_MSM_HSIC_SYSMON_TEST) += hsic_sysmon_test.o



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

obj-$(CONFIG_MSM_RPC_USB) += rpc_hsusb.o rpc_fsusb.o



obj-$(CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL) += wdog_debug.o

drivers/soc/qcom/Kconfig

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

	  change events occur.



config MSM_RPM_SMD

	select MSM_MPM_OF

	bool "RPM driver using SMD protocol"

	help

	  RPM is the dedicated hardware engine for managing shared SoC

	  resources. This config adds driver support for using SMD as a

	  transport layer communication with RPM hardware. It also selects

	  the MSM_MPM config that programs the MPM module to monitor interrupts

	  during sleep modes.



config MSM_SMEM

	depends on REMOTE_SPINLOCK_MSM

	bool "MSM Shared Memory (SMEM)"

drivers/soc/qcom/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 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_RPM_SMD) += rpm-smd.o

ifdef CONFIG_DEBUG_FS

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

endif

obj-$(CONFIG_MSM_JTAG) += jtag-fuse.o jtag.o

obj-$(CONFIG_MSM_JTAG_MM) +=  jtag-fuse.o jtag-mm.o

obj-$(CONFIG_MSM_QMI_INTERFACE) += qmi_interface.o