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/mainboard/intel | |
| 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/mainboard/intel')
| -rw-r--r-- | src/mainboard/intel/kunimitsu/devicetree.cb | 6 | ||||
| -rw-r--r-- | src/mainboard/intel/leafhill/devicetree.cb | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mainboard/intel/kunimitsu/devicetree.cb b/src/mainboard/intel/kunimitsu/devicetree.cb index 6a6c2ce0e4..11cb31a413 100644 --- a/src/mainboard/intel/kunimitsu/devicetree.cb +++ b/src/mainboard/intel/kunimitsu/devicetree.cb @@ -206,7 +206,7 @@ chip soc/intel/skylake 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 soc/intel/skylake 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 @@ chip soc/intel/skylake 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" diff --git a/src/mainboard/intel/leafhill/devicetree.cb b/src/mainboard/intel/leafhill/devicetree.cb index 6e51838ecd..b0c82e2be8 100644 --- a/src/mainboard/intel/leafhill/devicetree.cb +++ b/src/mainboard/intel/leafhill/devicetree.cb @@ -146,7 +146,7 @@ chip soc/intel/apollolake 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" @@ -167,7 +167,7 @@ chip soc/intel/apollolake 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 @@ -175,7 +175,7 @@ chip soc/intel/apollolake 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" @@ -189,7 +189,7 @@ chip soc/intel/apollolake 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 @@ -199,7 +199,7 @@ chip soc/intel/apollolake chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" - register "generic.irq" = "IRQ_LEVEL_LOW(GPIO_13_IRQ)" + register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_13_IRQ)" register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end |