From 7ebb6b0f00ed6b8f92749cc4b035f02c001197e7 Mon Sep 17 00:00:00 2001 From: Julien Viard de Galbert Date: Thu, 1 Mar 2018 16:03:31 +0100 Subject: soc/intel/denverton_ns + mb: Rename gpio configuration In order to use the shared code in intelblock, this patch renames the denverton specific implementation to not use the same names (for files and types). - rename pad_config to remove conflict with soc/.../intelblocks/gpio.h - rename gpio.c, soc/gpio.h to not conflict with intelblock Note: There is no functional change in this patch. Change-Id: Id3f4e2dc0a118e8c864a96a435fa22e32bbe684f Signed-off-by: Julien Viard de Galbert Reviewed-on: https://review.coreboot.org/24926 Reviewed-by: Philipp Deppenwiese Tested-by: build bot (Jenkins) --- src/mainboard/scaleway/tagada/gpio.h | 4 ++-- src/mainboard/scaleway/tagada/romstage.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mainboard/scaleway') diff --git a/src/mainboard/scaleway/tagada/gpio.h b/src/mainboard/scaleway/tagada/gpio.h index d8468f6389..68cf155da0 100644 --- a/src/mainboard/scaleway/tagada/gpio.h +++ b/src/mainboard/scaleway/tagada/gpio.h @@ -18,10 +18,10 @@ #ifndef _MAINBOARD_GPIO_H #define _MAINBOARD_GPIO_H -#include +#include #ifndef __ACPI__ -const struct pad_config tagada_gpio_config[] = { +const struct dnv_pad_config tagada_gpio_config[] = { // GBE0_SDP0 (GPIO_14) NC /*ME { NORTH_ALL_GBE0_SDP0, { GpioPadModeNative1, GpioHostOwnGpio, GpioDirInOut, GpioOutDefault, GpioIntDefault, GpioResetPwrGood, diff --git a/src/mainboard/scaleway/tagada/romstage.c b/src/mainboard/scaleway/tagada/romstage.c index c29ff9dff7..630d355785 100644 --- a/src/mainboard/scaleway/tagada/romstage.c +++ b/src/mainboard/scaleway/tagada/romstage.c @@ -31,7 +31,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd); void mainboard_config_gpios(void) { size_t num; - const struct pad_config *table; + const struct dnv_pad_config *table; printk(BIOS_SPEW, "Board Serial: %s.\n", bmcinfo_serial()); /* Configure pads prior to SiliconInit() in case there's any @@ -47,7 +47,7 @@ void mainboard_config_gpios(void) printk(BIOS_INFO, "GPIO table: 0x%x, entry num: 0x%x!\n", (uint32_t)table, (uint32_t)num); - gpio_configure_pads(table, num); + gpio_configure_dnv_pads(table, num); } void mainboard_memory_init_params(FSPM_UPD *mupd) -- cgit v1.2.3