diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2012-11-22 13:33:35 -0500 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2013-07-30 09:02:18 -0400 |
commit | c4821c0575a3b1bf26f100230dc2938297d7043b (patch) | |
tree | 14e019d10aa1da2def24c6b7a24be0922b0f2d4a /arch/arm/common | |
parent | 6b7437aed1568076cefa4d42747b1515dcb848db (diff) | |
download | blackbird-op-linux-c4821c0575a3b1bf26f100230dc2938297d7043b.tar.gz blackbird-op-linux-c4821c0575a3b1bf26f100230dc2938297d7043b.zip |
ARM: bL_switcher: add kernel cmdline param to disable the switcher on boot
By adding no_bL_switcher to the kernel cmdline string, the switcher
won't be activated automatically at boot time. It is still possible
to activate it later with:
echo 1 > /sys/kernel/bL_switcher/active
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Diffstat (limited to 'arch/arm/common')
-rw-r--r-- | arch/arm/common/bL_switcher.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c index 395f60f6292b..cec825ef392b 100644 --- a/arch/arm/common/bL_switcher.c +++ b/arch/arm/common/bL_switcher.c @@ -26,6 +26,7 @@ #include <linux/string.h> #include <linux/sysfs.h> #include <linux/irqchip/arm-gic.h> +#include <linux/moduleparam.h> #include <asm/smp_plat.h> #include <asm/suspend.h> @@ -521,6 +522,9 @@ static int __init bL_switcher_sysfs_init(void) #endif /* CONFIG_SYSFS */ +static bool no_bL_switcher; +core_param(no_bL_switcher, no_bL_switcher, bool, 0644); + static int __init bL_switcher_init(void) { int ret; @@ -530,9 +534,11 @@ static int __init bL_switcher_init(void) return -EINVAL; } - ret = bL_switcher_enable(); - if (ret) - return ret; + if (!no_bL_switcher) { + ret = bL_switcher_enable(); + if (ret) + return ret; + } #ifdef CONFIG_SYSFS ret = bL_switcher_sysfs_init(); |