diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-03 14:05:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-03 14:05:43 -0500 |
| commit | 5a9d8633e5e5f5253010480fb0db3742b0ea1356 (patch) | |
| tree | 6cef337796d50552504a3f0b90e07d32d2d88190 /arch/arm/mach-keystone/ddr3.c | |
| parent | c5219c4a18f2b27547ecd799914f94e48b0fa86f (diff) | |
| parent | 63af92e837f3d7c21ab5fc4a96ffcbf202efaf90 (diff) | |
Merge branch '2021-03-03-assorted-improvements' into next
- Clean up reset_cpu()
- Assorted arm cp15 cleanups
- Assorted cleanups throughout the tree from Simon
- TPM1 / TPM2 cleanups
Diffstat (limited to 'arch/arm/mach-keystone/ddr3.c')
| -rw-r--r-- | arch/arm/mach-keystone/ddr3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c index 7dea600d509..9ee32841568 100644 --- a/arch/arm/mach-keystone/ddr3.c +++ b/arch/arm/mach-keystone/ddr3.c @@ -345,7 +345,7 @@ void ddr3_check_ecc_int(u32 base) if (!ecc_test) { puts("Reseting the device ...\n"); - reset_cpu(0); + reset_cpu(); } } @@ -445,7 +445,7 @@ void ddr3_err_reset_workaround(void) tmp &= ~KS2_RSTYPE_PLL_SOFT; __raw_writel(tmp, KS2_RSTCTRL_RSCFG); - reset_cpu(0); + reset_cpu(); } } #endif |