superio/*/*/acpi: Improve the readability of the IndexField

Change-Id: I64fdcbcbbd54334c1c551bc1346c6000ea82c97d
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36598
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

11 files changed, 14 insertions, 14 deletions

diff --git a/src/superio/fintek/f81803a/acpi/superio.asl b/src/superio/fintek/f81803a/acpi/superio.asl
index ae8e6dc242..3112a4ba5a 100644
--- a/src/superio/fintek/f81803a/acpi/superio.asl
+++ b/src/superio/fintek/f81803a/acpi/superio.asl
@@ -38,7 +38,7 @@
  * F81803A_SHOW_UARTA	If defined, UARTA will be exposed.
  * F81803A_SHOW_UARTB	If defined, UARTB will be exposed.
  * F81803A_SHOW_HWMON	If defined, the hardware monitor will be exposed.
- * F81803A_SHOW_PME 	If defined, the PME/EARP/ACPI  will be exposed.
+ * F81803A_SHOW_PME	If defined, the PME/EARP/ACPI  will be exposed.
  *
  * Known issue:
  * Do not enable UARTA and UARTB simultaneously, Linux boot will crash.
@@ -66,7 +66,7 @@ Device(SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,	8
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x07),
 		PNP_LOGICAL_DEVICE,	8, /* Logical device selector */
diff --git a/src/superio/ite/it8720f/acpi/superio.asl b/src/superio/ite/it8720f/acpi/superio.asl
index 1e94655753..1c793e2ec9 100644
--- a/src/superio/ite/it8720f/acpi/superio.asl
+++ b/src/superio/ite/it8720f/acpi/superio.asl
@@ -66,7 +66,7 @@ Device(SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,   8
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x02),
 		CONFIGURE_CONTROL,	8, /* Global configure control */
diff --git a/src/superio/ite/it8721f/acpi/superio.asl b/src/superio/ite/it8721f/acpi/superio.asl
index c680f7e69c..4c54a4a6e0 100644
--- a/src/superio/ite/it8721f/acpi/superio.asl
+++ b/src/superio/ite/it8721f/acpi/superio.asl
@@ -66,7 +66,7 @@ Device(SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,   8
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x02),
 		CONFIGURE_CONTROL,	8, /* Global configure control */
diff --git a/src/superio/ite/it8783ef/acpi/superio.asl b/src/superio/ite/it8783ef/acpi/superio.asl
index d7a320e15b..ed30a810c1 100644
--- a/src/superio/ite/it8783ef/acpi/superio.asl
+++ b/src/superio/ite/it8783ef/acpi/superio.asl
@@ -71,7 +71,7 @@ Device(SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,   8
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x02),
 		CONFIGURE_CONTROL,	8, /* Global configure control */
diff --git a/src/superio/ite/it8786e/acpi/superio.asl b/src/superio/ite/it8786e/acpi/superio.asl
index f860da643b..8ea0df1114 100644
--- a/src/superio/ite/it8786e/acpi/superio.asl
+++ b/src/superio/ite/it8786e/acpi/superio.asl
@@ -70,7 +70,7 @@ Device (SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,   8
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x02),
 		CONFIGURE_CONTROL,	8, /* Global configure control */
diff --git a/src/superio/nuvoton/nct5539d/acpi/superio.asl b/src/superio/nuvoton/nct5539d/acpi/superio.asl
index e259b0146d..ce43a77c54 100644
--- a/src/superio/nuvoton/nct5539d/acpi/superio.asl
+++ b/src/superio/nuvoton/nct5539d/acpi/superio.asl
@@ -57,7 +57,7 @@ Device(SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,	8,
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x07),
 		PNP_LOGICAL_DEVICE,	8, /* Logical device selector */
diff --git a/src/superio/nuvoton/nct6776/acpi/superio.asl b/src/superio/nuvoton/nct6776/acpi/superio.asl
index abd5562e39..f6aed57dba 100644
--- a/src/superio/nuvoton/nct6776/acpi/superio.asl
+++ b/src/superio/nuvoton/nct6776/acpi/superio.asl
@@ -58,7 +58,7 @@ Device(SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,	8,
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x07),
 		PNP_LOGICAL_DEVICE,	8, /* Logical device selector */
diff --git a/src/superio/nuvoton/npcd378/acpi/superio.asl b/src/superio/nuvoton/npcd378/acpi/superio.asl
index a4813e334c..231488053c 100644
--- a/src/superio/nuvoton/npcd378/acpi/superio.asl
+++ b/src/superio/nuvoton/npcd378/acpi/superio.asl
@@ -47,7 +47,7 @@ Device(SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,	8,
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x07),
 		PNP_LOGICAL_DEVICE,	8, /* Logical device selector */
diff --git a/src/superio/smsc/sch5147/acpi/superio.asl b/src/superio/smsc/sch5147/acpi/superio.asl
index fb49743d63..6314d81cd4 100644
--- a/src/superio/smsc/sch5147/acpi/superio.asl
+++ b/src/superio/smsc/sch5147/acpi/superio.asl
@@ -57,7 +57,7 @@ Device(SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,   8
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x07),
 		PNP_LOGICAL_DEVICE,	8, /* Logical device selector */
diff --git a/src/superio/winbond/w83627dhg/acpi/superio.asl b/src/superio/winbond/w83627dhg/acpi/superio.asl
index 301ee94230..e1f2e383d8 100644
--- a/src/superio/winbond/w83627dhg/acpi/superio.asl
+++ b/src/superio/winbond/w83627dhg/acpi/superio.asl
@@ -65,7 +65,7 @@ Device(SUPERIO_DEV) {
 		PNP_ADDR_REG,	8,
 		PNP_DATA_REG,   8
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x07),
 		PNP_LOGICAL_DEVICE,	8, /* Logical device selector */
diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl
index ef4504c94e..87c13ac9a8 100644
--- a/src/superio/winbond/w83627hf/acpi/superio.asl
+++ b/src/superio/winbond/w83627hf/acpi/superio.asl
@@ -67,10 +67,10 @@ Device(SIO) {
 	OperationRegion (CREG, SystemIO, 0x2E, 0x02)
 	Field (CREG, ByteAcc, NoLock, Preserve)
 	{
-		ADDR,   8,
-		DATA,   8
+		PNP_ADDR_REG,   8,
+		PNP_DATA_REG,   8
 	}
-	IndexField (ADDR, DATA, ByteAcc, NoLock, Preserve)
+	IndexField (PNP_ADDR_REG, PNP_DATA_REG, ByteAcc, NoLock, Preserve)
 	{
 		Offset (0x02),
 		RST,    1,     /* Soft reset */