ARM: socfpga: Drop last use of socfpga_reset_manager
diff mbox series

Message ID 20200109100030.755337-1-marex@denx.de
State Accepted
Commit 707c36e2af817f66b72561e4652f22b2f8989c8e
Delegated to: Marek Vasut
Headers show
Series
  • ARM: socfpga: Drop last use of socfpga_reset_manager
Related show

Commit Message

Marek Vasut Jan. 9, 2020, 10 a.m. UTC
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 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Simon Goldschmidt Jan. 9, 2020, 10:17 a.m. UTC | #1
On Thu, Jan 9, 2020 at 11:00 AM Marek Vasut <marex@denx.de> wrote:
>
> 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>

Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

> ---
>  arch/arm/mach-socfpga/spl_gen5.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
> index e19f55aa9b..3f513c3c48 100644
> --- a/arch/arm/mach-socfpga/spl_gen5.c
> +++ b/arch/arm/mach-socfpga/spl_gen5.c
> @@ -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
>

Patch
diff mbox series

diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index e19f55aa9b..3f513c3c48 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -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 */