diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-16 08:30:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-16 08:30:49 -0500 |
| commit | b8c5b47296414c7cef84a879c0c90202bc22720c (patch) | |
| tree | 9463031a6e06bbb6077de172035c9083103ff0bd /drivers | |
| parent | 447b9cdf2c4d8d7c6cb1ff64426c1dfaf7396f93 (diff) | |
| parent | 217db227df40e29d6a4726272303499a7cd7b904 (diff) | |
| download | u-boot-imx-b8c5b47296414c7cef84a879c0c90202bc22720c.zip u-boot-imx-b8c5b47296414c7cef84a879c0c90202bc22720c.tar.gz u-boot-imx-b8c5b47296414c7cef84a879c0c90202bc22720c.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ddr/altera/sdram.c | 1 | ||||
| -rw-r--r-- | drivers/fpga/socfpga.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ddr/altera/sdram.c b/drivers/ddr/altera/sdram.c index 1ed2883..2996942 100644 --- a/drivers/ddr/altera/sdram.c +++ b/drivers/ddr/altera/sdram.c @@ -218,6 +218,7 @@ static void sdram_dump_protection_config(void) readl(&sdr_ctrl->protport_default)); for (rules = 0; rules < 20; rules++) { + rule.rule = rules; sdram_get_rule(&rule); debug("Rule %d, rules ...\n", rules); debug(" sdram start %x\n", rule.sdram_start); diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c index 4448250..431e159 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_module); + writel(0, &sysmgr_regs->fpgaintfgrp_gbl); /* Disable all signals from FPGA to HPS SDRAM */ #define SDR_CTRLGRP_FPGAPORTRST_ADDRESS 0x5080 |