aboutsummaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorFelix Held <felix.held@amd.corp-partner.google.com>2021-09-22 16:36:12 +0200
committerFelix Held <felix-coreboot@felixheld.de>2021-09-23 14:42:03 +0000
commit7011fa1135009897a8fee5d96ade0f9fa9c960cc (patch)
tree853e3f99abda14caa70ba0aa9b81ae8d2da1ed54 /src/soc
parent05df6ec8449355f5205807b84e7a6ba87252cf27 (diff)
soc/amd: rename program_gpios to gpio_configure_pads
Use the same function name as in soc/intel for this functionality. This also brings the function name more in line with the extended version of this function gpio_configure_pads_with_override which additionally supports passing a GPIO override configuration. This might cause some pain for out-of-tree boards, but at some point this should be made more consistent, so I don't see a too strong reason not to do this. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I88852e040f79861ce7d190bf2203f9e0ce156690 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57837 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/cezanne/uart.c2
-rw-r--r--src/soc/amd/common/block/gpio_banks/gpio.c2
-rw-r--r--src/soc/amd/common/block/i2c/i2c.c2
-rw-r--r--src/soc/amd/common/block/include/amdblocks/gpio_banks.h2
-rw-r--r--src/soc/amd/picasso/uart.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/amd/cezanne/uart.c b/src/soc/amd/cezanne/uart.c
index 212f365bab..5aca5a23b8 100644
--- a/src/soc/amd/cezanne/uart.c
+++ b/src/soc/amd/cezanne/uart.c
@@ -45,7 +45,7 @@ void set_uart_config(unsigned int idx)
if (idx >= ARRAY_SIZE(uart_info))
return;
- program_gpios(uart_info[idx].mux, 2);
+ gpio_configure_pads(uart_info[idx].mux, 2);
}
static const char *uart_acpi_name(const struct device *dev)
diff --git a/src/soc/amd/common/block/gpio_banks/gpio.c b/src/soc/amd/common/block/gpio_banks/gpio.c
index 31b1a52a7e..263757988a 100644
--- a/src/soc/amd/common/block/gpio_banks/gpio.c
+++ b/src/soc/amd/common/block/gpio_banks/gpio.c
@@ -309,7 +309,7 @@ void gpio_configure_pads_with_override(const struct soc_amd_gpio *base_cfg,
master_switch_set(GPIO_INTERRUPT_EN);
}
-void program_gpios(const struct soc_amd_gpio *gpio_list_ptr, size_t size)
+void gpio_configure_pads(const struct soc_amd_gpio *gpio_list_ptr, size_t size)
{
gpio_configure_pads_with_override(gpio_list_ptr, size, NULL, 0);
}
diff --git a/src/soc/amd/common/block/i2c/i2c.c b/src/soc/amd/common/block/i2c/i2c.c
index 8e79b4cabc..bba3de7287 100644
--- a/src/soc/amd/common/block/i2c/i2c.c
+++ b/src/soc/amd/common/block/i2c/i2c.c
@@ -164,7 +164,7 @@ void sb_reset_i2c_peripherals(const struct soc_i2c_peripheral_reset_info *reset_
that will be changed need to be saved first */
gpio_save_pin_registers(reset_info->i2c_scl[i].pin.gpio, &save_table[i]);
/* Program SCL GPIO as output driven high */
- program_gpios(&reset_info->i2c_scl[i].pin, 1);
+ gpio_configure_pads(&reset_info->i2c_scl[i].pin, 1);
}
/*
diff --git a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h
index 489bb5c619..21b73f775b 100644
--- a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h
+++ b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h
@@ -86,7 +86,7 @@ uintptr_t gpio_get_address(gpio_t gpio_num);
*
* @return none
*/
-void program_gpios(const struct soc_amd_gpio *gpio_list_ptr, size_t size);
+void gpio_configure_pads(const struct soc_amd_gpio *gpio_list_ptr, size_t size);
/* Return the interrupt status and clear if set. */
int gpio_interrupt_status(gpio_t gpio);
/* Implemented by soc, provides table of available GPIO mapping to Gevents */
diff --git a/src/soc/amd/picasso/uart.c b/src/soc/amd/picasso/uart.c
index faaa3f3346..6e1fb95be0 100644
--- a/src/soc/amd/picasso/uart.c
+++ b/src/soc/amd/picasso/uart.c
@@ -53,7 +53,7 @@ void set_uart_config(unsigned int idx)
if (idx >= ARRAY_SIZE(uart_info))
return;
- program_gpios(uart_info[idx].mux, 2);
+ gpio_configure_pads(uart_info[idx].mux, 2);
}
static const char *uart_acpi_name(const struct device *dev)