diff options
| author | Furquan Shaikh <furquan@chromium.org> | 2017-02-21 13:16:30 -0800 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2017-02-22 22:19:19 +0100 |
| commit | 5b9b593f2f888c81cc0af8eb2fc2173c83562003 (patch) | |
| tree | fb37a6b896196713305ae305e53c1f42d536f209 /src/arch/x86/include | |
| parent | eae492657797636d99f8ebef75f46237bd39b56b (diff) | |
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>
Diffstat (limited to 'src/arch/x86/include')
| -rw-r--r-- | src/arch/x86/include/arch/acpi_device.h | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h index d88d519298..a9cc85eb3b 100644 --- a/src/arch/x86/include/arch/acpi_device.h +++ b/src/arch/x86/include/arch/acpi_device.h @@ -47,55 +47,55 @@ const char *acpi_device_path_join(struct device *dev, const char *name); * ACPI Descriptor for extended Interrupt() */ -enum irq_mode { - IRQ_EDGE_TRIGGERED, - IRQ_LEVEL_TRIGGERED +enum acpi_irq_mode { + ACPI_IRQ_EDGE_TRIGGERED, + ACPI_IRQ_LEVEL_TRIGGERED }; -enum irq_polarity { - IRQ_ACTIVE_LOW, - IRQ_ACTIVE_HIGH, - IRQ_ACTIVE_BOTH +enum acpi_irq_polarity { + ACPI_IRQ_ACTIVE_LOW, + ACPI_IRQ_ACTIVE_HIGH, + ACPI_IRQ_ACTIVE_BOTH }; -enum irq_shared { - IRQ_EXCLUSIVE, - IRQ_SHARED +enum acpi_irq_shared { + ACPI_IRQ_EXCLUSIVE, + ACPI_IRQ_SHARED }; -enum irq_wake { - IRQ_NO_WAKE, - IRQ_WAKE +enum acpi_irq_wake { + ACPI_IRQ_NO_WAKE, + ACPI_IRQ_WAKE }; struct acpi_irq { unsigned int pin; - enum irq_mode mode; - enum irq_polarity polarity; - enum irq_shared shared; - enum irq_wake wake; + enum acpi_irq_mode mode; + enum acpi_irq_polarity polarity; + enum acpi_irq_shared shared; + enum acpi_irq_wake wake; }; -#define IRQ_EDGE_LOW(x) { \ +#define ACPI_IRQ_EDGE_LOW(x) { \ .pin = (x), \ - .mode = IRQ_EDGE_TRIGGERED, \ - .polarity = IRQ_ACTIVE_LOW, \ - .shared = IRQ_EXCLUSIVE, \ - .wake = IRQ_NO_WAKE } + .mode = ACPI_IRQ_EDGE_TRIGGERED, \ + .polarity = ACPI_IRQ_ACTIVE_LOW, \ + .shared = ACPI_IRQ_EXCLUSIVE, \ + .wake = ACPI_IRQ_NO_WAKE } -#define IRQ_EDGE_HIGH(x) { \ +#define ACPI_IRQ_EDGE_HIGH(x) { \ .pin = (x), \ - .mode = IRQ_EDGE_TRIGGERED, \ - .polarity = IRQ_ACTIVE_HIGH, \ - .shared = IRQ_EXCLUSIVE, \ - .wake = IRQ_NO_WAKE } + .mode = ACPI_IRQ_EDGE_TRIGGERED, \ + .polarity = ACPI_IRQ_ACTIVE_HIGH, \ + .shared = ACPI_IRQ_EXCLUSIVE, \ + .wake = ACPI_IRQ_NO_WAKE } -#define IRQ_LEVEL_LOW(x) { \ +#define ACPI_IRQ_LEVEL_LOW(x) { \ .pin = (x), \ - .mode = IRQ_LEVEL_TRIGGERED, \ - .polarity = IRQ_ACTIVE_LOW, \ - .shared = IRQ_SHARED, \ - .wake = IRQ_NO_WAKE } + .mode = ACPI_IRQ_LEVEL_TRIGGERED, \ + .polarity = ACPI_IRQ_ACTIVE_LOW, \ + .shared = ACPI_IRQ_SHARED, \ + .wake = ACPI_IRQ_NO_WAKE } /* Write extended Interrupt() descriptor to SSDT AML output */ void acpi_device_write_interrupt(const struct acpi_irq *irq); @@ -179,8 +179,8 @@ struct acpi_gpio { #define ACPI_GPIO_IRQ_EDGE_HIGH(gpio) { \ .type = ACPI_GPIO_TYPE_INTERRUPT, \ .pull = ACPI_GPIO_PULL_DEFAULT, \ - .irq.mode = IRQ_EDGE_TRIGGERED, \ - .irq.polarity = IRQ_ACTIVE_HIGH, \ + .irq.mode = ACPI_IRQ_EDGE_TRIGGERED, \ + .irq.polarity = ACPI_IRQ_ACTIVE_HIGH, \ .pin_count = 1, \ .pins = { (gpio) } } |