From: Dinh Nguyen Date: Tue, 19 Jan 2016 15:16:21 +0000 (-0600) Subject: Revert "arm: socfpga: set the fpga global bit to disable HPS to FPGA signals" X-Git-Tag: v2016.03-rc2~131^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a409a8b85ee337250043aa0c031a31b3a6639e74;p=oweals%2Fu-boot.git Revert "arm: socfpga: set the fpga global bit to disable HPS to FPGA signals" Apparently, the logic for the FPGA global bit is not universal between Gen5 and Gen10 devices is not the same. Disabling this bit, while applicable to Gen10 devices, will break FPGA programming on Gen5 devices. Signed-off-by: Dinh Nguyen --- diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c index 431e159e48..4448250f5c 100644 --- a/drivers/fpga/socfpga.c +++ b/drivers/fpga/socfpga.c @@ -269,7 +269,7 @@ 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 */ /* Disable all signals from hps peripheral controller to fpga */ - writel(0, &sysmgr_regs->fpgaintfgrp_gbl); + writel(0, &sysmgr_regs->fpgaintfgrp_module); /* Disable all signals from FPGA to HPS SDRAM */ #define SDR_CTRLGRP_FPGAPORTRST_ADDRESS 0x5080