[U-Boot] [PATCH] arm: socfpga: Remove unused function socfpga_emac_manage_reset()

Ley Foon Tan lftan.linux at gmail.com
Fri Sep 21 08:38:02 UTC 2018


On Thu, Sep 20, 2018 at 6:20 PM Marek Vasut <marex at denx.de> wrote:
>
> On 09/20/2018 06:22 PM, Ley Foon Tan wrote:
> > Remove code from the reset manager that is never called.
> >
> > Signed-off-by: Ley Foon Tan <ley.foon.tan at intel.com>
> > ---
> >  .../mach-socfpga/include/mach/reset_manager_s10.h  |  2 --
> >  arch/arm/mach-socfpga/reset_manager_s10.c          | 35 ----------------------
> >  2 files changed, 37 deletions(-)
> >
> > diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h
> > index 6182d5f..31b73ed 100644
> > --- a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h
> > +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h
> > @@ -108,8 +108,6 @@ struct socfpga_reset_manager {
> >  #define RSTMGR_GPIO1         RSTMGR_DEFINE(2, 25)
> >  #define RSTMGR_SDR           RSTMGR_DEFINE(3, 6)
> >
> > -void socfpga_emac_manage_reset(const unsigned int of_reset_id, u32 state);
> > -
> >  /* Create a human-readable reference to SoCFPGA reset. */
> >  #define SOCFPGA_RESET(_name) RSTMGR_##_name
> >
> > diff --git a/arch/arm/mach-socfpga/reset_manager_s10.c b/arch/arm/mach-socfpga/reset_manager_s10.c
> > index 5cc8336..f176c38 100644
> > --- a/arch/arm/mach-socfpga/reset_manager_s10.c
> > +++ b/arch/arm/mach-socfpga/reset_manager_s10.c
> > @@ -93,41 +93,6 @@ void socfpga_bridges_reset(int enable)
> >       }
> >  }
> >
> > -/* of_reset_id: emac reset id
> > - * state: 0 - disable reset, !0 - enable reset
> > - */
> > -void socfpga_emac_manage_reset(const unsigned int of_reset_id, u32 state)
> > -{
> > -     u32 reset_emac;
> > -     u32 reset_emacocp;
> > -
> > -     /* hardcode this now */
> > -     switch (of_reset_id) {
> > -     case EMAC0_RESET:
> > -             reset_emac = SOCFPGA_RESET(EMAC0);
> > -             reset_emacocp = SOCFPGA_RESET(EMAC0_OCP);
> > -             break;
> > -     case EMAC1_RESET:
> > -             reset_emac = SOCFPGA_RESET(EMAC1);
> > -             reset_emacocp = SOCFPGA_RESET(EMAC1_OCP);
> > -             break;
> > -     case EMAC2_RESET:
> > -             reset_emac = SOCFPGA_RESET(EMAC2);
> > -             reset_emacocp = SOCFPGA_RESET(EMAC2_OCP);
> > -             break;
> > -     default:
> > -             printf("GMAC: Invalid reset ID (%i)!\n", of_reset_id);
> > -             hang();
> > -             break;
> > -     }
> > -
> > -     /* Reset ECC OCP first */
> > -     socfpga_per_reset(reset_emacocp, state);
> > -
> > -     /* Release the EMAC controller from reset */
> > -     socfpga_per_reset(reset_emac, state);
> > -}
>
> Are you absolutely positive this is correctly handled by the reset
> manager driver ? Including the OCP resets ? If so, fine.
Yes, reset framework will reset OCP as well.

Regards
Ley Foon


More information about the U-Boot mailing list