| Message ID | 1527840799-15261-1-git-send-email-ley.foon.tan@intel.com |
|---|---|
| State | Accepted |
| Commit | 2e1de5bd97e6330c01c38efe788672bafda86f81 |
| Delegated to: | Marek Vasut |
| Headers | show |
| Series | [U-Boot] arm: socfpga: Add do_bridge_reset for Arria 10 | expand |
On 06/01/2018 10:13 AM, Ley Foon Tan wrote: > Add do_bridge_reset() function for Arria 10, it is required by misc.c. > > arch/arm/mach-socfpga/built-in.o: In function `do_bridge': > arch/arm/mach-socfpga/misc.c:221: undefined reference to `do_bridge_reset' > make[1]: *** [u-boot] Error 1 > > Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> > --- > arch/arm/mach-socfpga/misc_arria10.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c > index 47a9d50..a75cbc4 100644 > --- a/arch/arm/mach-socfpga/misc_arria10.c > +++ b/arch/arm/mach-socfpga/misc_arria10.c > @@ -14,6 +14,7 @@ > #include <asm/arch/misc.h> > #include <asm/arch/pinmux.h> > #include <asm/arch/reset_manager.h> > +#include <asm/arch/reset_manager_arria10.h> > #include <asm/arch/sdram_arria10.h> > #include <asm/arch/system_manager.h> > #include <asm/arch/nic301.h> > @@ -262,3 +263,11 @@ int arch_misc_init(void) > return socfpga_eth_reset(); > } > #endif > + > +void do_bridge_reset(int enable) > +{ > + if (enable) > + socfpga_reset_deassert_bridges_handoff(); > + else > + socfpga_bridges_reset(); > +} > http://git.denx.de/?p=u-boot/u-boot-socfpga.git;a=commit;h=8bed1b1dbaee66def9a8ded4f855e3d1f258d183 is probably better, since it uses the same command line API to operate bridges as Gen5. Can you please rebase that one and submit it instead ?
On 06/01/2018 10:13 AM, Ley Foon Tan wrote: > Add do_bridge_reset() function for Arria 10, it is required by misc.c. > > arch/arm/mach-socfpga/built-in.o: In function `do_bridge': > arch/arm/mach-socfpga/misc.c:221: undefined reference to `do_bridge_reset' > make[1]: *** [u-boot] Error 1 > > Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> > --- > arch/arm/mach-socfpga/misc_arria10.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c > index 47a9d50..a75cbc4 100644 > --- a/arch/arm/mach-socfpga/misc_arria10.c > +++ b/arch/arm/mach-socfpga/misc_arria10.c > @@ -14,6 +14,7 @@ > #include <asm/arch/misc.h> > #include <asm/arch/pinmux.h> > #include <asm/arch/reset_manager.h> > +#include <asm/arch/reset_manager_arria10.h> > #include <asm/arch/sdram_arria10.h> > #include <asm/arch/system_manager.h> > #include <asm/arch/nic301.h> > @@ -262,3 +263,11 @@ int arch_misc_init(void) > return socfpga_eth_reset(); > } > #endif > + > +void do_bridge_reset(int enable) > +{ > + if (enable) > + socfpga_reset_deassert_bridges_handoff(); > + else > + socfpga_bridges_reset(); > +} > Ignore my previous comment, applied.
diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c index 47a9d50..a75cbc4 100644 --- a/arch/arm/mach-socfpga/misc_arria10.c +++ b/arch/arm/mach-socfpga/misc_arria10.c @@ -14,6 +14,7 @@ #include <asm/arch/misc.h> #include <asm/arch/pinmux.h> #include <asm/arch/reset_manager.h> +#include <asm/arch/reset_manager_arria10.h> #include <asm/arch/sdram_arria10.h> #include <asm/arch/system_manager.h> #include <asm/arch/nic301.h> @@ -262,3 +263,11 @@ int arch_misc_init(void) return socfpga_eth_reset(); } #endif + +void do_bridge_reset(int enable) +{ + if (enable) + socfpga_reset_deassert_bridges_handoff(); + else + socfpga_bridges_reset(); +}
Add do_bridge_reset() function for Arria 10, it is required by misc.c. arch/arm/mach-socfpga/built-in.o: In function `do_bridge': arch/arm/mach-socfpga/misc.c:221: undefined reference to `do_bridge_reset' make[1]: *** [u-boot] Error 1 Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> --- arch/arm/mach-socfpga/misc_arria10.c | 9 +++++++++ 1 file changed, 9 insertions(+)