From fef661af9dbd8ed58b52b7b2b6c7fbfebbe1aa31 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Mon, 25 May 2020 14:15:29 +0200 Subject: [PATCH] power: vexpress: make the reset driver a module An allmodconfig kernel makes CONFIG_VEXPRESS_CONFIG a module and CONFIG_POWER_RESET_VEXPRESS builtin. That makes us see this build error: aarch64-linux-gnu-ld: drivers/power/reset/vexpress-poweroff.o: in function `vexpress_reset_probe': ../drivers/power/reset/vexpress-poweroff.c:119: undefined reference to `devm_regmap_init_vexpress_config' ../drivers/power/reset/vexpress-poweroff.c:119:(.text+0x48c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `devm_regmap_init_vexpress_config' make[1]: *** [/srv/src/kernel/next/Makefile:1126: vmlinux] Error 1 Signed-off-by: Anders Roxell --- arch/arm/mach-vexpress/Kconfig | 1 - drivers/power/reset/Kconfig | 2 +- drivers/power/reset/vexpress-poweroff.c | 7 ++++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 8391a5b3cd78..394b8d82ba99 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -15,7 +15,6 @@ menuconfig ARCH_VEXPRESS select NO_IOPORT_MAP select PLAT_VERSATILE select POWER_RESET - select POWER_RESET_VEXPRESS select POWER_SUPPLY select REGULATOR if MMC_ARMMMCI select REGULATOR_FIXED_VOLTAGE if REGULATOR diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index 4dfac618b942..a9ee6667d758 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -189,7 +189,7 @@ config POWER_RESET_VERSATILE reference boards. config POWER_RESET_VEXPRESS - bool "ARM Versatile Express power-off and reset driver" + tristate "ARM Versatile Express power-off and reset driver" depends on ARM || ARM64 depends on VEXPRESS_CONFIG help diff --git a/drivers/power/reset/vexpress-poweroff.c b/drivers/power/reset/vexpress-poweroff.c index 90cbaa8341e3..cd13b3a5c9df 100644 --- a/drivers/power/reset/vexpress-poweroff.c +++ b/drivers/power/reset/vexpress-poweroff.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include @@ -150,4 +151,8 @@ static int __init vexpress_reset_init(void) { return platform_driver_register(&vexpress_reset_driver); } -device_initcall(vexpress_reset_init); +module_init(vexpress_reset_init); + +MODULE_AUTHOR("Pawel Moll "); +MODULE_DESCRIPTION("Vexpress reset driver"); +MODULE_LICENSE("GPL v2"); -- 2.26.2