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>

14 files changed, 22 insertions, 22 deletions

diff --git a/src/mainboard/google/guybrush/smihandler.c b/src/mainboard/google/guybrush/smihandler.c
index 04280db316..f67ff31e49 100644
--- a/src/mainboard/google/guybrush/smihandler.c
+++ b/src/mainboard/google/guybrush/smihandler.c
@@ -22,7 +22,7 @@ void mainboard_smi_sleep(u8 slp_typ)
 	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 50595cd769..98780404fb 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c
+++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
@@ -362,7 +362,7 @@ __weak void variant_fpmcu_reset(void)
 		/* 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 @@ __weak void variant_finalize_gpios(void)
 		/* 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 904ae2f64c..e15cc33195 100644
--- a/src/mainboard/google/guybrush/verstage.c
+++ b/src/mainboard/google/guybrush/verstage.c
@@ -13,7 +13,7 @@ static void setup_gpio(void)
 
 	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 41dd8de830..9b456c8ed5 100644
--- a/src/mainboard/google/kahlee/bootblock/bootblock.c
+++ b/src/mainboard/google/kahlee/bootblock/bootblock.c
@@ -17,10 +17,10 @@ void bootblock_mainboard_early_init(void)
 	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 0a78b0cba6..59c49590a3 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -115,7 +115,7 @@ static void mainboard_init(void *chip_info)
 	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 41a7e460df..c16b1d2c02 100644
--- a/src/mainboard/google/kahlee/romstage.c
+++ b/src/mainboard/google/kahlee/romstage.c
@@ -21,7 +21,7 @@ void mainboard_romstage_entry(void)
 	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 dd38c34f37..f68d832081 100644
--- a/src/mainboard/google/mancomb/bootblock.c
+++ b/src/mainboard/google/mancomb/bootblock.c
@@ -15,7 +15,7 @@ void bootblock_mainboard_early_init(void)
 
 	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 04280db316..f67ff31e49 100644
--- a/src/mainboard/google/mancomb/smihandler.c
+++ b/src/mainboard/google/mancomb/smihandler.c
@@ -22,7 +22,7 @@ void mainboard_smi_sleep(u8 slp_typ)
 	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 450681eb86..0e90231532 100644
--- a/src/mainboard/google/mancomb/verstage.c
+++ b/src/mainboard/google/mancomb/verstage.c
@@ -10,7 +10,7 @@ static void setup_gpio(void)
 	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 87e028573c..96cbe4d0ec 100644
--- a/src/mainboard/google/zork/bootblock.c
+++ b/src/mainboard/google/zork/bootblock.c
@@ -10,7 +10,7 @@ void bootblock_mainboard_early_init(void)
 	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 3a10dd25f5..bec8f09576 100644
--- a/src/mainboard/google/zork/smihandler.c
+++ b/src/mainboard/google/zork/smihandler.c
@@ -26,7 +26,7 @@ void mainboard_smi_sleep(u8 slp_typ)
 					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 0ae382f1e1..6f8a416657 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 @@ static void wifi_power_reset_configure_active_low_power(void)
 		/* 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 @@ static void wifi_power_reset_configure_active_high_power(void)
 		/* 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 @@ static void wifi_power_reset_configure_pre_v3(void)
 		/* 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 @@ __weak void variant_pcie_gpio_configure(void)
 		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 9083e5f012..62935a66a9 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 @@ static void wifi_power_reset_configure_active_low_power(void)
 		/* 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 @@ static void wifi_power_reset_configure_active_high_power(void)
 		/* 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 @@ static void wifi_power_reset_configure_pre_v3(void)
 		/* 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 @@ __weak void variant_pcie_gpio_configure(void)
 		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 3ef0423460..0c7a04f9a7 100644
--- a/src/mainboard/google/zork/verstage.c
+++ b/src/mainboard/google/zork/verstage.c
@@ -11,7 +11,7 @@ static void setup_gpio(void)
 
 	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");
 }