]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
ARM: socfpga: Drop last use of socfpga_reset_manager
authorMarek Vasut <marex@denx.de>
Thu, 9 Jan 2020 09:56:24 +0000 (10:56 +0100)
committerMarek Vasut <marex@denx.de>
Mon, 3 Feb 2020 08:26:14 +0000 (09:26 +0100)
This particular chunk of code was not updated, likely due to the order
in which the patches were posted and applied. Fix this missing part.

Fixes: bb25aca13433 ("arm: socfpga: Convert reset manager from struct to defines")
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <chin.liang.see@intel.com>
Cc: Dalon Westergreen <dwesterg@gmail.com>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Cc: Tien Fong Chee <tien.fong.chee@intel.com>
arch/arm/mach-socfpga/spl_gen5.c

index 70f8455ddca470b7923df055bf1ad67e1930faf2..a01e2a5cb9f76ead5ca98d4336692552041692d0 100644 (file)
@@ -138,10 +138,7 @@ void board_init_f(ulong dummy)
                debug("Reset init failed: %d\n", ret);
 
 #ifdef CONFIG_SPL_NAND_DENALI
-       struct socfpga_reset_manager *reset_manager_base =
-               (struct socfpga_reset_manager *)SOCFPGA_RSTMGR_ADDRESS;
-
-       clrbits_le32(&reset_manager_base->per_mod_reset, BIT(4));
+       clrbits_le32(SOCFPGA_RSTMGR_ADDRESS + RSTMGR_GEN5_PERMODRST, BIT(4));
 #endif
 
        /* enable console uart printing */