diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-20 09:44:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-20 09:44:05 -0400 |
| commit | 904e546970184d9f5b7e1bde7065b745e67a1bef (patch) | |
| tree | 5873f1c17c89a7db365841e989dc71e22bf09f75 /arch/arm/mach-socfpga/reset_manager_arria10.c | |
| parent | 855ff8e6dd58b01930d8b8b726e65310d546a0c9 (diff) | |
| parent | 00f7ae6138ad8b9d859a70d022161297b1bb8049 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga/reset_manager_arria10.c')
| -rw-r--r-- | arch/arm/mach-socfpga/reset_manager_arria10.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c index 99e2b8e6e6..b4434f2ded 100644 --- a/arch/arm/mach-socfpga/reset_manager_arria10.c +++ b/arch/arm/mach-socfpga/reset_manager_arria10.c @@ -316,13 +316,6 @@ void socfpga_per_reset_all(void) setbits_le32(&reset_manager_base->per0modrst, mask_ecc_ocp); } -#if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) -int socfpga_bridges_reset(void) -{ - /* For SoCFPGA-VT, this is NOP. */ - return 0; -} -#else int socfpga_bridges_reset(void) { int ret; @@ -379,4 +372,3 @@ int socfpga_bridges_reset(void) return 0; } -#endif |