diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-05 16:46:36 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-05 16:47:30 -0500 |
| commit | 53f11d4ff8797bcceaf014e62bd39f16ce84baec (patch) | |
| tree | 978cac0e05a6581e3730a812e868225966bdddc2 | |
| parent | 02b28a33aae93a3b53068e0858d62f8bcaef60a3 (diff) | |
| download | kernel_samsung_aries-53f11d4ff8797bcceaf014e62bd39f16ce84baec.zip kernel_samsung_aries-53f11d4ff8797bcceaf014e62bd39f16ce84baec.tar.gz kernel_samsung_aries-53f11d4ff8797bcceaf014e62bd39f16ce84baec.tar.bz2 | |
[ACPI] Enable Embedded Controller (EC) interrupt mode by default
"ec_intr=0" reverts to polling
"ec_burst=" no longer exists.
Signed-off-by: Len Brown <len.brown@intel.com>
Acked-by: Luming Yu <luming.yu@intel.com>
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 | ||||
| -rw-r--r-- | drivers/acpi/ec.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 5dffcfe..2ad64ef 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -452,6 +452,11 @@ running once the system is up. eata= [HW,SCSI] + ec_intr= [HW,ACPI] ACPI Embedded Controller interrupt mode + Format: <int> + 0: polling mode + non-0: interrupt mode (default) + eda= [HW,PS2] edb= [HW,PS2] diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index bb3963b..d4366ad 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -73,7 +73,7 @@ static struct acpi_driver acpi_ec_driver = { .class = ACPI_EC_CLASS, .ids = ACPI_EC_HID, .ops = { - .add = acpi_ec_poll_add, + .add = acpi_ec_intr_add, .remove = acpi_ec_remove, .start = acpi_ec_start, .stop = acpi_ec_stop, @@ -147,7 +147,7 @@ static union acpi_ec *ec_ecdt; /* External interfaces use first EC only, so remember */ static struct acpi_device *first_ec; -static int acpi_ec_poll_mode = EC_POLL; +static int acpi_ec_poll_mode = EC_INTR; /* -------------------------------------------------------------------------- Transaction Management @@ -1594,4 +1594,4 @@ static int __init acpi_ec_set_intr_mode(char *str) return 0; } -__setup("ec_burst=", acpi_ec_set_intr_mode); +__setup("ec_intr=", acpi_ec_set_intr_mode); |