diff options
Diffstat (limited to 'drivers/fpga')
| -rw-r--r-- | drivers/fpga/socfpga.c | 2 | ||||
| -rw-r--r-- | drivers/fpga/socfpga_arria10.c | 12 | ||||
| -rw-r--r-- | drivers/fpga/socfpga_gen5.c | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c index 6e14ebd26d..aef796c741 100644 --- a/drivers/fpga/socfpga.c +++ b/drivers/fpga/socfpga.c @@ -12,8 +12,6 @@ #include <asm/arch/reset_manager.h> #include <asm/arch/system_manager.h> -DECLARE_GLOBAL_DATA_PTR; - /* Timeout count */ #define FPGA_TIMEOUT_CNT 0x1000000 diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c index d5763965dd..ee18675f7e 100644 --- a/drivers/fpga/socfpga_arria10.c +++ b/drivers/fpga/socfpga_arria10.c @@ -23,8 +23,6 @@ #define FPGA_TIMEOUT_MSEC 1000 /* timeout in ms */ #define FPGA_TIMEOUT_CNT 0x1000000 -DECLARE_GLOBAL_DATA_PTR; - static const struct socfpga_fpga_manager *fpga_manager_base = (void *)SOCFPGA_FPGAMGRREGS_ADDRESS; @@ -111,12 +109,12 @@ static int wait_for_nconfig_pin_and_nstatus_pin(void) unsigned long mask = ALT_FPGAMGR_IMGCFG_STAT_F2S_NCONFIG_PIN_SET_MSK | ALT_FPGAMGR_IMGCFG_STAT_F2S_NSTATUS_PIN_SET_MSK; - /* Poll until f2s_nconfig_pin and f2s_nstatus_pin; loop until de-asserted, - * timeout at 1000ms + /* + * Poll until f2s_nconfig_pin and f2s_nstatus_pin; loop until + * de-asserted, timeout at 1000ms */ - return wait_for_bit_le32(&fpga_manager_base->imgcfg_stat, - mask, - false, FPGA_TIMEOUT_MSEC, false); + return wait_for_bit_le32(&fpga_manager_base->imgcfg_stat, mask, + true, FPGA_TIMEOUT_MSEC, false); } static int wait_for_f2s_nstatus_pin(unsigned long value) diff --git a/drivers/fpga/socfpga_gen5.c b/drivers/fpga/socfpga_gen5.c index 3dfb0303d3..88ae035e29 100644 --- a/drivers/fpga/socfpga_gen5.c +++ b/drivers/fpga/socfpga_gen5.c @@ -12,8 +12,6 @@ #include <asm/arch/reset_manager.h> #include <asm/arch/system_manager.h> -DECLARE_GLOBAL_DATA_PTR; - #define FPGA_TIMEOUT_CNT 0x1000000 static struct socfpga_fpga_manager *fpgamgr_regs = |