Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/57837 )
Change subject: soc/amd: rename program_gpios to gpio_configure_pads ......................................................................
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 --- M src/mainboard/amd/bilby/early_gpio.c M src/mainboard/amd/bilby/emmc_gpio.c M src/mainboard/amd/bilby/gpio.c M src/mainboard/amd/gardenia/bootblock/bootblock.c M src/mainboard/amd/gardenia/mainboard.c M src/mainboard/amd/majolica/early_gpio.c M src/mainboard/amd/mandolin/emmc_gpio.c M src/mainboard/amd/mandolin/variants/cereme/early_gpio.c M src/mainboard/amd/mandolin/variants/cereme/gpio.c M src/mainboard/amd/mandolin/variants/mandolin/early_gpio.c M src/mainboard/amd/mandolin/variants/mandolin/gpio.c M src/mainboard/amd/padmelon/bootblock/bootblock.c M src/mainboard/amd/padmelon/mainboard.c M src/mainboard/google/guybrush/smihandler.c M src/mainboard/google/guybrush/variants/baseboard/gpio.c M src/mainboard/google/guybrush/verstage.c M src/mainboard/google/kahlee/bootblock/bootblock.c M src/mainboard/google/kahlee/mainboard.c M src/mainboard/google/kahlee/romstage.c M src/mainboard/google/mancomb/bootblock.c M src/mainboard/google/mancomb/smihandler.c M src/mainboard/google/mancomb/verstage.c M src/mainboard/google/zork/bootblock.c M src/mainboard/google/zork/smihandler.c M src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c M src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c M src/mainboard/google/zork/verstage.c M src/mainboard/pcengines/apu2/romstage.c M src/soc/amd/cezanne/uart.c M src/soc/amd/common/block/gpio_banks/gpio.c M src/soc/amd/common/block/i2c/i2c.c M src/soc/amd/common/block/include/amdblocks/gpio_banks.h M src/soc/amd/picasso/uart.c 33 files changed, 44 insertions(+), 44 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/57837/1
diff --git a/src/mainboard/amd/bilby/early_gpio.c b/src/mainboard/amd/bilby/early_gpio.c index 0a9d266..466b4fc 100644 --- a/src/mainboard/amd/bilby/early_gpio.c +++ b/src/mainboard/amd/bilby/early_gpio.c @@ -31,5 +31,5 @@
void mainboard_program_early_gpios(void) { - program_gpios(gpio_set_stage_reset, ARRAY_SIZE(gpio_set_stage_reset)); + gpio_configure_pads(gpio_set_stage_reset, ARRAY_SIZE(gpio_set_stage_reset)); } diff --git a/src/mainboard/amd/bilby/emmc_gpio.c b/src/mainboard/amd/bilby/emmc_gpio.c index a88a5c5..f72437b 100644 --- a/src/mainboard/amd/bilby/emmc_gpio.c +++ b/src/mainboard/amd/bilby/emmc_gpio.c @@ -23,5 +23,5 @@ /* Don't call this if the board uses the LPC bus. */ void mainboard_program_emmc_gpios(void) { - program_gpios(emmc_gpios, ARRAY_SIZE(emmc_gpios)); + gpio_configure_pads(emmc_gpios, ARRAY_SIZE(emmc_gpios)); } diff --git a/src/mainboard/amd/bilby/gpio.c b/src/mainboard/amd/bilby/gpio.c index 2ac4a5f..18ee482 100644 --- a/src/mainboard/amd/bilby/gpio.c +++ b/src/mainboard/amd/bilby/gpio.c @@ -23,5 +23,5 @@
void mainboard_program_gpios(void) { - program_gpios(gpio_set_stage_ram, ARRAY_SIZE(gpio_set_stage_ram)); + gpio_configure_pads(gpio_set_stage_ram, ARRAY_SIZE(gpio_set_stage_ram)); } diff --git a/src/mainboard/amd/gardenia/bootblock/bootblock.c b/src/mainboard/amd/gardenia/bootblock/bootblock.c index 5cec567..a480f36 100644 --- a/src/mainboard/amd/gardenia/bootblock/bootblock.c +++ b/src/mainboard/amd/gardenia/bootblock/bootblock.c @@ -10,5 +10,5 @@ size_t num_gpios; const struct soc_amd_gpio *gpios; gpios = early_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); } diff --git a/src/mainboard/amd/gardenia/mainboard.c b/src/mainboard/amd/gardenia/mainboard.c index e53213ba..ae72b33 100644 --- a/src/mainboard/amd/gardenia/mainboard.c +++ b/src/mainboard/amd/gardenia/mainboard.c @@ -69,7 +69,7 @@ size_t num_gpios; const struct soc_amd_gpio *gpios; gpios = gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); }
/************************************************* diff --git a/src/mainboard/amd/majolica/early_gpio.c b/src/mainboard/amd/majolica/early_gpio.c index 5bf71aa..cd5028a 100644 --- a/src/mainboard/amd/majolica/early_gpio.c +++ b/src/mainboard/amd/majolica/early_gpio.c @@ -14,5 +14,5 @@
void mainboard_program_early_gpios(void) { - program_gpios(gpio_set_stage_reset, ARRAY_SIZE(gpio_set_stage_reset)); + gpio_configure_pads(gpio_set_stage_reset, ARRAY_SIZE(gpio_set_stage_reset)); } diff --git a/src/mainboard/amd/mandolin/emmc_gpio.c b/src/mainboard/amd/mandolin/emmc_gpio.c index a88a5c5..f72437b 100644 --- a/src/mainboard/amd/mandolin/emmc_gpio.c +++ b/src/mainboard/amd/mandolin/emmc_gpio.c @@ -23,5 +23,5 @@ /* Don't call this if the board uses the LPC bus. */ void mainboard_program_emmc_gpios(void) { - program_gpios(emmc_gpios, ARRAY_SIZE(emmc_gpios)); + gpio_configure_pads(emmc_gpios, ARRAY_SIZE(emmc_gpios)); } diff --git a/src/mainboard/amd/mandolin/variants/cereme/early_gpio.c b/src/mainboard/amd/mandolin/variants/cereme/early_gpio.c index 800bd71..66d81ed 100644 --- a/src/mainboard/amd/mandolin/variants/cereme/early_gpio.c +++ b/src/mainboard/amd/mandolin/variants/cereme/early_gpio.c @@ -28,5 +28,5 @@
void mainboard_program_early_gpios(void) { - program_gpios(gpio_set_stage_reset, ARRAY_SIZE(gpio_set_stage_reset)); + gpio_configure_pads(gpio_set_stage_reset, ARRAY_SIZE(gpio_set_stage_reset)); } diff --git a/src/mainboard/amd/mandolin/variants/cereme/gpio.c b/src/mainboard/amd/mandolin/variants/cereme/gpio.c index 0ba2580..0ac02d9 100644 --- a/src/mainboard/amd/mandolin/variants/cereme/gpio.c +++ b/src/mainboard/amd/mandolin/variants/cereme/gpio.c @@ -29,5 +29,5 @@
void mainboard_program_gpios(void) { - program_gpios(gpio_set_stage_ram, ARRAY_SIZE(gpio_set_stage_ram)); + gpio_configure_pads(gpio_set_stage_ram, ARRAY_SIZE(gpio_set_stage_ram)); } diff --git a/src/mainboard/amd/mandolin/variants/mandolin/early_gpio.c b/src/mainboard/amd/mandolin/variants/mandolin/early_gpio.c index 63e01ef..75cdb10 100644 --- a/src/mainboard/amd/mandolin/variants/mandolin/early_gpio.c +++ b/src/mainboard/amd/mandolin/variants/mandolin/early_gpio.c @@ -32,5 +32,5 @@
void mainboard_program_early_gpios(void) { - program_gpios(gpio_set_stage_reset, ARRAY_SIZE(gpio_set_stage_reset)); + gpio_configure_pads(gpio_set_stage_reset, ARRAY_SIZE(gpio_set_stage_reset)); } diff --git a/src/mainboard/amd/mandolin/variants/mandolin/gpio.c b/src/mainboard/amd/mandolin/variants/mandolin/gpio.c index 0647319..f341750 100644 --- a/src/mainboard/amd/mandolin/variants/mandolin/gpio.c +++ b/src/mainboard/amd/mandolin/variants/mandolin/gpio.c @@ -34,5 +34,5 @@
void mainboard_program_gpios(void) { - program_gpios(gpio_set_stage_ram, ARRAY_SIZE(gpio_set_stage_ram)); + gpio_configure_pads(gpio_set_stage_ram, ARRAY_SIZE(gpio_set_stage_ram)); } diff --git a/src/mainboard/amd/padmelon/bootblock/bootblock.c b/src/mainboard/amd/padmelon/bootblock/bootblock.c index d8c462d..c93ef52 100644 --- a/src/mainboard/amd/padmelon/bootblock/bootblock.c +++ b/src/mainboard/amd/padmelon/bootblock/bootblock.c @@ -46,5 +46,5 @@ const struct soc_amd_gpio *gpios;
gpios = early_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); } diff --git a/src/mainboard/amd/padmelon/mainboard.c b/src/mainboard/amd/padmelon/mainboard.c index f7d351d..51b0f90 100644 --- a/src/mainboard/amd/padmelon/mainboard.c +++ b/src/mainboard/amd/padmelon/mainboard.c @@ -98,7 +98,7 @@ size_t num_gpios; const struct soc_amd_gpio *gpios; gpios = gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); }
/************************************************* diff --git a/src/mainboard/google/guybrush/smihandler.c b/src/mainboard/google/guybrush/smihandler.c index 04280db..f67ff31 100644 --- a/src/mainboard/google/guybrush/smihandler.c +++ b/src/mainboard/google/guybrush/smihandler.c @@ -22,7 +22,7 @@ chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS, MAINBOARD_EC_S5_WAKE_EVENTS);
gpios = variant_sleep_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); }
int mainboard_smi_apmc(u8 apmc) diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c index 50595cd..9878040 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c +++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c @@ -362,7 +362,7 @@ /* EN_PWR_FP */ PAD_GPO(GPIO_32, LOW), }; - program_gpios(fpmcu_bootblock_table, ARRAY_SIZE(fpmcu_bootblock_table)); + gpio_configure_pads(fpmcu_bootblock_table, ARRAY_SIZE(fpmcu_bootblock_table)); }
__weak void variant_finalize_gpios(void) @@ -380,6 +380,6 @@ /* Deassert the FPMCU reset to enable the FPMCU */ gpio_set(GPIO_11, 1); /* FPMCU_RST_L */ } else { - program_gpios(disable_fpmcu_table, ARRAY_SIZE(disable_fpmcu_table)); + gpio_configure_pads(disable_fpmcu_table, ARRAY_SIZE(disable_fpmcu_table)); } } diff --git a/src/mainboard/google/guybrush/verstage.c b/src/mainboard/google/guybrush/verstage.c index 904ae2f..e15cc33 100644 --- a/src/mainboard/google/guybrush/verstage.c +++ b/src/mainboard/google/guybrush/verstage.c @@ -13,7 +13,7 @@
if (CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) { gpios = variant_early_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); } }
diff --git a/src/mainboard/google/kahlee/bootblock/bootblock.c b/src/mainboard/google/kahlee/bootblock/bootblock.c index 41dd8de..9b456c8 100644 --- a/src/mainboard/google/kahlee/bootblock/bootblock.c +++ b/src/mainboard/google/kahlee/bootblock/bootblock.c @@ -17,10 +17,10 @@ mainboard_ec_init();
gpios = variant_wlan_rst_early_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios);
gpios = variant_early_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); }
void bootblock_mainboard_init(void) diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c index 0a78b0c..59c4959 100644 --- a/src/mainboard/google/kahlee/mainboard.c +++ b/src/mainboard/google/kahlee/mainboard.c @@ -115,7 +115,7 @@ mainboard_ec_init();
gpios = variant_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios);
/* Initialize i2c busses that were not initialized in bootblock */ i2c_soc_init(); diff --git a/src/mainboard/google/kahlee/romstage.c b/src/mainboard/google/kahlee/romstage.c index 41a7e46..c16b1d2 100644 --- a/src/mainboard/google/kahlee/romstage.c +++ b/src/mainboard/google/kahlee/romstage.c @@ -21,7 +21,7 @@ const struct soc_amd_gpio *gpios;
gpios = variant_romstage_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios);
variant_romstage_entry(); } diff --git a/src/mainboard/google/mancomb/bootblock.c b/src/mainboard/google/mancomb/bootblock.c index dd38c34..f68d832 100644 --- a/src/mainboard/google/mancomb/bootblock.c +++ b/src/mainboard/google/mancomb/bootblock.c @@ -15,7 +15,7 @@
if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) { gpios = variant_early_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); }
printk(BIOS_DEBUG, "Bootblock configure eSPI\n"); diff --git a/src/mainboard/google/mancomb/smihandler.c b/src/mainboard/google/mancomb/smihandler.c index 04280db..f67ff31 100644 --- a/src/mainboard/google/mancomb/smihandler.c +++ b/src/mainboard/google/mancomb/smihandler.c @@ -22,7 +22,7 @@ chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS, MAINBOARD_EC_S5_WAKE_EVENTS);
gpios = variant_sleep_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); }
int mainboard_smi_apmc(u8 apmc) diff --git a/src/mainboard/google/mancomb/verstage.c b/src/mainboard/google/mancomb/verstage.c index 450681e..0e90231 100644 --- a/src/mainboard/google/mancomb/verstage.c +++ b/src/mainboard/google/mancomb/verstage.c @@ -10,7 +10,7 @@ size_t num_gpios; if (CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) { gpios = variant_early_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); } }
diff --git a/src/mainboard/google/zork/bootblock.c b/src/mainboard/google/zork/bootblock.c index 87e0285..96cbe4d 100644 --- a/src/mainboard/google/zork/bootblock.c +++ b/src/mainboard/google/zork/bootblock.c @@ -10,7 +10,7 @@ const struct soc_amd_gpio *gpios;
gpios = variant_bootblock_gpio_table(&num_gpios, acpi_get_sleep_type()); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios);
variant_pcie_gpio_configure(); } diff --git a/src/mainboard/google/zork/smihandler.c b/src/mainboard/google/zork/smihandler.c index 3a10dd2..bec8f09 100644 --- a/src/mainboard/google/zork/smihandler.c +++ b/src/mainboard/google/zork/smihandler.c @@ -26,7 +26,7 @@ MAINBOARD_EC_S5_WAKE_EVENTS);
gpios = variant_sleep_gpio_table(&num_gpios, slp_typ); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); }
int mainboard_smi_apmc(u8 apmc) diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c index 0ae382f..6f8a416 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c @@ -183,7 +183,7 @@ /* EN_PWR_WIFI_L */ PAD_GPO(GPIO_42, LOW), }; - program_gpios(v3_wifi_table, ARRAY_SIZE(v3_wifi_table)); + gpio_configure_pads(v3_wifi_table, ARRAY_SIZE(v3_wifi_table));
mdelay(50); gpio_set(GPIO_29, 0); @@ -208,7 +208,7 @@ /* EN_PWR_WIFI */ PAD_GPO(GPIO_42, LOW), }; - program_gpios(v3_wifi_table, ARRAY_SIZE(v3_wifi_table)); + gpio_configure_pads(v3_wifi_table, ARRAY_SIZE(v3_wifi_table));
mdelay(10); gpio_set(GPIO_42, 1); @@ -242,7 +242,7 @@ /* EN_PWR_WIFI */ PAD_GPO(GPIO_29, LOW), }; - program_gpios(pre_v3_wifi_table, ARRAY_SIZE(pre_v3_wifi_table)); + gpio_configure_pads(pre_v3_wifi_table, ARRAY_SIZE(pre_v3_wifi_table));
mdelay(10); gpio_set(GPIO_29, 1); @@ -267,7 +267,7 @@ PAD_GPO(GPIO_142, HIGH), };
- program_gpios(pcie_gpio_table, ARRAY_SIZE(pcie_gpio_table)); + gpio_configure_pads(pcie_gpio_table, ARRAY_SIZE(pcie_gpio_table));
/* Deassert PCIE_RST1_L */ gpio_set(GPIO_27, 1); diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c index 9083e5f..62935a6 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c @@ -195,7 +195,7 @@ /* EN_PWR_WIFI_L */ PAD_GPO(GPIO_42, LOW), }; - program_gpios(v3_wifi_table, ARRAY_SIZE(v3_wifi_table)); + gpio_configure_pads(v3_wifi_table, ARRAY_SIZE(v3_wifi_table));
}
@@ -218,7 +218,7 @@ /* EN_PWR_WIFI */ PAD_GPO(GPIO_42, LOW), }; - program_gpios(v3_wifi_table, ARRAY_SIZE(v3_wifi_table)); + gpio_configure_pads(v3_wifi_table, ARRAY_SIZE(v3_wifi_table));
mdelay(10); gpio_set(GPIO_42, 1); @@ -252,7 +252,7 @@ /* EN_PWR_WIFI */ PAD_GPO(GPIO_29, LOW), }; - program_gpios(pre_v3_wifi_table, ARRAY_SIZE(pre_v3_wifi_table)); + gpio_configure_pads(pre_v3_wifi_table, ARRAY_SIZE(pre_v3_wifi_table));
mdelay(10); gpio_set(GPIO_29, 1); @@ -275,7 +275,7 @@ PAD_GPO(GPIO_142, HIGH), };
- program_gpios(pcie_gpio_table, ARRAY_SIZE(pcie_gpio_table)); + gpio_configure_pads(pcie_gpio_table, ARRAY_SIZE(pcie_gpio_table));
if (variant_uses_v3_schematics()) wifi_power_reset_configure_v3(); diff --git a/src/mainboard/google/zork/verstage.c b/src/mainboard/google/zork/verstage.c index 3ef0423..0c7a04f 100644 --- a/src/mainboard/google/zork/verstage.c +++ b/src/mainboard/google/zork/verstage.c @@ -11,7 +11,7 @@
printk(BIOS_DEBUG, "Setting GPIOs\n"); gpios = variant_early_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + gpio_configure_pads(gpios, num_gpios); printk(BIOS_DEBUG, "GPIOs setup\n"); }
diff --git a/src/mainboard/pcengines/apu2/romstage.c b/src/mainboard/pcengines/apu2/romstage.c index 5d2b988..4c142d0 100644 --- a/src/mainboard/pcengines/apu2/romstage.c +++ b/src/mainboard/pcengines/apu2/romstage.c @@ -60,14 +60,14 @@
static void early_lpc_init(void) { - program_gpios(gpio_common, ARRAY_SIZE(gpio_common)); + gpio_configure_pads(gpio_common, ARRAY_SIZE(gpio_common));
if (CONFIG(BOARD_PCENGINES_APU2)) - program_gpios(gpio_apu2, ARRAY_SIZE(gpio_apu2)); + gpio_configure_pads(gpio_apu2, ARRAY_SIZE(gpio_apu2));
if (CONFIG(BOARD_PCENGINES_APU3) || CONFIG(BOARD_PCENGINES_APU4)) - program_gpios(gpio_apu34, ARRAY_SIZE(gpio_apu34)); + gpio_configure_pads(gpio_apu34, ARRAY_SIZE(gpio_apu34));
if (CONFIG(BOARD_PCENGINES_APU5)) - program_gpios(gpio_apu5, ARRAY_SIZE(gpio_apu5)); + gpio_configure_pads(gpio_apu5, ARRAY_SIZE(gpio_apu5)); } diff --git a/src/soc/amd/cezanne/uart.c b/src/soc/amd/cezanne/uart.c index 212f365..5aca5a2 100644 --- a/src/soc/amd/cezanne/uart.c +++ b/src/soc/amd/cezanne/uart.c @@ -45,7 +45,7 @@ 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 31b1a52..2637579 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 @@ 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 8e79b4c..bba3de7 100644 --- a/src/soc/amd/common/block/i2c/i2c.c +++ b/src/soc/amd/common/block/i2c/i2c.c @@ -164,7 +164,7 @@ 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 489bb5c..21b73f7 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 @@ * * @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 faaa3f3..6e1fb95 100644 --- a/src/soc/amd/picasso/uart.c +++ b/src/soc/amd/picasso/uart.c @@ -53,7 +53,7 @@ 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)