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

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

Merge "msm: restart: remove native reboot and add msm_poweroff driver"

parents 018ecdd9 367d3a53

arch/arm/mach-msm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ config ARCH_MSM8974 
	select MSM_PIL

	select MSM_SPM_V2

	select MSM_L2_SPM

	select MSM_NATIVE_RESTART

	select MSM_PM if PM

	select MSM_RPM_SMD

	select REGULATOR
@@ -47,7 +46,6 @@ config ARCH_APQ8084 
	select MSM_SCM

	select HAVE_ARM_ARCH_TIMER

	select MSM_GPIOMUX

	select MSM_NATIVE_RESTART

	select MSM_PM if PM

	select REGULATOR

	select MSM_QDSP6V2_CODECS
@@ -86,7 +84,6 @@ config ARCH_MPQ8092 
	select GPIO_MSM_V3

	select ARM_GIC

	select HAVE_ARM_ARCH_TIMER

	select MSM_NATIVE_RESTART

	select CPU_V7

	select MSM_SCM

	select MSM_GPIOMUX
@@ -156,7 +153,6 @@ config ARCH_FSM9900 
	select PM_DEVFREQ

	select MSM_DEVFREQ_CPUBW

	select MSM_PIL

	select MSM_NATIVE_RESTART

	select REGULATOR

	select ARM_HAS_SG_CHAIN

	select MSM_RUN_QUEUE_STATS
@@ -176,7 +172,6 @@ config ARCH_MDM9630 
	select REGULATOR

	select REGULATOR_RPM_SMD

	select HAVE_ARM_ARCH_TIMER

	select MSM_NATIVE_RESTART

	select MSM_SPM_V2

	select MSM_PM if PM

	select GPIO_MSM_V3
@@ -206,7 +201,6 @@ config ARCH_MSM8610 
	select GPIO_MSM_V3

	select MSM_GPIOMUX

	select HAVE_ARM_ARCH_TIMER

	select MSM_NATIVE_RESTART

	select MSM_QDSP6_APRV2

	select MSM_QDSP6V2_CODECS

	select QMI_ENCDEC
@@ -247,7 +241,6 @@ config ARCH_MSM8226 
	select GPIO_MSM_V3

	select MSM_GPIOMUX

	select HAVE_ARM_ARCH_TIMER

	select MSM_NATIVE_RESTART

	select MSM_QDSP6_APRV2

	select MSM_QDSP6V2_CODECS

	select QMI_ENCDEC
@@ -292,7 +285,6 @@ config ARCH_MSMSAMARIUM 
	select MSM_GPIOMUX

	select MSM_SPM_V2

	select MSM_L2_SPM

	select MSM_NATIVE_RESTART

	select MSM_QDSP6_APRV2

	select MSM_QDSP6V2_CODECS

	select MSM_PM if PM
@@ -849,9 +841,6 @@ config IOMMU_API 
config MSM_GPIOMUX

	bool



config MSM_NATIVE_RESTART

	bool



config MSM_BUS_RPM_MULTI_TIER_ENABLED

	bool "RPM Multi-tiering Configuration"

	depends on MSM_BUS_SCALING

arch/arm/mach-msm/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ obj-$(CONFIG_ARCH_MSM8610) += gpiomux-v2.o gpiomux.o 
obj-$(CONFIG_ARCH_APQ8084) += gpiomux-v2.o gpiomux.o

obj-$(CONFIG_ARCH_FSM9900) += gpiomux-v2.o gpiomux.o



obj-$(CONFIG_MSM_NATIVE_RESTART) += restart.o



obj-$(CONFIG_MSM_CACHE_ERP) += cache_erp.o

obj-$(CONFIG_MSM_CACHE_DUMP) += msm_cache_dump.o
@@ -75,8 +73,6 @@ obj-$(CONFIG_MSM_HSIC_SYSMON_TEST) += hsic_sysmon_test.o 


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



obj-$(CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL) += wdog_debug.o



obj-$(CONFIG_MEMORY_HOLE_CARVEOUT) +=  msm_mem_hole.o



obj-$(CONFIG_MSM_SMCMOD) += smcmod.o

arch/arm/mach-msm/board-8084.c

+0 −1
Original line number Diff line number Diff line
@@ -119,6 +119,5 @@ DT_MACHINE_START(APQ8084_DT, "Qualcomm APQ 8084 (Flattened Device Tree)") 
	.dt_compat		= apq8084_dt_match,

	.reserve		= apq8084_reserve,

	.init_very_early	= apq8084_init_very_early,

	.restart		= msm_restart,

	.smp			= &msm8974_smp_ops,

MACHINE_END

arch/arm/mach-msm/board-8092.c

+0 −1
Original line number Diff line number Diff line
@@ -188,6 +188,5 @@ DT_MACHINE_START(MSM8092_DT, "Qualcomm MSM 8092 (Flattened Device Tree)") 
	.dt_compat		= mpq8092_dt_match,

	.reserve		= mpq8092_dt_reserve,

	.init_very_early	= mpq8092_early_memory,

	.restart		= msm_restart,

	.smp			= &msm8974_smp_ops,

MACHINE_END

arch/arm/mach-msm/board-8226.c

+0 −1
Original line number Diff line number Diff line
@@ -141,6 +141,5 @@ DT_MACHINE_START(MSM8226_DT, "Qualcomm MSM 8226 (Flattened Device Tree)") 
	.dt_compat		= msm8226_dt_match,

	.reserve		= msm8226_reserve,

	.init_very_early	= msm8226_early_memory,

	.restart		= msm_restart,

	.smp			= &arm_smp_ops,

MACHINE_END