diff options
| author | Tom Rini <[email protected]> | 2021-09-24 20:35:50 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-09-24 20:35:50 -0400 |
| commit | bf0491f8d8c2f259b6b7356744b9e6e05be8f6f2 (patch) | |
| tree | decd8c20bc02d9039ce2ea6952e4642a71bc8190 /drivers | |
| parent | 7d1fcaea128ff689aea75deaf7f75d75d1b553d3 (diff) | |
| parent | cc5afabc9d32933578536401114f91bbecff158b (diff) | |
Merge branch '2021-09-24-assorted-updates' into next
- A few minor updates
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tpm/tpm2_tis_spi.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c index 4b33ac8fd3d..1d24d32d867 100644 --- a/drivers/tpm/tpm2_tis_spi.c +++ b/drivers/tpm/tpm2_tis_spi.c @@ -589,18 +589,25 @@ static int tpm_tis_spi_probe(struct udevice *dev) if (CONFIG_IS_ENABLED(DM_GPIO)) { struct gpio_desc reset_gpio; - ret = gpio_request_by_name(dev, "gpio-reset", 0, + ret = gpio_request_by_name(dev, "reset-gpios", 0, &reset_gpio, GPIOD_IS_OUT); if (ret) { - log(LOGC_NONE, LOGL_NOTICE, "%s: missing reset GPIO\n", - __func__); - } else { - dm_gpio_set_value(&reset_gpio, 1); - mdelay(1); - dm_gpio_set_value(&reset_gpio, 0); + /* legacy reset */ + ret = gpio_request_by_name(dev, "gpio-reset", 0, + &reset_gpio, GPIOD_IS_OUT); + if (ret) { + log(LOGC_NONE, LOGL_NOTICE, + "%s: missing reset GPIO\n", __func__); + goto init; + } + log(LOGC_NONE, LOGL_NOTICE, + "%s: gpio-reset is deprecated\n", __func__); } + dm_gpio_set_value(&reset_gpio, 1); + mdelay(1); + dm_gpio_set_value(&reset_gpio, 0); } - +init: /* Ensure a minimum amount of time elapsed since reset of the TPM */ mdelay(drv_data->time_before_first_cmd_ms); |