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) |
[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 5dffcfefc3c7..2ad64efdf183 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -452,6 +452,11 @@ running once the system is up. | |||
452 | 452 | ||
453 | eata= [HW,SCSI] | 453 | eata= [HW,SCSI] |
454 | 454 | ||
455 | ec_intr= [HW,ACPI] ACPI Embedded Controller interrupt mode | ||
456 | Format: <int> | ||
457 | 0: polling mode | ||
458 | non-0: interrupt mode (default) | ||
459 | |||
455 | eda= [HW,PS2] | 460 | eda= [HW,PS2] |
456 | 461 | ||
457 | edb= [HW,PS2] | 462 | edb= [HW,PS2] |
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index bb3963b49a98..d4366ad4edcd 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -73,7 +73,7 @@ static struct acpi_driver acpi_ec_driver = { | |||
73 | .class = ACPI_EC_CLASS, | 73 | .class = ACPI_EC_CLASS, |
74 | .ids = ACPI_EC_HID, | 74 | .ids = ACPI_EC_HID, |
75 | .ops = { | 75 | .ops = { |
76 | .add = acpi_ec_poll_add, | 76 | .add = acpi_ec_intr_add, |
77 | .remove = acpi_ec_remove, | 77 | .remove = acpi_ec_remove, |
78 | .start = acpi_ec_start, | 78 | .start = acpi_ec_start, |
79 | .stop = acpi_ec_stop, | 79 | .stop = acpi_ec_stop, |
@@ -147,7 +147,7 @@ static union acpi_ec *ec_ecdt; | |||
147 | 147 | ||
148 | /* External interfaces use first EC only, so remember */ | 148 | /* External interfaces use first EC only, so remember */ |
149 | static struct acpi_device *first_ec; | 149 | static struct acpi_device *first_ec; |
150 | static int acpi_ec_poll_mode = EC_POLL; | 150 | static int acpi_ec_poll_mode = EC_INTR; |
151 | 151 | ||
152 | /* -------------------------------------------------------------------------- | 152 | /* -------------------------------------------------------------------------- |
153 | Transaction Management | 153 | Transaction Management |
@@ -1594,4 +1594,4 @@ static int __init acpi_ec_set_intr_mode(char *str) | |||
1594 | return 0; | 1594 | return 0; |
1595 | } | 1595 | } |
1596 | 1596 | ||
1597 | __setup("ec_burst=", acpi_ec_set_intr_mode); | 1597 | __setup("ec_intr=", acpi_ec_set_intr_mode); |