diff options
author | Aaron Lu <aaron.lu@intel.com> | 2012-12-30 19:07:01 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-10 06:36:22 -0500 |
commit | e3ab8e42ffe03418c199ea92a6f8bbb5f1e345c7 (patch) | |
tree | d3363dc3249e6cc66d8f2094791835965091de8c /drivers | |
parent | 78d025e2d057a3490f918a6e3ebe2486236505cf (diff) |
ACPICA: Resource manager: Add support for ACPI 5 wake bit in IRQ descriptor.
Add support to both get and set the extended share flags for the
IRQ() resource descriptor. Reported by Aaron Lu.
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/acpica/rsirq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/rsirq.c b/drivers/acpi/acpica/rsirq.c index a718eca8e825..14cb76e03e14 100644 --- a/drivers/acpi/acpica/rsirq.c +++ b/drivers/acpi/acpica/rsirq.c | |||
@@ -80,7 +80,7 @@ struct acpi_rsconvert_info acpi_rs_get_irq[8] = { | |||
80 | 80 | ||
81 | {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_AML_LENGTH, 0, 3}, | 81 | {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_AML_LENGTH, 0, 3}, |
82 | 82 | ||
83 | /* Get flags: Triggering[0], Polarity[3], Sharing[4] */ | 83 | /* Get flags: Triggering[0], Polarity[3], sharing_and_wake[4:5] */ |
84 | 84 | ||
85 | {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering), | 85 | {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering), |
86 | AML_OFFSET(irq.flags), | 86 | AML_OFFSET(irq.flags), |
@@ -90,7 +90,7 @@ struct acpi_rsconvert_info acpi_rs_get_irq[8] = { | |||
90 | AML_OFFSET(irq.flags), | 90 | AML_OFFSET(irq.flags), |
91 | 3}, | 91 | 3}, |
92 | 92 | ||
93 | {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), | 93 | {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), |
94 | AML_OFFSET(irq.flags), | 94 | AML_OFFSET(irq.flags), |
95 | 4} | 95 | 4} |
96 | }; | 96 | }; |
@@ -114,7 +114,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[13] = { | |||
114 | AML_OFFSET(irq.irq_mask), | 114 | AML_OFFSET(irq.irq_mask), |
115 | ACPI_RS_OFFSET(data.irq.interrupt_count)}, | 115 | ACPI_RS_OFFSET(data.irq.interrupt_count)}, |
116 | 116 | ||
117 | /* Set the flags byte */ | 117 | /* Set flags: Triggering[0], Polarity[3], sharing_and_wake[4:5] */ |
118 | 118 | ||
119 | {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering), | 119 | {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering), |
120 | AML_OFFSET(irq.flags), | 120 | AML_OFFSET(irq.flags), |
@@ -124,7 +124,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[13] = { | |||
124 | AML_OFFSET(irq.flags), | 124 | AML_OFFSET(irq.flags), |
125 | 3}, | 125 | 3}, |
126 | 126 | ||
127 | {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), | 127 | {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), |
128 | AML_OFFSET(irq.flags), | 128 | AML_OFFSET(irq.flags), |
129 | 4}, | 129 | 4}, |
130 | 130 | ||