From a1238333d1d72cfa2d3f6af6492fc5f97f4fa3b3 Mon Sep 17 00:00:00 2001 From: Maxim Polyakov Date: Thu, 12 Sep 2024 12:01:15 +0300 Subject: [PATCH] mb/*/gpio: Remove local macros for bidirectional GPIO These definitions are no longer necessary, since macros from intel/common are used in the configuration [1]. [1] CB:42914 Change-Id: I0a6061aa562ea98c1bcffd86adac9aea28d7766b Signed-off-by: Maxim Polyakov Reviewed-on: https://review.coreboot.org/c/coreboot/+/84336 Reviewed-by: coreboot org Tested-by: build bot (Jenkins) --- src/mainboard/51nb/x210/gpio.h | 12 ----------- src/mainboard/aoostar/wtr_r1/gpio.h | 8 ------- .../kontron/mal10/include/carrier/gpio.h | 21 ------------------- src/mainboard/protectli/vault_adl_p/gpio.c | 8 ------- src/mainboard/protectli/vault_ehl/gpio.h | 8 ------- .../variants/h2u/include/variant/gpio.h | 12 ----------- 6 files changed, 69 deletions(-) diff --git a/src/mainboard/51nb/x210/gpio.h b/src/mainboard/51nb/x210/gpio.h index df12f5bb61..bb90b05d2d 100644 --- a/src/mainboard/51nb/x210/gpio.h +++ b/src/mainboard/51nb/x210/gpio.h @@ -5,18 +5,6 @@ #include -/* - * Bidirectional GPIO port when both RX and TX buffer is enabled - * todo: move this macros to src/soc/intel/common/block/include/intelblocks/gpio_defs.h - */ -#ifndef PAD_CFG_GPIO_BIDIRECT -#define PAD_CFG_GPIO_BIDIRECT(pad, val, pull, rst, trig, own) \ - _PAD_CFG_STRUCT(pad, \ - PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ - PAD_BUF(NO_DISABLE) | val, \ - PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own)) -#endif - #ifndef __ACPI__ /* Pad configuration in ramstage. */ diff --git a/src/mainboard/aoostar/wtr_r1/gpio.h b/src/mainboard/aoostar/wtr_r1/gpio.h index 067b9cebb3..531778595c 100644 --- a/src/mainboard/aoostar/wtr_r1/gpio.h +++ b/src/mainboard/aoostar/wtr_r1/gpio.h @@ -5,14 +5,6 @@ #include -#ifndef PAD_CFG_GPIO_BIDIRECT -#define PAD_CFG_GPIO_BIDIRECT(pad, val, pull, rst, trig, own) \ - _PAD_CFG_STRUCT(pad, \ - PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ - PAD_BUF(NO_DISABLE) | val, \ - PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own)) -#endif - /* Pad configuration was generated automatically using intelp2m utility */ static const struct pad_config gpio_table[] = { diff --git a/src/mainboard/kontron/mal10/include/carrier/gpio.h b/src/mainboard/kontron/mal10/include/carrier/gpio.h index 9466b24dba..b771d82c74 100644 --- a/src/mainboard/kontron/mal10/include/carrier/gpio.h +++ b/src/mainboard/kontron/mal10/include/carrier/gpio.h @@ -5,27 +5,6 @@ #include -/* - * Bidirectional GPIO port when both RX and TX buffer is enabled - * TODO: move this macros to src/soc/intel/common/block/include/intelblocks/gpio_defs.h - */ -#ifndef PAD_CFG_GPIO_BIDIRECT_IOS -#define PAD_CFG_GPIO_BIDIRECT_IOS(pad, val, pull, rst, trig, iosstate, iosterm, own) \ - _PAD_CFG_STRUCT(pad, \ - PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ - PAD_BUF(NO_DISABLE) | val, \ - PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own) | \ - PAD_IOSSTATE(iosstate) | PAD_IOSTERM(iosterm)) -#endif - -#ifndef PAD_CFG_GPIO_BIDIRECT -#define PAD_CFG_GPIO_BIDIRECT(pad, val, pull, rst, trig, own) \ - _PAD_CFG_STRUCT(pad, \ - PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ - PAD_BUF(NO_DISABLE) | val, \ - PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own)) -#endif - void carrier_gpio_configure(void); #endif /* CARRIER_GPIO_H */ diff --git a/src/mainboard/protectli/vault_adl_p/gpio.c b/src/mainboard/protectli/vault_adl_p/gpio.c index 1e65f03a54..212d439356 100644 --- a/src/mainboard/protectli/vault_adl_p/gpio.c +++ b/src/mainboard/protectli/vault_adl_p/gpio.c @@ -4,14 +4,6 @@ #include "gpio.h" -#ifndef PAD_CFG_GPIO_BIDIRECT -#define PAD_CFG_GPIO_BIDIRECT(pad, val, pull, rst, trig, own) \ - _PAD_CFG_STRUCT(pad, \ - PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ - PAD_BUF(NO_DISABLE) | val, \ - PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own)) -#endif - /* Pad configuration was generated automatically using intelp2m utility */ static const struct pad_config gpio_table[] = { diff --git a/src/mainboard/protectli/vault_ehl/gpio.h b/src/mainboard/protectli/vault_ehl/gpio.h index 2f1c2ec040..7eac6566ba 100644 --- a/src/mainboard/protectli/vault_ehl/gpio.h +++ b/src/mainboard/protectli/vault_ehl/gpio.h @@ -5,14 +5,6 @@ #include -#ifndef PAD_CFG_GPIO_BIDIRECT -#define PAD_CFG_GPIO_BIDIRECT(pad, val, pull, rst, trig, own) \ - _PAD_CFG_STRUCT(pad, \ - PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ - PAD_BUF(NO_DISABLE) | val, \ - PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own)) -#endif - /* PAD configuration was generated automatically using intelp2m utility */ static const struct pad_config gpio_table[] = { /* ------- GPIO Community 0 ------- */ diff --git a/src/mainboard/razer/blade_stealth_kbl/variants/h2u/include/variant/gpio.h b/src/mainboard/razer/blade_stealth_kbl/variants/h2u/include/variant/gpio.h index 4f98432687..654dbdd8fa 100644 --- a/src/mainboard/razer/blade_stealth_kbl/variants/h2u/include/variant/gpio.h +++ b/src/mainboard/razer/blade_stealth_kbl/variants/h2u/include/variant/gpio.h @@ -5,18 +5,6 @@ #include -/* - * Bidirectional GPIO port when both RX and TX buffer is enabled - * todo: move this macros to src/soc/intel/common/block/include/intelblocks/gpio_defs.h - */ -#ifndef PAD_CFG_GPIO_BIDIRECT -#define PAD_CFG_GPIO_BIDIRECT(pad, val, pull, rst, trig, own) \ - _PAD_CFG_STRUCT(pad, \ - PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_TRIG(trig) | \ - PAD_BUF(NO_DISABLE) | val, \ - PAD_PULL(pull) | PAD_CFG_OWN_GPIO(own)) -#endif - #ifndef __ACPI__ /* Pad configuration in ramstage. */