On Thu, Jan 9, 2020 at 11:00 AM Marek Vasut <[email protected]> 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 <[email protected]> > 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]>
Reviewed-by: Simon Goldschmidt <[email protected]> > --- > 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 >

