summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-bcm2708/power.c6
-rw-r--r--arch/arm/mach-bcm2709/power.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-bcm2708/power.c b/arch/arm/mach-bcm2708/power.c
index 2696be978073..0db355dcc233 100644
--- a/arch/arm/mach-bcm2708/power.c
+++ b/arch/arm/mach-bcm2708/power.c
@@ -189,7 +189,11 @@ static void __exit bcm_power_exit(void)
bcm_mailbox_write(MBOX_CHAN_POWER, 0);
}
-arch_initcall(bcm_power_init); /* Initialize early */
+/*
+ * Load after the mailbox driver is initialized (arch_initcall),
+ * but before depending drivers (module_init).
+ */
+subsys_initcall(bcm_power_init);
module_exit(bcm_power_exit);
MODULE_AUTHOR("Phil Elwell");
diff --git a/arch/arm/mach-bcm2709/power.c b/arch/arm/mach-bcm2709/power.c
index 3421057680f8..88c1e28231d7 100644
--- a/arch/arm/mach-bcm2709/power.c
+++ b/arch/arm/mach-bcm2709/power.c
@@ -187,7 +187,11 @@ static void __exit bcm_power_exit(void)
bcm_mailbox_write(MBOX_CHAN_POWER, 0);
}
-arch_initcall(bcm_power_init); /* Initialize early */
+/*
+ * Load after the mailbox driver is initialized (arch_initcall),
+ * but before depending drivers (module_init).
+ */
+subsys_initcall(bcm_power_init);
module_exit(bcm_power_exit);
MODULE_AUTHOR("Phil Elwell");