summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2015-05-01 19:11:58 +0200
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:13:09 +0100
commit8707f869b973a648f7cd8c92693f18e2c643e5b8 (patch)
treecd1efbb7b81c42965c4af0d5205f18773d2f96ec
parent68312978ccd9325f021a364be5002832e7ab91c0 (diff)
downloadlinux-8707f869b973a648f7cd8c92693f18e2c643e5b8.tar.gz
BCM270x: power: Change initcall level to subsys
Load ordering of modules are determined by the initcall used. If it's the same initcall level, makefile ordering decides. Now that the mailbox driver is being moved, it's no longer placed before the power driver by the linker. So use a later initcall level to let the mailbox driver load first. Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-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");