commit 5b9b593f2f888c81cc0af8eb2fc2173c83562003
author Furquan Shaikh <furquan@chromium.org> Tue Feb 21 13:16:30 2017 -0800
committer Furquan Shaikh <furquan@google.com> Wed Feb 22 22:19:19 2017 +0100
tree fb37a6b896196713305ae305e53c1f42d536f209
parent eae492657797636d99f8ebef75f46237bd39b56b

acpi: Add ACPI_ prefix to IRQ enum and struct names

This is done to avoid any conflicts with same IRQ enums defined by other
drivers.

BUG=None
BRANCH=None
TEST=Compiles successfully

Change-Id: I539831d853286ca45f6c36c3812a6fa9602df24c
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/18444
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

src/mainboard/intel/kunimitsu/devicetree.cb

diff --git a/src/mainboard/intel/kunimitsu/devicetree.cb b/src/mainboard/intel/kunimitsu/devicetree.cb
index 6a6c2ce..11cb31a 100644
--- a/src/mainboard/intel/kunimitsu/devicetree.cb
+++ b/src/mainboard/intel/kunimitsu/devicetree.cb
@@ -206,7 +206,7 @@
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0001""
 				register "desc" = ""ELAN Touchscreen""
-				register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)"
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)"
 				device i2c 10 on end
 			end
 		end # I2C #0
@@ -214,7 +214,7 @@
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
-				register "irq" = "IRQ_EDGE_LOW(GPP_B3_IRQ)"
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_B3_IRQ)"
 				register "wake" = "GPE0_DW0_05"
 				device i2c 15 on end
 			end
@@ -231,7 +231,7 @@
 		device pci 19.1 off end # I2C #5
 		device pci 19.2 on
 			chip drivers/i2c/nau8825
-				register "irq" = "IRQ_LEVEL_LOW(GPP_F10_IRQ)"
+				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)"
 				register "jkdet_enable" = "1"
 				register "jkdet_pull_enable" = "1"
 				register "jkdet_pull_up" = "1"