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/google/reef/variants/pyro/devicetree.cb

diff --git a/src/mainboard/google/reef/variants/pyro/devicetree.cb b/src/mainboard/google/reef/variants/pyro/devicetree.cb
index a01fa04..808ed2c 100644
--- a/src/mainboard/google/reef/variants/pyro/devicetree.cb
+++ b/src/mainboard/google/reef/variants/pyro/devicetree.cb
@@ -155,7 +155,7 @@
 		device pci 15.1 off end # - XDCI
 		device pci 16.0 on	# - I2C 0
 			chip drivers/i2c/da7219
-				register "irq" = "IRQ_LEVEL_LOW(GPIO_116_IRQ)"
+				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)"
 				register "btn_cfg" = "50"
 				register "mic_det_thr" = "500"
 				register "jack_ins_deb" = "20"
@@ -176,7 +176,7 @@
 		device pci 16.2 on
 			chip drivers/i2c/tpm
 				register "hid" = ""GOOG0005""
-				register "irq" = "IRQ_EDGE_LOW(GPIO_28_IRQ)"
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)"
 				device i2c 50 on end
 			end
 		end	# - I2C 2
@@ -184,7 +184,7 @@
 			chip drivers/i2c/hid
 				register "generic.hid" = ""WCOMNTN2""
 				register "generic.desc" = ""WCOM Touchscreen""
-				register "generic.irq" = "IRQ_LEVEL_LOW(GPIO_21_IRQ)"
+				register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_21_IRQ)"
 				register "generic.probed" = "1"
 				register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)"
 				register "generic.reset_delay_ms" = "20"
@@ -198,7 +198,7 @@
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0001""
 				register "desc" = ""ELAN Touchscreen""
-				register "irq" = "IRQ_EDGE_LOW(GPIO_21_IRQ)"
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_21_IRQ)"
 				register "probed" = "1"
 				register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)"
 				register "reset_delay_ms" = "20"
@@ -212,7 +212,7 @@
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
-				register "irq" = "IRQ_EDGE_LOW(GPIO_18_IRQ)"
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_18_IRQ)"
 				register "wake" = "GPE0_DW1_15"
 				register "probed" = "1"
 				device i2c 15 on end