Commit 687e435a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] input: i8042 option parsing

From: Dmitry Torokhov <dtor_core@ameritech.net>

With Vojtech's approval adjusted i8042 option names by dropping i8042_
prefix.

If i8042 is compiled as a module new option names are: direct, dumbkbd,
noaux, nomux, reset, unlock.

If i8042 is build in the kernel the prefix "i8042." is required in front of
an option, like "i8042.reset"
parent b54d1725
...@@ -372,13 +372,15 @@ running once the system is up. ...@@ -372,13 +372,15 @@ running once the system is up.
noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing
i8042_direct [HW] Keyboard has been put into non-translated mode i8042.direct [HW] Put keyboard port into non-translated mode
by BIOS i8042.dumbkbd [HW] Pretend that controlled can only read data from
i8042_dumbkbd [HW] Don't attempt to blink the leds keyboard and can not control its state
i8042_noaux [HW] Don't check for auxiliary (== mouse) port (Don't attempt to blink the leds)
i8042_nomux i8042.noaux [HW] Don't check for auxiliary (== mouse) port
i8042_reset [HW] Reset the controller during init and cleanup i8042.nomux [HW] Don't check presence of an active multiplexing
i8042_unlock [HW] Unlock (ignore) the keylock controller
i8042.reset [HW] Reset the controller during init and cleanup
i8042.unlock [HW] Unlock (ignore) the keylock
i810= [HW,DRM] i810= [HW,DRM]
......
...@@ -29,22 +29,28 @@ MODULE_DESCRIPTION("i8042 keyboard and mouse controller driver"); ...@@ -29,22 +29,28 @@ MODULE_DESCRIPTION("i8042 keyboard and mouse controller driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static unsigned int i8042_noaux; static unsigned int i8042_noaux;
module_param(i8042_noaux, bool, 0); module_param_named(noaux, i8042_noaux, bool, 0);
MODULE_PARM_DESC(noaux, "Do not probe or use AUX (mouse) port.");
static unsigned int i8042_nomux; static unsigned int i8042_nomux;
module_param(i8042_nomux, bool, 0); module_param_named(nomux, i8042_nomux, bool, 0);
MODULE_PARM_DESC(nomux, "Do not check whether an active multiplexing conrtoller is present.");
static unsigned int i8042_unlock; static unsigned int i8042_unlock;
module_param(i8042_unlock, bool, 0); module_param_named(unlock, i8042_unlock, bool, 0);
MODULE_PARM_DESC(unlock, "Ignore keyboard lock.");
static unsigned int i8042_reset; static unsigned int i8042_reset;
module_param(i8042_reset, bool, 0); module_param_named(reset, i8042_reset, bool, 0);
MODULE_PARM_DESC(reset, "Reset controller during init and cleanup.");
static unsigned int i8042_direct; static unsigned int i8042_direct;
module_param(i8042_direct, bool, 0); module_param_named(direct, i8042_direct, bool, 0);
MODULE_PARM_DESC(direct, "Put keyboard port into non-translated mode.");
static unsigned int i8042_dumbkbd; static unsigned int i8042_dumbkbd;
module_param(i8042_dumbkbd, bool, 0); module_param_named(dumbkbd, i8042_dumbkbd, bool, 0);
MODULE_PARM_DESC(dumbkbd, "Pretend that controller can only read data from keyboard");
#undef DEBUG #undef DEBUG
#include "i8042.h" #include "i8042.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment