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

Commit 2655f51d authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm: vexpress: Move the poweroff/restart code to drivers/power/reset 



This patch moves the arch/arm/mach-vexpress/reset.c functionality to
drivers/platform/reset/ and adds the necessary Kconfig wiring.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarPawel Moll <pawel.moll@arm.com>
parent a937536b

arch/arm/mach-vexpress/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ config ARCH_VEXPRESS 
	select NO_IOPORT

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLCD

	select POWER_RESET

	select POWER_RESET_VEXPRESS

	select POWER_SUPPLY

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select VEXPRESS_CONFIG

	help

arch/arm/mach-vexpress/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \

	-I$(srctree)/arch/arm/plat-versatile/include



obj-y					:= v2m.o reset.o

obj-y					:= v2m.o

obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)	+= ct-ca9x4.o

obj-$(CONFIG_SMP)			+= platsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o

drivers/power/reset/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -30,3 +30,10 @@ config POWER_RESET_RESTART 
	  Some boards don't actually have the ability to power off.

	  Instead they restart, and u-boot holds the SoC until the

	  user presses a key. u-boot then boots into Linux.



config POWER_RESET_VEXPRESS

	bool

	depends on POWER_RESET

	help

	  Power off and reset support for the ARM Ltd. Versatile

	  Express boards.

drivers/power/reset/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o

obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o

obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o

obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o