From 03f0e43a3c4172941f2eadf30f89413632b90cb4 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 3 Jul 2020 13:51:15 +0200 Subject: haswell: Drop GPIO indirection layers This simplifies things and makes type checking possible. Change-Id: Iefc9baabae286aac2f2c46853adf1f6edf01586f Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/43103 Tested-by: build bot (Jenkins) Reviewed-by: Tristan Corrick --- src/southbridge/intel/lynxpoint/early_pch.c | 7 ++++--- src/southbridge/intel/lynxpoint/pch.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/southbridge') diff --git a/src/southbridge/intel/lynxpoint/early_pch.c b/src/southbridge/intel/lynxpoint/early_pch.c index 4d29564f3d..92cbf0176f 100644 --- a/src/southbridge/intel/lynxpoint/early_pch.c +++ b/src/southbridge/intel/lynxpoint/early_pch.c @@ -13,6 +13,7 @@ #if CONFIG(INTEL_LYNXPOINT_LP) #include "lp_gpio.h" +extern const struct pch_lp_gpio_map mainboard_gpio_map[]; #else #include #endif @@ -77,16 +78,16 @@ void __weak mainboard_config_superio(void) { } -int early_pch_init(const void *gpio_map) +int early_pch_init(void) { int wake_from_s3; pch_enable_bars(); #if CONFIG(INTEL_LYNXPOINT_LP) - setup_pch_lp_gpios(gpio_map); + setup_pch_lp_gpios(mainboard_gpio_map); #else - setup_pch_gpios(gpio_map); + setup_pch_gpios(&mainboard_gpio_map); #endif pch_generic_setup(); diff --git a/src/southbridge/intel/lynxpoint/pch.h b/src/southbridge/intel/lynxpoint/pch.h index 7987486673..c59878e48e 100644 --- a/src/southbridge/intel/lynxpoint/pch.h +++ b/src/southbridge/intel/lynxpoint/pch.h @@ -121,7 +121,7 @@ void acpi_create_intel_hpet(acpi_hpet_t * hpet); void acpi_create_serialio_ssdt(acpi_header_t *ssdt); void enable_usb_bar(void); -int early_pch_init(const void *gpio_map); +int early_pch_init(void); void pch_enable_lpc(void); void mainboard_config_superio(void); void mainboard_config_rcba(void); -- cgit v1.2.3