Skip to contentSkip to conversation

ARM: socfpga: Drop last use of socfpga_reset_manager

PATCH New Marek Vasut 2 participants 2 messages Jan 9, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: socfpga: Drop last use of socfpga_reset_manager

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")
Cc Chin Liang See <[email protected]>
Cc Dalon Westergreen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Ley Foon Tan <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>
---
 arch/arm/mach-socfpga/spl_gen5.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/mach-socfpga/spl_gen5.c +1 -4
index e19f55aa9b..3f513c3c48 100644
@@ -137,10 +137,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 */
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 ARM: socfpga: Drop last use of socfpga_reset_manager

Quoted 4 lines · Marek Vasut

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.

Quoted 8 lines
Fixes bb25aca13433 ("arm: socfpga: Convert reset manager from struct to defines")
Cc Chin Liang See <[email protected]>
Cc Dalon Westergreen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Ley Foon Tan <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>
Quoted 23 lines
---
 arch/arm/mach-socfpga/spl_gen5.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/mach-socfpga/spl_gen5.c +1 -5
index e19f55aa9b..3f513c3c48 100644
@@ -137,10 +137,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 */
--

2.24.1