aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2018-01-27 18:51:40 -0500
committerGeert Uytterhoeven <geert@linux-m68k.org>2018-03-19 10:22:59 +0100
commita64138ec15f4361c456563167bae12ed95a68d6b (patch)
treeabb1bc384ff0859af962044415ec0b0c8079c5df /arch/m68k/mac
parentm68k/mac: Fix apparent race condition in Baboon interrupt dispatch (diff)
downloadlinux-dev-a64138ec15f4361c456563167bae12ed95a68d6b.tar.xz
linux-dev-a64138ec15f4361c456563167bae12ed95a68d6b.zip
macintosh/via-pmu68k: Initialize PMU driver with setup_arch and arch_initcall
The PMU watchdog will power down the system if the kernel is slow to start up, e.g. due to unpacking a large initrd. The powerpc version of this driver (via-pmu.c) has a solution for the same problem. It uses this call sequence: setup_arch find_via_pmu init_pmu ... arch_initcall via_pmu_start Bring via-pmu68k.c into line with via-pmu.c to fix this issue. Cc: Geert Uytterhoeven <geert@linux-m68k.org> Tested-by: Stan Johnson <userm57@yahoo.com> Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac')
-rw-r--r--arch/m68k/mac/config.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 7890a8425710..36086cceb537 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -26,6 +26,7 @@
#include <linux/platform_device.h>
#include <linux/adb.h>
#include <linux/cuda.h>
+#include <linux/pmu.h>
#include <linux/rtc.h>
#include <asm/setup.h>
@@ -890,6 +891,9 @@ static void __init mac_identify(void)
#ifdef CONFIG_ADB_CUDA
find_via_cuda();
#endif
+#ifdef CONFIG_ADB_PMU68K
+ find_via_pmu();
+#endif
}
static void __init mac_report_hardware(void)