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

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

Merge "msm: no-pm: move no-pm driver to a new location"

parents 55245a85 cd53326c

arch/arm/mach-msm/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -863,10 +863,6 @@ config MSM_GPIOMUX 
config MSM_NATIVE_RESTART

	bool



config MSM_NOPM

	default y if !PM

	bool



config MSM_BUS_SCALING

	bool "Bus scaling driver"

	default n

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ obj-$(CONFIG_MSM_SCM) += scm-boot.o 
obj-$(CONFIG_MSM_XPU_ERR_FATAL) += scm-xpu.o

obj-$(CONFIG_MSM_TEST_QMI_CLIENT) += kernel_test_service_v01.o test_qmi_client.o

obj-y += qdsp6v2/

obj-$(CONFIG_MSM_NOPM) += no-pm.o



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

drivers/power/qcom/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,13 @@ config MSM_PM 
	  low power modes. It interface with various system

	  driver and put the cores into low power modes.



config MSM_NOPM

	default y if !PM

	bool

	help

	  This enables bare minimum support of power management at platform level.

	  i.e WFI



if MSM_PM

menuconfig MSM_IDLE_STATS

	bool "Collect idle statistics"

drivers/power/qcom/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_MSM_PM)		+= msm-pm.o pm-data.o

obj-$(CONFIG_MSM_IDLE_STATS)	+= pm-stats.o

obj-$(CONFIG_MSM_NOPM)		+= no-pm.o

obj-$(CONFIG_PM)		+= pm-boot.o

arch/arm/mach-msm/no-pm.c→drivers/power/qcom/no-pm.c

+0 −1
Original line number Diff line number Diff line
@@ -24,4 +24,3 @@ void arch_idle(void) 
void msm_cpu_pm_enter_sleep(enum msm_pm_sleep_mode mode, bool from_idle) {}



void msm_pm_enable_retention(bool enable) {}