[coreboot-gerrit] Change in coreboot[master]: src/superio: Use 'PNP_IDX_*' macros instead of magic numbers

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44833 )

Change subject: src/superio: Use 'PNP_IDX_*' macros instead of magic numbers
......................................................................

src/superio: Use 'PNP_IDX_*' macros instead of magic numbers

Change-Id: I2f8d6d9e8b6e84bb6c2b4e73b0fbeca476130d05
Signed-off-by: Elyes HAOUAS 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44833
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Held 
---
M src/superio/ite/it8772f/early_init.c
M src/superio/nsc/pc87417/early_init.c
M src/superio/serverengines/pilot/early_init.c
M src/superio/smsc/kbc1100/early_init.c
M src/superio/winbond/w83627uhg/superio.c
5 files changed, 15 insertions(+), 10 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/superio/ite/it8772f/early_init.c b/src/superio/ite/it8772f/early_init.c
index 0af3f30..e41b206 100644
--- a/src/superio/ite/it8772f/early_init.c
+++ b/src/superio/ite/it8772f/early_init.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */

#include <arch/io.h>
+#include <device/pnp_def.h>
 #include <device/pnp_ops.h>

#include "it8772f.h"
@@ -27,7 +28,7 @@
 {
    it8772f_enter_conf(dev);
    pnp_write_config(dev, IT8772F_CONFIG_REG_LDN, IT8772F_EC);
-	pnp_write_config(dev, 0xf4, 0x60);
+	pnp_write_config(dev, PNP_IDX_MSC4, 0x60);
    it8772f_exit_conf(dev);
 }

diff --git a/src/superio/nsc/pc87417/early_init.c b/src/superio/nsc/pc87417/early_init.c
index c3af2d7..3c1f4dd 100644
--- a/src/superio/nsc/pc87417/early_init.c
+++ b/src/superio/nsc/pc87417/early_init.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */

#include <arch/io.h>
+#include <device/pnp_def.h>
 #include <device/pnp_ops.h>
 #include <device/pnp.h>
 #include <stdint.h>
@@ -27,7 +28,7 @@
    /* Select proper BIOS size (4MB). */
    pnp_write_config(dev, PC87417_XMEMCNF2,
    		 (pnp_read_config(dev, PC87417_XMEMCNF2)) | 0x04);
-	xbus_index = pnp_read_iobase(dev, 0x60);
+	xbus_index = pnp_read_iobase(dev, PNP_IDX_IO0);

/* Enable writes to devices attached to XCS0 (XBUS Chip Select 0). */
    for (i = 0; i <= 0xf; i++)
diff --git a/src/superio/serverengines/pilot/early_init.c b/src/superio/serverengines/pilot/early_init.c
index 543fc5e..201e9a7 100644
--- a/src/superio/serverengines/pilot/early_init.c
+++ b/src/superio/serverengines/pilot/early_init.c
@@ -7,6 +7,7 @@
 #include <device/pnp_ops.h>
 #include <console/console.h>
 #include <device/pnp.h>
+#include <device/pnp_def.h>
 #include "pilot.h"

/*
@@ -24,10 +25,10 @@
    pnp_enter_ext_func_mode(dev);
    pnp_set_logical_device(PNP_DEV(port, 0x3));
    pnp_set_enable(dev, 0);
-	pnp_set_iobase(dev, 0x60, 0x0b00);
-	pnp_set_iobase(dev, 0x62, 0x0b80);
-	pnp_set_iobase(dev, 0x64, 0x0b84);
-	pnp_set_iobase(dev, 0x66, 0x0b86);
+	pnp_set_iobase(dev, PNP_IDX_IO0, 0x0b00);
+	pnp_set_iobase(dev, PNP_IDX_IO1, 0x0b80);
+	pnp_set_iobase(dev, PNP_IDX_IO2, 0x0b84);
+	pnp_set_iobase(dev, PNP_IDX_IO3, 0x0b86);
    pnp_set_enable(dev, 1);
    pnp_exit_ext_func_mode(dev);

diff --git a/src/superio/smsc/kbc1100/early_init.c b/src/superio/smsc/kbc1100/early_init.c
index 5027584..875db42 100644
--- a/src/superio/smsc/kbc1100/early_init.c
+++ b/src/superio/smsc/kbc1100/early_init.c
@@ -5,6 +5,7 @@
 #include <arch/io.h>
 #include <device/pnp_ops.h>
 #include <device/pnp.h>
+#include <device/pnp_def.h>
 #include <stdint.h>

#include "kbc1100.h"
@@ -46,8 +47,8 @@
    pnp_set_enable(dev, 0);
    pnp_set_iobase(dev, PNP_IDX_IO0, 0x60);
    pnp_set_iobase(dev, PNP_IDX_IO1, 0x64);
-	pnp_set_irq(dev, 0x70, 1);   /* IRQ 1 */
-	pnp_set_irq(dev, 0x72, 12);   /* IRQ 12 */
+	pnp_set_irq(dev, PNP_IDX_IRQ0, 1);   /* IRQ 1 */
+	pnp_set_irq(dev, PNP_IDX_IRQ1, 12);   /* IRQ 12 */
    pnp_set_enable(dev, 1);

/* Enable EC Channel 0 */
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 588cda4..00bea8c 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -2,6 +2,7 @@

#include <device/device.h>
 #include <device/pnp.h>
+#include <device/pnp_def.h>
 #include <superio/conf_mode.h>
 #include <stdint.h>
 #include <pc80/keyboard.h>
@@ -29,10 +30,10 @@

pnp_enter_conf_mode(dev);
    pnp_set_logical_device(dev);
-	value = pnp_read_config(dev, 0xf0);
+	value = pnp_read_config(dev, PNP_IDX_MSC0);
    value &= ~0x03;
    value |= (uart_clock & 0x03);
-	pnp_write_config(dev, 0xf0, value);
+	pnp_write_config(dev, PNP_IDX_MSC0, value);
    pnp_exit_conf_mode(dev);
 }