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

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

Merge "msm: spm: move SPM drivers to machine independent directory"

parents 46a24876 4f29fa6e

arch/arm/mach-msm/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -959,22 +959,6 @@ config PM8XXX_RPC_VIBRATOR 
	  is connected on the PM8XXX PMIC. Say Y if you want to enable

	  this feature.



config MSM_SPM_V2

	bool "Driver support for SPM Version 2"

	help

	  Enables the support for Version 2 of the SPM driver. SPM hardware is

	  used to manage the processor power during sleep. The driver allows

	  configuring SPM to allow different power modes.



config MSM_L2_SPM

	bool "SPM support for L2 cache"

	depends on MSM_SPM_V2

	help

	  Enable SPM driver support for L2 cache. Some MSM chipsets allow

	  control of L2 cache low power mode with a Subsystem Power manager.

	  Enabling this driver allows configuring L2 SPM for low power modes

	  on supported chipsets.



config MSM_OCMEM

	bool "MSM On-Chip memory driver (OCMEM)"

	help

arch/arm/mach-msm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ obj-$(CONFIG_MSM_NOPM) += no-pm.o 


obj-$(CONFIG_MSM_PCIE) += pcie.o pcie_irq.o pcie_phy.o



obj-$(CONFIG_MSM_SPM_V2) += spm-v2.o spm_devices.o



obj-$(CONFIG_MSM_DMA_TEST) += dma_test.o

obj-$(CONFIG_SURF_FFA_GPIO_KEYPAD) += keypad-surf-ffa.o

drivers/soc/qcom/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -146,6 +146,23 @@ config MSM_SMP2P_TEST 
	  are used to verify the local and remote

	  implementations.



config MSM_SPM_V2

	bool "Driver support for SPM Version 2"

	help

	  Enables the support for Version 2 of the SPM driver. SPM hardware is

	  used to manage the processor power during sleep. The driver allows

	  configuring SPM to allow different low power modes for both core and

	  L2.



config MSM_L2_SPM

	bool "SPM support for L2 cache"

	depends on MSM_SPM_V2

	help

	  Enable SPM driver support for L2 cache. Some MSM chipsets allow

	  control of L2 cache low power mode with a Subsystem Power manager.

	  Enabling this driver allows configuring L2 SPM for low power modes

	  on supported chipsets.



config MSM_QDSP6_APRV2

	bool "Audio QDSP6 APRv2 support"

	depends on MSM_SMD

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_MSM_SMP2P) += smp2p.o smp2p_debug.o 
obj-$(CONFIG_MSM_SMP2P_TEST) += smp2p_loopback.o smp2p_test.o smp2p_spinlock_test.o

obj-$(CONFIG_MSM_WATCHDOG_V2) += watchdog_v2.o

obj-$(CONFIG_MEM_SHARE_QMI_SERVICE)		+= memshare/

obj-$(CONFIG_MSM_SPM_V2) += spm-v2.o spm_devices.o

obj-y		+= socinfo.o



obj-$(CONFIG_MSM_PIL) += peripheral-loader.o

arch/arm/mach-msm/spm-v2.c→drivers/soc/qcom/spm-v2.c

+1 −1

File changed and moved.

Contains only whitespace changes.