| Message ID | 1489019218-4071-17-git-send-email-ley.foon.tan@intel.com |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
On 03/09/2017 01:26 AM, Ley Foon Tan wrote: > These registers only available for Gen5 device, excludes them exclude > if for Arria 10 build. s/if for/from/ > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> > --- > drivers/fpga/socfpga.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c > index f1b2f2c..3751574 100644 > --- a/drivers/fpga/socfpga.c > +++ b/drivers/fpga/socfpga.c > @@ -19,8 +19,10 @@ DECLARE_GLOBAL_DATA_PTR; > > static struct socfpga_fpga_manager *fpgamgr_regs = > (struct socfpga_fpga_manager *)SOCFPGA_FPGAMGRREGS_ADDRESS; > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > static struct socfpga_system_manager *sysmgr_regs = > (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS; > +#endif > > /* Set CD ratio */ > static void fpgamgr_set_cd_ratio(unsigned long ratio) > @@ -268,8 +270,10 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) > > /* Prior programming the FPGA, all bridges need to be shut off */ > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > /* Disable all signals from hps peripheral controller to fpga */ > writel(0, &sysmgr_regs->fpgaintfgrp_module); > +#endif > > /* Disable all signals from FPGA to HPS SDRAM */ > #define SDR_CTRLGRP_FPGAPORTRST_ADDRESS 0x5080 > @@ -278,8 +282,10 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) > /* Disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */ > socfpga_bridges_reset(1); > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > /* Unmap the bridges from NIC-301 */ > writel(0x1, SOCFPGA_L3REGS_ADDRESS); > +#endif > > /* Initialize the FPGA Manager */ > status = fpgamgr_program_init(); >
On Fri, Mar 10, 2017 at 9:53 AM, Marek Vasut <marex@denx.de> wrote: > On 03/09/2017 01:26 AM, Ley Foon Tan wrote: >> These registers only available for Gen5 device, excludes them > > exclude Okay. > >> if for Arria 10 build. > > s/if for/from/ Okay. > >> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> >> --- >> drivers/fpga/socfpga.c | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c >> index f1b2f2c..3751574 100644 >> --- a/drivers/fpga/socfpga.c >> +++ b/drivers/fpga/socfpga.c >> @@ -19,8 +19,10 @@ DECLARE_GLOBAL_DATA_PTR; >> >> static struct socfpga_fpga_manager *fpgamgr_regs = >> (struct socfpga_fpga_manager *)SOCFPGA_FPGAMGRREGS_ADDRESS; >> +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) >> static struct socfpga_system_manager *sysmgr_regs = >> (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS; >> +#endif >> >> /* Set CD ratio */ >> static void fpgamgr_set_cd_ratio(unsigned long ratio) >> @@ -268,8 +270,10 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) >> >> /* Prior programming the FPGA, all bridges need to be shut off */ >> >> +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) >> /* Disable all signals from hps peripheral controller to fpga */ >> writel(0, &sysmgr_regs->fpgaintfgrp_module); >> +#endif >> >> /* Disable all signals from FPGA to HPS SDRAM */ >> #define SDR_CTRLGRP_FPGAPORTRST_ADDRESS 0x5080 >> @@ -278,8 +282,10 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) >> /* Disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */ >> socfpga_bridges_reset(1); >> >> +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) >> /* Unmap the bridges from NIC-301 */ >> writel(0x1, SOCFPGA_L3REGS_ADDRESS); >> +#endif >> >> /* Initialize the FPGA Manager */ >> status = fpgamgr_program_init(); >> Regards Ley Foon
diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c index f1b2f2c..3751574 100644 --- a/drivers/fpga/socfpga.c +++ b/drivers/fpga/socfpga.c @@ -19,8 +19,10 @@ DECLARE_GLOBAL_DATA_PTR; static struct socfpga_fpga_manager *fpgamgr_regs = (struct socfpga_fpga_manager *)SOCFPGA_FPGAMGRREGS_ADDRESS; +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) static struct socfpga_system_manager *sysmgr_regs = (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS; +#endif /* Set CD ratio */ static void fpgamgr_set_cd_ratio(unsigned long ratio) @@ -268,8 +270,10 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) /* Prior programming the FPGA, all bridges need to be shut off */ +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) /* Disable all signals from hps peripheral controller to fpga */ writel(0, &sysmgr_regs->fpgaintfgrp_module); +#endif /* Disable all signals from FPGA to HPS SDRAM */ #define SDR_CTRLGRP_FPGAPORTRST_ADDRESS 0x5080 @@ -278,8 +282,10 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) /* Disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */ socfpga_bridges_reset(1); +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) /* Unmap the bridges from NIC-301 */ writel(0x1, SOCFPGA_L3REGS_ADDRESS); +#endif /* Initialize the FPGA Manager */ status = fpgamgr_program_init();