From 08abfa3814e65fd79ae0f9a90a341a57abe4b608 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Mon, 7 Oct 2019 19:41:57 +0200 Subject: superio/winbond/w83627*: use hwm5_conf.h for HWM setup Change-Id: Id78042606f02e02035dc917d162d0c98c9de38a4 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/35862 Tested-by: build bot (Jenkins) Reviewed-by: HAOUAS Elyes --- src/superio/winbond/w83627ehg/superio.c | 8 ++++---- src/superio/winbond/w83627hf/superio.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index 88fbc314a950..85e3250d9218 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -65,12 +66,12 @@ static void init_hwm(u16 base) for (i = 0; i < ARRAY_SIZE(hwm_reg_values); i += 3) { reg = hwm_reg_values[i]; - value = pnp_read_index(base, reg); + value = pnp_read_hwm5_index(base, reg); value &= 0xff & (~(hwm_reg_values[i + 1])); value |= 0xff & hwm_reg_values[i + 2]; printk(BIOS_DEBUG, "base = 0x%04x, reg = 0x%02x, " "value = 0x%02x\n", base, reg, value); - pnp_write_index(base, reg, value); + pnp_write_hwm5_index(base, reg, value); } } @@ -87,8 +88,7 @@ static void w83627ehg_init(struct device *dev) break; case W83627EHG_HWM: res0 = find_resource(dev, PNP_IDX_IO0); -#define HWM_INDEX_PORT 5 - init_hwm(res0->base + HWM_INDEX_PORT); + init_hwm(res0->base); break; case W83627EHG_ACPI: init_acpi(dev); diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index 318eaa4b03a0..54120fbe0b58 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -72,12 +73,12 @@ static void init_hwm(u16 base) for (i = 0; i < ARRAY_SIZE(hwm_reg_values); i += 3) { reg = hwm_reg_values[i]; - value = pnp_read_index(base, reg); + value = pnp_read_hwm5_index(base, reg); value &= 0xff & hwm_reg_values[i + 1]; value |= 0xff & hwm_reg_values[i + 2]; printk(BIOS_DEBUG, "base = 0x%04x, reg = 0x%02x, " "value = 0x%02x\n", base, reg, value); - pnp_write_index(base, reg, value); + pnp_write_hwm5_index(base, reg, value); } } @@ -94,8 +95,7 @@ static void w83627hf_init(struct device *dev) break; case W83627HF_HWM: res0 = find_resource(dev, PNP_IDX_IO0); -#define HWM_INDEX_PORT 5 - init_hwm(res0->base + HWM_INDEX_PORT); + init_hwm(res0->base); break; case W83627HF_ACPI: init_acpi(dev); -- cgit v1.2.3