summaryrefslogtreecommitdiff
path: root/src/arch/x86/include
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2017-03-15 11:12:17 -0700
committerDuncan Laurie <dlaurie@chromium.org>2017-03-16 16:24:39 +0100
commit9462e140653048856947b31612590a8b98222787 (patch)
tree5ade4ad1f328fc0ffbe3dd6bd798ba55abfbb38c /src/arch/x86/include
parentbf3091bae688606f9cbd69064bf6deeeddb81d1b (diff)
acpi_device: Prefix IRQ macros with ACPI
Switch some IRQ_* macros to ACPI_IRQ_* instead so they do not fail at compile time if they are used. BUG=b:35581264 BRANCH=none TEST=successfully compile with ACPI_GPIO_IRQ_LEVEL_HIGH Change-Id: Id4040eca4c7c9d8f7b4f0add411d5d6fe5ed1eb8 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://review.coreboot.org/18833 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/arch/x86/include')
-rw-r--r--src/arch/x86/include/arch/acpi_device.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h
index 08dae65db4..6933f315ba 100644
--- a/src/arch/x86/include/arch/acpi_device.h
+++ b/src/arch/x86/include/arch/acpi_device.h
@@ -195,8 +195,8 @@ struct acpi_gpio {
#define ACPI_GPIO_IRQ_EDGE_LOW(gpio) { \
.type = ACPI_GPIO_TYPE_INTERRUPT, \
.pull = ACPI_GPIO_PULL_DEFAULT, \
- .irq.mode = IRQ_EDGE_TRIGGERED, \
- .irq.polarity = IRQ_ACTIVE_LOW, \
+ .irq.mode = ACPI_IRQ_EDGE_TRIGGERED, \
+ .irq.polarity = ACPI_IRQ_ACTIVE_LOW, \
.pin_count = 1, \
.pins = { (gpio) } }
@@ -204,8 +204,8 @@ struct acpi_gpio {
#define ACPI_GPIO_IRQ_LEVEL_HIGH(gpio) { \
.type = ACPI_GPIO_TYPE_INTERRUPT, \
.pull = ACPI_GPIO_PULL_DEFAULT, \
- .irq.mode = IRQ_LEVEL_TRIGGERED, \
- .irq.polarity = IRQ_ACTIVE_HIGH, \
+ .irq.mode = ACPI_IRQ_LEVEL_TRIGGERED, \
+ .irq.polarity = ACPI_IRQ_ACTIVE_HIGH, \
.pin_count = 1, \
.pins = { (gpio) } }
@@ -213,8 +213,8 @@ struct acpi_gpio {
#define ACPI_GPIO_IRQ_LEVEL_LOW(gpio) { \
.type = ACPI_GPIO_TYPE_INTERRUPT, \
.pull = ACPI_GPIO_PULL_DEFAULT, \
- .irq.mode = IRQ_LEVEL_TRIGGERED, \
- .irq.polarity = IRQ_ACTIVE_LOW, \
+ .irq.mode = ACPI_IRQ_LEVEL_TRIGGERED, \
+ .irq.polarity = ACPI_IRQ_ACTIVE_LOW, \
.pin_count = 1, \
.pins = { (gpio) } }