[coreboot-gerrit] Change in coreboot[master]: acpi_device: Prefix IRQ macros with ACPI

[gerrit code review]

>From Duncan Laurie <dlaurie at chromium.org>:

Duncan Laurie has submitted this change and it was merged. ( https://review.coreboot.org/18833 )

Change subject: acpi_device: Prefix IRQ macros with ACPI
......................................................................


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 at chromium.org>
Reviewed-on: https://review.coreboot.org/18833
Reviewed-by: Aaron Durbin <adurbin at chromium.org>
Reviewed-by: Furquan Shaikh <furquan at google.com>
Tested-by: build bot (Jenkins)
---
M src/arch/x86/include/arch/acpi_device.h
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Aaron Durbin: Looks good to me, approved
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved



diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h
index 08dae65..6933f31 100644
--- a/src/arch/x86/include/arch/acpi_device.h
+++ b/src/arch/x86/include/arch/acpi_device.h
@@ -195,8 +195,8 @@
 #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 @@
 #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 @@
 #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) } }
 

-- 
To view, visit https://review.coreboot.org/18833
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4040eca4c7c9d8f7b4f0add411d5d6fe5ed1eb8
Gerrit-PatchSet: 4
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Duncan Laurie <dlaurie at chromium.org>
Gerrit-Reviewer: Aaron Durbin <adurbin at chromium.org>
Gerrit-Reviewer: Duncan Laurie <dlaurie at chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan at google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: Rizwan Qureshi <rizwan.qureshi at intel.com>
Gerrit-Reviewer: build bot (Jenkins)