HAOUAS Elyes has uploaded this change for review.
ACPI: Clarify serial bus revision and specific revision
Serial bus revision [Byte 3] and serial bus specific revision [Byte 9]
are not the same.
Change-Id: I366f62e6aa0e9c0dfbc1ec17adeebc42a0e777eb
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/arch/x86/acpi_device.c
M src/arch/x86/include/arch/acpi_device.h
2 files changed, 8 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/32329/1
diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c
index c57ba48..bdb864c 100644
--- a/src/arch/x86/acpi_device.c
+++ b/src/arch/x86/acpi_device.c
@@ -377,7 +377,7 @@
desc_length = acpi_device_write_zero_len();
/* Byte 3: Revision ID */
- acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID);
+ acpigen_emit_byte(ACPI_I2C_SERIAL_BUS_REVISION_ID);
/* Byte 4: Resource Source Index is Reserved */
acpigen_emit_byte(0);
@@ -401,7 +401,7 @@
acpigen_emit_word(i2c->mode_10bit);
/* Byte 9: Type Specific Revision ID */
- acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID);
+ acpigen_emit_byte(ACPI_I2C_SPECIFIC_REVISION_ID);
/* Byte 10-11: I2C Type Data Length */
type_length = acpi_device_write_zero_len();
@@ -435,7 +435,7 @@
desc_length = acpi_device_write_zero_len();
/* Byte 3: Revision ID */
- acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID);
+ acpigen_emit_byte(ACPI_SPI_SERIAL_BUS_REVISION_ID);
/* Byte 4: Resource Source Index is Reserved */
acpigen_emit_byte(0);
@@ -464,7 +464,7 @@
acpigen_emit_word(flags);
/* Byte 9: Type Specific Revision ID */
- acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID);
+ acpigen_emit_byte(ACPI_SPI_SPECIFIC_REVISION_ID);
/* Byte 10-11: SPI Type Data Length */
type_length = acpi_device_write_zero_len();
diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h
index d26f330..f940ea3 100644
--- a/src/arch/x86/include/arch/acpi_device.h
+++ b/src/arch/x86/include/arch/acpi_device.h
@@ -311,7 +311,10 @@
#define ACPI_SERIAL_BUS_TYPE_I2C 1
#define ACPI_SERIAL_BUS_TYPE_SPI 2
-#define ACPI_SERIAL_BUS_REVISION_ID 1
+#define ACPI_I2C_SERIAL_BUS_REVISION_ID 1 /* TODO: upgrade to 2 */
+#define ACPI_I2C_SPECIFIC_REVISION_ID 1
+#define ACPI_SPI_SERIAL_BUS_REVISION_ID 1
+#define ACPI_SPI_SPECIFIC_REVISION_ID 1
/*
* ACPI I2C Bus
To view, visit change 32329. To unsubscribe, or for help writing mail filters, visit settings.