aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google/zork
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/mainboard/google/zork
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/mainboard/google/zork')
-rw-r--r--src/mainboard/google/zork/bootblock.c2
-rw-r--r--src/mainboard/google/zork/smihandler.c2
-rw-r--r--src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c8
-rw-r--r--src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c8
-rw-r--r--src/mainboard/google/zork/verstage.c2
5 files changed, 11 insertions, 11 deletions
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");
}