[coreboot-gerrit] New patch to review for coreboot: acpi: Add ACPI_ prefix to IRQ enum and struct names
Furquan Shaikh (furquan@google.com)
gerrit at coreboot.org
Tue Feb 21 22:17:58 CET 2017
Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18444
-gerrit
commit fea9fec1132663f1f29ebd109077c40710e1a849
Author: Furquan Shaikh <furquan at chromium.org>
Date: Tue Feb 21 13:16:30 2017 -0800
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 at chromium.org>
---
src/arch/x86/acpi_device.c | 22 +++----
src/arch/x86/include/arch/acpi_device.h | 68 +++++++++++-----------
src/drivers/pc80/tpm/tpm.c | 12 ++--
src/mainboard/google/chell/devicetree.cb | 6 +-
src/mainboard/google/eve/devicetree.cb | 8 +--
src/mainboard/google/glados/devicetree.cb | 6 +-
src/mainboard/google/lars/devicetree.cb | 6 +-
src/mainboard/google/poppy/devicetree.cb | 6 +-
.../google/reef/variants/baseboard/devicetree.cb | 10 ++--
.../google/reef/variants/pyro/devicetree.cb | 10 ++--
.../google/reef/variants/snappy/devicetree.cb | 12 ++--
src/mainboard/intel/kunimitsu/devicetree.cb | 6 +-
src/mainboard/intel/leafhill/devicetree.cb | 10 ++--
src/soc/intel/skylake/sd.c | 8 +--
14 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c
index 4fe16a1..323d4f1 100644
--- a/src/arch/x86/acpi_device.c
+++ b/src/arch/x86/acpi_device.c
@@ -181,7 +181,7 @@ void acpi_device_write_interrupt(const struct acpi_irq *irq)
return;
/* This is supported by GpioInt() but not Interrupt() */
- if (irq->polarity == IRQ_ACTIVE_BOTH)
+ if (irq->polarity == ACPI_IRQ_ACTIVE_BOTH)
return;
/* Byte 0: Descriptor Type */
@@ -200,13 +200,13 @@ void acpi_device_write_interrupt(const struct acpi_irq *irq)
* [0]: Resource (0=PRODUCER 1=CONSUMER)
*/
flags = 1 << 0; /* ResourceConsumer */
- if (irq->mode == IRQ_EDGE_TRIGGERED)
+ if (irq->mode == ACPI_IRQ_EDGE_TRIGGERED)
flags |= 1 << 1;
- if (irq->polarity == IRQ_ACTIVE_LOW)
+ if (irq->polarity == ACPI_IRQ_ACTIVE_LOW)
flags |= 1 << 2;
- if (irq->shared == IRQ_SHARED)
+ if (irq->shared == ACPI_IRQ_SHARED)
flags |= 1 << 3;
- if (irq->wake == IRQ_WAKE)
+ if (irq->wake == ACPI_IRQ_WAKE)
flags |= 1 << 4;
acpigen_emit_byte(flags);
@@ -262,21 +262,21 @@ void acpi_device_write_gpio(const struct acpi_gpio *gpio)
* [2:1]: Polarity (0=HIGH 1=LOW 2=BOTH)
* [0]: Mode (0=LEVEL 1=EDGE)
*/
- if (gpio->irq.mode == IRQ_EDGE_TRIGGERED)
+ if (gpio->irq.mode == ACPI_IRQ_EDGE_TRIGGERED)
flags |= 1 << 0;
- if (gpio->irq.shared == IRQ_SHARED)
+ if (gpio->irq.shared == ACPI_IRQ_SHARED)
flags |= 1 << 3;
- if (gpio->irq.wake == IRQ_WAKE)
+ if (gpio->irq.wake == ACPI_IRQ_WAKE)
flags |= 1 << 4;
switch (gpio->irq.polarity) {
- case IRQ_ACTIVE_HIGH:
+ case ACPI_IRQ_ACTIVE_HIGH:
flags |= 0 << 1;
break;
- case IRQ_ACTIVE_LOW:
+ case ACPI_IRQ_ACTIVE_LOW:
flags |= 1 << 1;
break;
- case IRQ_ACTIVE_BOTH:
+ case ACPI_IRQ_ACTIVE_BOTH:
flags |= 2 << 1;
break;
}
diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h
index d88d519..a9cc85e 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) } }
diff --git a/src/drivers/pc80/tpm/tpm.c b/src/drivers/pc80/tpm/tpm.c
index 3c3e491..0fdf548 100644
--- a/src/drivers/pc80/tpm/tpm.c
+++ b/src/drivers/pc80/tpm/tpm.c
@@ -936,22 +936,22 @@ static void lpc_tpm_fill_ssdt(struct device *dev)
* PIRQ: Update interrupt vector with configured PIRQ
* Active-Low Level-Triggered Shared
*/
- struct acpi_irq tpm_irq_a = IRQ_LEVEL_LOW(CONFIG_TPM_PIRQ);
+ struct acpi_irq tpm_irq_a = ACPI_IRQ_LEVEL_LOW(CONFIG_TPM_PIRQ);
acpi_device_write_interrupt(&tpm_irq_a);
} else if (tpm_read_int_vector(0) > 0) {
u8 int_vec = tpm_read_int_vector(0);
u8 int_pol = tpm_read_int_polarity(0);
- struct acpi_irq tpm_irq = IRQ_LEVEL_LOW(int_vec);
+ struct acpi_irq tpm_irq = ACPI_IRQ_LEVEL_LOW(int_vec);
if (int_pol & 1)
- tpm_irq.polarity = IRQ_ACTIVE_LOW;
+ tpm_irq.polarity = ACPI_IRQ_ACTIVE_LOW;
else
- tpm_irq.polarity = IRQ_ACTIVE_HIGH;
+ tpm_irq.polarity = ACPI_IRQ_ACTIVE_HIGH;
if (int_pol & 2)
- tpm_irq.mode = IRQ_EDGE_TRIGGERED;
+ tpm_irq.mode = ACPI_IRQ_EDGE_TRIGGERED;
else
- tpm_irq.mode = IRQ_LEVEL_TRIGGERED;
+ tpm_irq.mode = ACPI_IRQ_LEVEL_TRIGGERED;
acpi_device_write_interrupt(&tpm_irq);
}
diff --git a/src/mainboard/google/chell/devicetree.cb b/src/mainboard/google/chell/devicetree.cb
index 2ffaec6..477a8aa 100644
--- a/src/mainboard/google/chell/devicetree.cb
+++ b/src/mainboard/google/chell/devicetree.cb
@@ -201,7 +201,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
@@ -209,7 +209,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
@@ -226,7 +226,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" = "0" # R389
register "jkdet_polarity" = "1" # ActiveLow
diff --git a/src/mainboard/google/eve/devicetree.cb b/src/mainboard/google/eve/devicetree.cb
index e40f0a3..e5ac17f 100644
--- a/src/mainboard/google/eve/devicetree.cb
+++ b/src/mainboard/google/eve/devicetree.cb
@@ -208,7 +208,7 @@ chip soc/intel/skylake
chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer""
- register "generic.irq" = "IRQ_LEVEL_LOW(GPP_E7_IRQ)"
+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E7_IRQ)"
register "generic.speed" = "I2C_SPEED_FAST_PLUS"
register "hid_desc_reg_offset" = "0x1"
device i2c 0a on end
@@ -217,7 +217,7 @@ chip soc/intel/skylake
device pci 15.1 on
chip drivers/i2c/tpm
register "hid" = ""GOOG0005""
- register "irq" = "IRQ_EDGE_LOW(GPP_E0_IRQ)"
+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E0_IRQ)"
device i2c 50 on end
end
end # I2C #1
@@ -225,7 +225,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic
register "hid" = ""GOOG5400""
register "desc" = ""Touchpad""
- register "irq" = "IRQ_EDGE_LOW(GPP_B3_IRQ)"
+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_B3_IRQ)"
device i2c 49 on end
end
end # I2C #2
@@ -257,7 +257,7 @@ chip soc/intel/skylake
register "hid" = ""10EC5663""
register "name" = ""RT53""
register "desc" = ""Realtek RT5663""
- register "irq" = "IRQ_LEVEL_LOW(GPP_D9_IRQ)"
+ register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D9_IRQ)"
register "probed" = "1"
device i2c 13 on end
end
diff --git a/src/mainboard/google/glados/devicetree.cb b/src/mainboard/google/glados/devicetree.cb
index d0584ea..f7a2e52 100644
--- a/src/mainboard/google/glados/devicetree.cb
+++ b/src/mainboard/google/glados/devicetree.cb
@@ -199,7 +199,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
@@ -207,7 +207,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
@@ -224,7 +224,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" = "0" # R389
register "jkdet_polarity" = "1" # ActiveLow
diff --git a/src/mainboard/google/lars/devicetree.cb b/src/mainboard/google/lars/devicetree.cb
index 4291e5f..b95ecf5 100644
--- a/src/mainboard/google/lars/devicetree.cb
+++ b/src/mainboard/google/lars/devicetree.cb
@@ -196,7 +196,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
@@ -204,7 +204,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
@@ -221,7 +221,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/google/poppy/devicetree.cb b/src/mainboard/google/poppy/devicetree.cb
index b3b7623..07cacc0 100644
--- a/src/mainboard/google/poppy/devicetree.cb
+++ b/src/mainboard/google/poppy/devicetree.cb
@@ -201,7 +201,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic
register "hid" = ""ATML0001""
register "desc" = ""Atmel Touchscreen""
- register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)"
+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)"
register "probed" = "1"
device i2c 4b on end
end
@@ -212,7 +212,7 @@ chip soc/intel/skylake
chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer""
- register "generic.irq" = "IRQ_LEVEL_LOW(GPP_D1_IRQ)"
+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D1_IRQ)"
register "hid_desc_reg_offset" = "0x1"
device i2c 0x9 on end
end
@@ -243,7 +243,7 @@ chip soc/intel/skylake
register "hid" = ""10EC5663""
register "name" = ""RT53""
register "desc" = ""Realtek RT5663""
- register "irq" = "IRQ_LEVEL_LOW(GPP_D9_IRQ)"
+ register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D9_IRQ)"
register "probed" = "1"
device i2c 13 on end
end
diff --git a/src/mainboard/google/reef/variants/baseboard/devicetree.cb b/src/mainboard/google/reef/variants/baseboard/devicetree.cb
index 6e51838..b0c82e2 100644
--- a/src/mainboard/google/reef/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/reef/variants/baseboard/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
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 @@ 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"
@@ -176,7 +176,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
@@ -184,7 +184,7 @@ chip soc/intel/apollolake
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 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"
@@ -212,7 +212,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
diff --git a/src/mainboard/google/reef/variants/snappy/devicetree.cb b/src/mainboard/google/reef/variants/snappy/devicetree.cb
index 8d9d307..6d1c9ef 100644
--- a/src/mainboard/google/reef/variants/snappy/devicetree.cb
+++ b/src/mainboard/google/reef/variants/snappy/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"
@@ -187,7 +187,7 @@ chip soc/intel/apollolake
chip drivers/i2c/hid
register "generic.hid" = ""WDHT0001""
register "generic.desc" = ""WDT Touchscreen""
- register "generic.irq" = "IRQ_EDGE_LOW(GPIO_21_IRQ)"
+ register "generic.irq" = "ACPI_IRQ_EDGE_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"
@@ -203,7 +203,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
@@ -213,7 +213,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
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 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 6e51838..b0c82e2 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
diff --git a/src/soc/intel/skylake/sd.c b/src/soc/intel/skylake/sd.c
index a75cf63..a9469be 100644
--- a/src/soc/intel/skylake/sd.c
+++ b/src/soc/intel/skylake/sd.c
@@ -30,10 +30,10 @@ static void sd_fill_ssdt(struct device *dev)
struct acpi_gpio default_gpio = {
.type = ACPI_GPIO_TYPE_INTERRUPT,
.pull = ACPI_GPIO_PULL_NONE,
- .irq.mode = IRQ_EDGE_TRIGGERED,
- .irq.polarity = IRQ_ACTIVE_BOTH,
- .irq.shared = IRQ_SHARED,
- .irq.wake = IRQ_WAKE,
+ .irq.mode = ACPI_IRQ_EDGE_TRIGGERED,
+ .irq.polarity = ACPI_IRQ_ACTIVE_BOTH,
+ .irq.shared = ACPI_IRQ_SHARED,
+ .irq.wake = ACPI_IRQ_WAKE,
.interrupt_debounce_timeout = 10000, /* 100ms */
.pin_count = 1,
.pins = { config->sdcard_cd_gpio_default }
More information about the coreboot-gerrit
mailing list