Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / drivers / fpga / socfpga.c

diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 431e159e48c0ba37443057ef4ca68429fb6128d8..f1b2f2c4da3dcab3c51e5306ebdc44f7f6893183 100644 (file)
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
@@ -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