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

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

Merge "power: reset: Kconfig: enable msm download mode"

parents fadb9ded d2effe9b

arch/arm/mach-msm/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -869,15 +869,6 @@ config MSM_BUS_RPM_MULTI_TIER_ENABLED 
	bool "RPM Multi-tiering Configuration"

	depends on MSM_BUS_SCALING



config MSM_DLOAD_MODE

	bool "Enable download mode on crashes"

	default n

	help

		This makes the SoC enter download mode when it resets

		due to a kernel panic. Note that this doesn't by itself

		make the kernel reboot on a kernel panic - that must be

		enabled via another mechanism.



config MSM_STANDALONE_POWER_COLLAPSE

       bool "Enable standalone power collapse"

       default n

drivers/power/reset/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,15 @@ config POWER_RESET_MSM 
	help

	  Power off and restart support for Qualcomm boards.



config MSM_DLOAD_MODE

	bool "Qualcomm download mode"

	depends on POWER_RESET_MSM

	help

		This makes the SoC enter download mode when it resets

		due to a kernel panic. Note that this doesn't by itself

		make the kernel reboot on a kernel panic - that must be

		enabled via another mechanism.



config POWER_RESET_QNAP

	bool "QNAP power-off driver"

	depends on OF_GPIO && POWER_RESET && PLAT_ORION