diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-06 23:18:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-06 23:18:42 -0500 |
| commit | 457faef262c5c9533c344f25eafb10e757149a34 (patch) | |
| tree | 9c1b2e777e37d997410b5f4e97b883fa0bb2ad7d /drivers/reset/reset-socfpga.c | |
| parent | 8a6ffeda97dfda5263ef40e1a4efb25b032ce04c (diff) | |
| parent | 9a5a90ad9b3234c4739427cbe11219c51f0e9bd1 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Gen 5 and Watchdog fixes
Diffstat (limited to 'drivers/reset/reset-socfpga.c')
| -rw-r--r-- | drivers/reset/reset-socfpga.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c index 93ec9cfdb64..105ce94c71a 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c @@ -18,6 +18,7 @@ #include <dm/of_access.h> #include <env.h> #include <reset-uclass.h> +#include <wait_bit.h> #include <linux/bitops.h> #include <linux/io.h> #include <linux/sizes.h> @@ -80,7 +81,10 @@ static int socfpga_reset_deassert(struct reset_ctl *reset_ctl) int offset = id % (reg_width * BITS_PER_BYTE); clrbits_le32(data->modrst_base + (bank * BANK_INCREMENT), BIT(offset)); - return 0; + + return wait_for_bit_le32(data->modrst_base + (bank * BANK_INCREMENT), + BIT(offset), + false, 500, false); } static int socfpga_reset_request(struct reset_ctl *reset_ctl) |